fix: fixed getCategoryById duplicate calls in add-edit expense page (#…

…3056) * fix: fixed getCategoryById duplicate calls in add-edit expense page * fixed unit tests
fylein · Jun 7, 2024 · 75e3a03 · 75e3a03
1 parent 18e62ed
commit 75e3a03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/app/fyle/add-edit-expense/add-edit-expense-3.spec.ts b/src/app/fyle/add-edit-expense/add-edit-expense-3.spec.ts
@@ -1067,14 +1067,13 @@ export function TestCases3(getTestBed) {
         component.recentlyUsedCategories$ = of(recentUsedCategoriesRes);
         component.etxn$ = of(unflattenedPaidExp);
         component.initialFetch = true;
-        categoriesService.getCategoryById.and.returnValue(of(orgCategoryData1[0]));
+        component.selectedCategory$ = of(orgCategoryData1[0]);
 
         fixture.detectChanges();
         component.getCategoryOnEdit(orgCategoryData1[0]).subscribe((res) => {
           expect(res).toEqual(orgCategoryPaginated1[0]);
           expect(orgUserSettingsService.get).toHaveBeenCalledTimes(1);
           expect(orgSettingsService.get).toHaveBeenCalledTimes(1);
-          expect(categoriesService.getCategoryById).toHaveBeenCalledOnceWith(unflattenedDraftExp.tx.org_category_id);
           done();
         });
       });
@@ -1089,14 +1088,13 @@ export function TestCases3(getTestBed) {
           tx: { ...unflattenedPaidExp.tx, fyle_category: undefined, state: 'DRAFT' },
         });
         component.initialFetch = true;
-        categoriesService.getCategoryById.and.returnValue(of(orgCategoryData1[0]));
+        component.selectedCategory$ = of(orgCategoryData1[0]);
 
         fixture.detectChanges();
         component.getCategoryOnEdit(orgCategoryData1[0]).subscribe((res) => {
           expect(res).toEqual(orgCategoryPaginated1[0]);
           expect(orgUserSettingsService.get).toHaveBeenCalledTimes(1);
           expect(orgSettingsService.get).toHaveBeenCalledTimes(1);
-          expect(categoriesService.getCategoryById).toHaveBeenCalledOnceWith(unflattenedDraftExp.tx.org_category_id);
           done();
         });
       });

diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts
@@ -429,6 +429,8 @@ export class AddEditExpensePage implements OnInit {
 
   activeCategories$: Observable<OrgCategory[]>;
 
+  selectedCategory$: Observable<OrgCategory>;
+
   constructor(
     private activatedRoute: ActivatedRoute,
     private accountsService: AccountsService,
@@ -1655,7 +1657,7 @@ export class AddEditExpensePage implements OnInit {
   setupFormInit(): void {
     const selectedProject$ = this.getSelectedProjects();
 
-    const selectedCategory$ = this.getSelectedCategory();
+    this.selectedCategory$ = this.getSelectedCategory().pipe(shareReplay(1));
 
     const selectedReport$ = this.getSelectedReport();
 
@@ -1682,7 +1684,7 @@ export class AddEditExpensePage implements OnInit {
             etxn: this.etxn$,
             paymentMode: selectedPaymentMode$,
             project: selectedProject$,
-            category: selectedCategory$,
+            category: this.selectedCategory$,
             report: selectedReport$,
             costCenter: selectedCostCenter$,
             customExpenseFields: customExpenseFields$,
@@ -2058,7 +2060,7 @@ export class AddEditExpensePage implements OnInit {
         }) => {
           const isExpenseCategoryUnspecified = etxn.tx.fyle_category?.toLowerCase() === 'unspecified';
           if (this.initialFetch && etxn.tx.org_category_id && !isExpenseCategoryUnspecified) {
-            return this.categoriesService.getCategoryById(etxn.tx.org_category_id).pipe(
+            return this.selectedCategory$.pipe(
               map((selectedCategory) => ({
                 orgUserSettings,
                 orgSettings,