fix: retain receipt when editing, remove code for advance wallet id, set unspecified category id

src/app/core/models/v1/transaction.model.ts

@@ -136,4 +136,5 @@ export interface Transaction {
     status: ExpenseTransactionStatus;
     corporate_card_nickname?: string;
   }[];
+  file_ids: string[];
 }

src/app/core/services/platform/v1/spender/expenses.service.ts

@@ -291,7 +291,7 @@ export class ExpensesService {
   }
 
   // transform public transaction to expense payload for /post expenses
-  transformTo(transaction: Partial<Transaction>, fileIds: string[]): Partial<Expense> {
+  transformTo(transaction: Partial<Transaction>): Partial<Expense> {
     const expense: Partial<Expense> = {
       id: transaction.id,
       spent_at: transaction.txn_dt,
@@ -323,7 +323,7 @@ export class ExpensesService {
       commute_details_id: transaction.commute_details_id,
       hotel_is_breakfast_provided: transaction.hotel_is_breakfast_provided,
       advance_wallet_id: transaction.advance_wallet_id,
-      file_ids: fileIds,
+      file_ids: transaction.file_ids,
       report_id: transaction.report_id,
       travel_classes: [],
     };

src/app/core/services/transaction.service.ts

@@ -114,7 +114,7 @@ export class TransactionService {
   @CacheBuster({
     cacheBusterNotifier: expensesCacheBuster$,
   })
-  upsert(transaction: Partial<Transaction>, fileIds: string[] = []): Observable<Partial<Transaction>> {
+  upsert(transaction: Partial<Transaction>): Observable<Partial<Transaction>> {
     /** Only these fields will be of type text & custom fields */
     const fieldsToCheck = ['purpose', 'vendor', 'train_travel_class', 'bus_travel_class'];
 
@@ -180,7 +180,7 @@ export class TransactionService {
 
         const transactionCopy = this.utilityService.discardRedundantCharacters(transaction, fieldsToCheck);
 
-        const expensePayload = this.expensesService.transformTo(transactionCopy, fileIds);
+        const expensePayload = this.expensesService.transformTo(transactionCopy);
         return this.expensesService.post(expensePayload).pipe(map((result) => this.transformExpense(result.data).tx));
       })
     );
@@ -205,7 +205,8 @@ export class TransactionService {
           }
         } else {
           const fileIds = fileObjs.map((fileObj) => fileObj.id);
-          return this.upsert(txn, fileIds);
+          txn.file_ids = fileIds;
+          return this.upsert(txn);
         }
       })
     );

src/app/fyle/add-edit-expense/add-edit-expense.page.ts

@@ -436,6 +436,8 @@
 
   pendingTransactionAllowedToReportAndSplit = true;
 
+  allCategories$: Observable<OrgCategory[]>;
+
   activeCategories$: Observable<OrgCategory[]>;
 
   selectedCategory$: Observable<OrgCategory>;
@@ -1236,12 +1238,6 @@
     );
   }
 
-  getActiveCategories(): Observable<OrgCategory[]> {
-    const allCategories$ = this.categoriesService.getAll();
-
-    return allCategories$.pipe(map((catogories) => this.categoriesService.filterRequired(catogories)));
-  }
-
   getInstaFyleImageData(): Observable<Partial<InstaFyleImageData>> {
     if (this.activatedRoute.snapshot.params.dataUrl && this.activatedRoute.snapshot.params.canExtractData !== 'false') {
       const dataUrl = this.activatedRoute.snapshot.params.dataUrl as string;
@@ -2977,7 +2973,10 @@
   }
 
   ionViewWillEnter(): void {
-    this.activeCategories$ = this.getActiveCategories().pipe(shareReplay(1));
+    this.allCategories$ = this.categoriesService.getAll().pipe(shareReplay(1));
+    this.activeCategories$ = this.allCategories$
+      .pipe(map((catogories) => this.categoriesService.filterRequired(catogories)))
+      .pipe(shareReplay(1));
 
     this.initClassObservables();
 
@@ -3497,6 +3496,7 @@
       customProperties: standardisedCustomProperties$,
       attachments: attachements$,
       orgSettings: this.orgSettingsService.get(),
+      allCategories: this.allCategories$,
     }).pipe(
       map((res) => {
         const etxn: Partial<UnflattenedTransaction> = res.etxn;
@@ -3509,6 +3509,9 @@
           }
           return customProperty;
         });
