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;
+  }
 }