Merge pull request #81 from doubleface/fix/debit_no_found

fix: linkBankOperation : match credit operation even if no debit operation found
konnectors · Jan 23, 2018 · aa566fa · aa566fa
2 parents e53850c + 70b15b2
commit aa566fa
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/libs/linkBankOperations.js b/libs/linkBankOperations.js
@@ -102,13 +102,18 @@ class Linker {
       const linkBillToCreditOperation = debitOperation => {
         return findCreditOperation(this.cozyClient, bill, options)
           .then(creditOperation => {
-            if (creditOperation && debitOperation) {
+            const creditPromise = Promise.resolve()
+            if (creditOperation) {
               res.creditOperation = creditOperation
+              creditPromise.then(() => this.addBillToOperation(bill, creditOperation))
+            }
+            const debitPromise = Promise.resolve()
+            if (creditOperation && debitOperation) {
               log('debug', bill, 'Matching bill')
               log('debug', creditOperation, 'Matching credit creditOperation')
-              return this.addReimbursementToOperation(bill, debitOperation, creditOperation)
-              .then(() => this.addBillToOperation(bill, creditOperation))
+              debitPromise.then(() => this.addReimbursementToOperation(bill, debitOperation, creditOperation))
             }
+            return Promise.all([creditOperation, debitOperation])
           })
       }
 

diff --git a/libs/linkBankOperations.spec.js b/libs/linkBankOperations.spec.js
@@ -125,6 +125,7 @@ describe('linker', () => {
       // reset operations to operationsInit values
       operations = operationsInit.map(op => ({ ...op }))
       cozyClient.data.query.mockReturnValue(Promise.resolve(operations))
+      cozyClient.data.updateAttributes.mockImplementation(updateOperation)
     })
 
     const defaultOptions = {
@@ -141,7 +142,6 @@ describe('linker', () => {
     }
 
     test('health bills', () => {
-      cozyClient.data.updateAttributes.mockImplementation(updateOperation)
       const healthBills = [
         {
           _id: 'b1',
@@ -169,8 +169,30 @@ describe('linker', () => {
       })
     })
 
+    test('health bills with not debit operation found should associate credit operation', () => {
+      const healthBills = [
+        {
+          _id: 'b1',
+          amount: 5,
+          originalAmount: 999,
+          type: 'health_costs',
+          originalDate: new Date(2017, 11, 13),
+          date: new Date(2017, 11, 15),
+          isRefund: true,
+          vendor: 'Ameli'
+        }
+      ]
+      const options = { ...defaultOptions, identifiers: ['CPAM'] }
+      return linker.linkBillsToOperations(healthBills, options)
+      .then(result => {
+        expect(result).toEqual({
+          b1: { creditOperation: operations[1], debitOperation: undefined }
+        })
+        expect(operations[1]).toMatchObject({bills: ['io.cozy.bills:b1']})
+      })
+    })
+
     test('not health bills', () => {
-      cozyClient.data.updateAttributes.mockReturnValue(Promise.resolve())
       const noHealthBills = [
         {
           _id: 'b2',