fix: Allow save expense with invalid fields after capture receipt

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

@@ -1100,6 +1100,7 @@ describe('TransactionService', () => {
       const mockFileObject = cloneDeep(fileObjectData1);
 
       spyOn(transactionService, 'upsert').and.returnValue(of(txnData2));
+      expensesService.createFromFile.and.returnValue(of({ data: [expenseData] }));
       transactionService.createTxnWithFiles({ ...txnData }, of(mockFileObject)).subscribe((res) => {
         expect(res).toEqual(txnData2);
         expect(transactionService.upsert).toHaveBeenCalledOnceWith({ ...txnData, file_ids: [fileObjectData1[0].id] });

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

@@ -195,17 +195,22 @@
   ): Observable<Partial<Transaction>> {
     return fileUploads$.pipe(
       switchMap((fileObjs) => {
-        // txn contains only source key when capturing receipt
-        if (txn.hasOwnProperty('source') && Object.keys(txn).length === 1) {
-          const fileIds = fileObjs.map((fileObj) => fileObj.id);
-          if (fileIds.length > 0) {
-            return this.expensesService
-              .createFromFile(fileIds[0], txn.source)
-              .pipe(map((result) => this.transformExpense(result.data[0]).tx));
-          }
+        const fileIds = fileObjs.map((fileObj) => fileObj.id);
+        if (fileIds.length > 0) {
+          return this.expensesService.createFromFile(fileIds[0], txn.source).pipe(
+            switchMap((result) => {
+              // txn contains only source key when capturing receipt in bulk mode
+              if (txn.hasOwnProperty('source') && Object.keys(txn).length === 1) {
+                return of(this.transformExpense(result.data[0]).tx);
+              } else {
+                // capture receipt flow: patching the expense with any of the form values.
+                txn.file_ids = fileIds;
+                txn.id = result.data[0].id;
+                return this.upsert(this.cleanupExpensePayload(txn));
+              }
+            })
+          );
         } else {
-          const fileIds = fileObjs.map((fileObj) => fileObj.id);
-          txn.file_ids = fileIds;
           return this.upsert(txn);
         }
       })
@@ -919,4 +924,15 @@
 
     return typeOrFilter;
   }
+
+  // to be used only when updating created expense with form values during capture recept flow
+  private cleanupExpensePayload(txn: Partial<Transaction>): Partial<Transaction> {
+    const newTxn: Partial<Transaction> = {};
+    for (const key in txn) {
+      if (txn[key] !== null && txn[key] !== undefined) {
+        newTxn[key] = txn[key];
+      }
+    }
+    return newTxn;
+  }
 }

src/app/core/services/transactions-outbox.service.ts

@@ -141,14 +141,12 @@ export class TransactionsOutboxService {
   addEntry(
     transaction: Partial<Transaction>,
     dataUrls: { url: string; type: string }[],
-    comments?: string[],
-    reportId?: string
+    comments?: string[]
   ): Promise<void> {
     this.queue.push({
       transaction,
       dataUrls,
       comments,
-      reportId,
     });
 
     return this.saveQueue();
@@ -159,10 +157,9 @@ export class TransactionsOutboxService {
   addEntryAndSync(
     transaction: Partial<Transaction>,
     dataUrls: { url: string; type: string }[],
-    comments: string[],
-    reportId: string
+    comments: string[]
   ): Promise<OutboxQueue> {
-    this.addEntry(transaction, dataUrls, comments, reportId);
+    this.addEntry(transaction, dataUrls, comments);
     return this.syncEntry(this.queue.pop());
   }
 

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

@@ -4275,7 +4275,6 @@ export class AddEditExpensePage implements OnInit {
     const customFields$ = this.getCustomFields();
 
     this.trackAddExpense();
-
     return this.generateEtxnFromFg(this.etxn$, customFields$).pipe(
       switchMap((etxn) =>
         this.isConnected$.pipe(
@@ -4361,13 +4360,12 @@ export class AddEditExpensePage implements OnInit {
               etxn.tx.matchCCCId = this.selectedCCCTransaction.id;
             }
 
-            let reportId: string;
             const formValues = this.getFormValues();
             if (
               formValues.report &&
               (etxn.tx.policy_amount === null || (etxn.tx.policy_amount && !(etxn.tx.policy_amount < 0.0001)))
             ) {
-              reportId = formValues.report.id;
+              etxn.tx.report_id = formValues.report.id;
             }
 
             etxn.dataUrls = etxn.dataUrls.map((data: FileObject) => {
@@ -4387,8 +4385,7 @@ export class AddEditExpensePage implements OnInit {
                 this.transactionOutboxService.addEntryAndSync(
                   etxn.tx,
                   etxn.dataUrls as { url: string; type: string }[],
-                  comments,
-                  reportId
+                  comments
                 )
               );
             } else {
@@ -4404,13 +4401,12 @@ export class AddEditExpensePage implements OnInit {
                       this.transactionOutboxService.addEntryAndSync(
                         etxn.tx,
                         etxn.dataUrls as { url: string; type: string }[],
-                        comments,
-                        reportId
+                        comments
                       )
                     );
                   } else {
                     this.transactionOutboxService
-                      .addEntry(etxn.tx, etxn.dataUrls as { url: string; type: string }[], comments, reportId)
+                      .addEntry(etxn.tx, etxn.dataUrls as { url: string; type: string }[], comments)
                       .then(noop);
 
                     return of(null);

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

@@ -2910,19 +2910,17 @@ export class AddEditMileagePage implements OnInit {
 
             const reportValue = this.getFormValues();
 
-            let reportId: string;
             if (
               reportValue?.report &&
               (etxn.tx.policy_amount === null || (etxn.tx.policy_amount && !(etxn.tx.policy_amount < 0.0001)))
             ) {
-              reportId = reportValue.report?.id;
+              etxn.tx.report_id = reportValue.report?.id;
             }
             return of(
               this.transactionsOutboxService.addEntryAndSync(
                 etxn.tx,
                 etxn.dataUrls as { url: string; type: string }[],
-                comments,
-                reportId
+                comments
               )
             ).pipe(
               switchMap((txnData: Promise<unknown>) => from(txnData)),

src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts

@@ -1970,20 +1970,18 @@ export class AddEditPerDiemPage implements OnInit {
               comments.push(comment);
             }
 
-            let reportId: string;
             const formValue = this.getFormValues();
             if (
               formValue.report &&
               (etxn.tx.policy_amount === null || (etxn.tx.policy_amount && !(etxn.tx.policy_amount < 0.0001)))
             ) {
-              reportId = formValue.report.id;
+              etxn.tx.report_id = formValue.report.id;
             }
             return of(
               this.transactionsOutboxService.addEntryAndSync(
                 etxn.tx,
                 etxn.dataUrls as { url: string; type: string }[],
-                comments,
-                reportId
+                comments
               )
             ).pipe(switchMap((txnData) => from(txnData)));
           })

src/app/shared/components/capture-receipt/capture-receipt.component.ts

@@ -127,7 +127,7 @@ export class CaptureReceiptComponent implements OnInit, OnDestroy, AfterViewInit
             url: base64ImagesWithSource.base64Image,
           },
         ];
-        return this.transactionsOutboxService.addEntry(transaction, attachmentUrls, null, null);
+        return this.transactionsOutboxService.addEntry(transaction, attachmentUrls, null);
       })
     );
   }