+        const unspecifiedCategory = res.allCategories.find(
+          (category) => category.fyle_category?.toLowerCase() === 'unspecified'
+        );
 
         const formValues = this.getFormValues();
 
@@ -3545,7 +3548,8 @@
           amount = etxn.tx.user_amount;
         }
 
-        //TODO: Add depenedent fields to custom_properties array once APIs are available
+        const category_id = this.getOrgCategoryID() || unspecifiedCategory.id;
+        //TODO: Add dependent fields to custom_properties array once APIs are available
         return {
           tx: {
             ...etxn.tx,
@@ -3562,7 +3566,7 @@
             project_id: this.getProjectID(),
             tax_amount: this.getTaxAmount(),
             tax_group_id: this.getTaxGroupID(),
-            org_category_id: this.getOrgCategoryID(),
+            org_category_id: category_id,
             fyle_category: this.getFyleCategory(),
             policy_amount: null,
             vendor: this.getDisplayName(),
@@ -4036,10 +4040,7 @@
               report: Report;
             };
 
-            // NOTE: This double call is done as certain fields will not be present in return of upsert call. policy_amount in this case.
             return this.transactionService.upsert(etxn.tx as Transaction).pipe(
-              switchMap((txn) => this.expensesService.getExpenseById(txn.id)),
-              map((expense) => this.transactionService.transformExpense(expense).tx),
               switchMap((tx) => {
                 const selectedReportId = reportControl.report?.id;
                 const criticalPolicyViolated = this.getIsPolicyExpense(etxn as unknown as Expense);
@@ -4082,17 +4083,6 @@
                 } else {
                   return of(txn);
                 }
-              }),
-              switchMap((txn) => {
-                if (txn.id && txn.advance_wallet_id !== etxn.tx.advance_wallet_id) {
-                  const expense = {
-                    id: txn.id,
-                    advance_wallet_id: etxn.tx.advance_wallet_id,
-                  };
-                  return this.expensesService.post(expense).pipe(map(() => txn));
-                } else {
-                  return of(txn);
-                }
               })
             );
           })
@@ -4561,7 +4551,7 @@
     return this.vendorOptions?.find((option) => option.toLowerCase() === vendor.toLowerCase()) || null;
   }
 
   attachReceipts(data: { type: string; dataUrl: string | ArrayBuffer; actionSource?: string }): void {
     if (data) {
       const fileInfo = {
         type: data.type,
@@ -4669,7 +4659,7 @@
     }
   }
 
   async uploadFileCallback(file: File): Promise<void> {
     let fileData: { type: string; dataUrl: string | ArrayBuffer; actionSource: string };
     if (file) {
       if (file.size < MAX_FILE_SIZE) {
@@ -4687,12 +4677,12 @@
     }
   }
 
   async onChangeCallback(nativeElement: HTMLInputElement): Promise<void> {
     const file = nativeElement.files[0];
     this.uploadFileCallback(file);
   }
 
   async addAttachments(event: Event): Promise<void> {
     event.stopPropagation();
 
     if (this.platform.is('ios')) {
@@ -4762,7 +4752,7 @@
     }
   }
 
   getReceiptExtension(name: string): string | null {
     let res: string = null;
 
     if (name) {
@@ -4777,7 +4767,7 @@
     return res;
   }
 
   getReceiptDetails(file: FileObject): { type: string; thumbnail: string } {
     const ext = this.getReceiptExtension(file.name);
     const res = {
       type: 'unknown',
@@ -4795,7 +4785,7 @@
     return res;
   }
 
   viewAttachments(): void {
     const attachements$ = this.getExpenseAttachments(this.mode);
 
     from(this.loaderService.showLoader())
@@ -4851,7 +4841,7 @@
       });
   }
 
   getDeleteReportParams(
     config: { header: string; body: string; ctaText: string; ctaLoadingText: string },
     removeExpenseFromReport: boolean = false,
     reportId?: string
@@ -4886,7 +4876,7 @@
     };
   }
 
   async deleteExpense(reportId?: string): Promise<void> {
     const removeExpenseFromReport = reportId && this.isRedirectedFromReport;
     const header = removeExpenseFromReport ? 'Remove Expense' : 'Delete Expense';
     const body = removeExpenseFromReport
@@ -4930,7 +4920,7 @@
     }
   }
 
   async openCommentsModal(): Promise<void> {
     const etxn = await this.etxn$.toPromise();
 
     const modal = await this.modalController.create({