Merge pull request #78 from kosssi/master

feat: Don't filter uncategorized operation to have more matching ➕
konnectors · Jan 22, 2018 · e53850c · e53850c
2 parents b9290d1 + 9054c79
commit e53850c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/libs/linker/billsToOperation/operationsFilters.js b/libs/linker/billsToOperation/operationsFilters.js
@@ -9,13 +9,24 @@ const { getIdentifiers, getDateRangeFromBill, getAmountRangeFromBill } = require
 
 const HEALTH_VENDORS = ['Ameli', 'Harmonie', 'Malakoff Mederic', 'MGEN'] // TODO: to import from each konnector
 const HEALTH_CAT_ID_OPERATION = '400610' // TODO: import it from cozy-bank
+const UNCATEGORIZED_CAT_ID_OPERATION = '0' // TODO: import it from cozy-bank
 
 // helpers
 
-const getCategoryId = o => o.manualCategoryId || o.automaticCategoryId
+const getCategoryId = o => {
+  return o.manualCategoryId
+    || o.automaticCategoryId
+    || UNCATEGORIZED_CAT_ID_OPERATION
+}
 
+const checkOperationCategory = (operation, categoryId) => {
+  return categoryId === getCategoryId(operation)
+}
 const isHealthOperation = operation => {
-  return HEALTH_CAT_ID_OPERATION === getCategoryId(operation)
+  return checkOperationCategory(operation, HEALTH_CAT_ID_OPERATION)
+}
+const isUncategorizedOperation = operation => {
+  return checkOperationCategory(operation, UNCATEGORIZED_CAT_ID_OPERATION)
 }
 
 const isHealthBill = bill => {
@@ -42,8 +53,8 @@ const filterByAmounts = ({ minAmount, maxAmount }) => operation => {
 
 const filterByCategory = bill => operation => {
   return isHealthBill(bill)
-    ? isHealthOperation(operation)
-    : !isHealthOperation(operation)
+    ? isHealthOperation(operation) || isUncategorizedOperation(operation)
+    : !isHealthOperation(operation) || isUncategorizedOperation(operation)
 }
 
 // combine filters

diff --git a/libs/linker/billsToOperation/operationsFilters.spec.js b/libs/linker/billsToOperation/operationsFilters.spec.js
@@ -51,13 +51,19 @@ describe('operationsFilters', () => {
       const fByCategory = filterByCategory({vendor: 'Ameli'})
       expect(fByCategory({ manualCategoryId: '400610' })).toBeTruthy()
       expect(fByCategory({ automaticCategoryId: '400610' })).toBeTruthy()
+      expect(fByCategory({ manualCategoryId: '0' })).toBeTruthy()
+      expect(fByCategory({ automaticCategoryId: '0' })).toBeTruthy()
+      expect(fByCategory({})).toBeTruthy()
       expect(fByCategory({ manualCategoryId: '400611' })).toBeFalsy()
       expect(fByCategory({ automaticCategoryId: '400611' })).toBeFalsy()
     })
     test('not health bill', () => {
       const fByCategory = filterByCategory({vendor: 'SFR'})
       expect(fByCategory({ manualCategoryId: '400610' })).toBeFalsy()
       expect(fByCategory({ automaticCategoryId: '400610' })).toBeFalsy()
+      expect(fByCategory({ manualCategoryId: '0' })).toBeTruthy()
+      expect(fByCategory({ automaticCategoryId: '0' })).toBeTruthy()
+      expect(fByCategory({})).toBeTruthy()
       expect(fByCategory({ manualCategoryId: '400611' })).toBeTruthy()
       expect(fByCategory({ automaticCategoryId: '400611' })).toBeTruthy()
     })