notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

prioritizes rules.

Browse Source
This commit is contained in:
Bryce Covert
2019-05-15 18:57:42 -07:00
parent 79500ba157
commit 5f810ac2c4
2 changed files with 202 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/clj/auto_ap/yodlee/import.clj
View File

@@ -121,22 +121,79 @@
[] []
(partition-all 100 transactions))) (partition-all 100 transactions)))
(defn rule-applies? [transaction rule] (defn rule-applies? [transaction {:keys [:transaction-rule/description
(re-find (:transaction-rule/description rule) (:transaction/description-original transaction))) :transaction-rule/dom-gte :transaction-rule/dom-lte
:transaction-rule/amount-gte :transaction-rule/amount-lte
:transaction-rule/client :transaction-rule/bank-account]} ]
(let [transaction-dom (some-> transaction
:transaction/date
.toInstant
(.atZone (java.time.ZoneId/of "US/Pacific"))
(.get java.time.temporal.ChronoField/DAY_OF_MONTH))]
(and
(if description
(re-find description (:transaction/description-original transaction))
true)
(if dom-gte
(>= transaction-dom dom-gte)
true)
(if dom-lte
(<= transaction-dom dom-lte)
true)
(if amount-gte
(>= (:transaction/amount transaction) amount-gte)
true)
(if amount-lte
(<= (:transaction/amount transaction) amount-lte)
true)
(if client
(= (:transaction/client transaction)
(:db/id client))
true)
(if bank-account
(= (:transaction/bank-account transaction)
(:db/id bank-account))
true))))
(defn more-specific? [left right key]
(cond (and (get left key)
(get right key))
nil
(get left key)
true
(get right key)
false
:else
nil))
(defn prioritize-rule [left right]
(first (filter #(not (nil? %))
[(more-specific? left right :transaction-rule/bank-account)
(more-specific? left right :transaction-rule/client)
(more-specific? left right :transaction-rule/dom-lte)
(more-specific? left right :transaction-rule/dom-gte)
(more-specific? left right :transaction-rule/amount-lte)
(more-specific? left right :transaction-rule/amount-gte)
true])))
(defn rule-applying-fn [rules] (defn rule-applying-fn [rules]
(let [rules (transduce (map (fn [r] (update r :transaction-rule/description #(some-> % re-pattern)))) (let [rules (transduce (map (fn [r] (update r :transaction-rule/description #(some-> % re-pattern))))
conj conj
[] []
rules)] (sort prioritize-rule rules))]
(println rules)
(fn [transaction] (fn [transaction]
(let [matching-rules (filter #(rule-applies? transaction %) rules)] (let [matching-rules (->> rules
(filter #(rule-applies? transaction %) ))]
(if-let [top-match (first matching-rules)] (if-let [top-match (first matching-rules)]
(assoc transaction (assoc transaction
:transaction/matched-rule (:db/id top-match)
:transaction/approval-status (:transaction-rule/transaction-approval-status top-match) :transaction/approval-status (:transaction-rule/transaction-approval-status top-match)
:transaction/vendor (:db/id (:transaction-rule/vendor top-match)) :transaction/vendor (:db/id (:transaction-rule/vendor top-match)))
)
transaction))))) transaction)))))
(defn manual-import [manual-transactions] (defn manual-import [manual-transactions]

157
test/clj/auto_ap/yodlee/import.clj
View File

@@ -12,7 +12,7 @@
(m/-main false) (m/-main false)
(f) (f)
(d/release (d/connect uri)) (d/release (d/connect uri))
(d/delete-database uri)) (d/delete-database uri))
(t/use-fixtures :each wrap-setup) (t/use-fixtures :each wrap-setup)
@@ -77,14 +77,14 @@
(let [[result] (sut/transactions->txs [(assoc base-transaction (let [[result] (sut/transactions->txs [(assoc base-transaction
:description {:original "CHECK 10001" :description {:original "CHECK 10001"
:simple ""} :simple ""}
:amount {:amount 30.0} :amount {:amount 30.0}
:client-id client-id :client-id client-id
:bank-account-id bank-account-id)] :bank-account-id bank-account-id)]
:client-id :client-id
:bank-account-id :bank-account-id
identity)] identity)]
(t/is (= {:db/id payment-id (t/is (= {:db/id payment-id
:payment/status :payment-status/cleared} :payment/status :payment-status/cleared}
@@ -139,25 +139,146 @@
(t/is (= :transaction-approval-status/approved (t/is (= :transaction-approval-status/approved
(:transaction/approval-status result))))) (:transaction/approval-status result)))))
(t/testing "Should match if description matches" (t/testing "Should apply vendor and approval status"
(let [apply-rules (sut/rule-applying-fn [{:transaction-rule/description "XXX039" (let [apply-rules (sut/rule-applying-fn [{:db/id 1
:transaction-rule/description "XXX039"
:transaction-rule/transaction-approval-status :transaction-approval-status/approved :transaction-rule/transaction-approval-status :transaction-approval-status/approved
:transaction-rule/vendor {:db/id 123}} :transaction-rule/vendor {:db/id 123}}
{:transaction-rule/description "OtherMatch" {:db/id 2
:transaction-rule/description "OtherMatch"
:transaction-rule/transaction-approval-status :transaction-approval-status/requires-feedback :transaction-rule/transaction-approval-status :transaction-approval-status/requires-feedback
:transaction-rule/vendor {:db/id 456}}])] :transaction-rule/vendor {:db/id 456}}])]
(t/is (= {:transaction/description-original "Hello XXX039", (t/is (= {:transaction/description-original "Hello XXX039",
:transaction/vendor 123 :transaction/vendor 123
:transaction/approval-status :transaction-approval-status/approved} :transaction/approval-status :transaction-approval-status/approved
(-> {:transaction/description-original "Hello XXX039"} :transaction/matched-rule 1}
apply-rules))) (-> {:transaction/description-original "Hello XXX039"}
apply-rules)))
(t/is (= {:transaction/description-original "OtherMatch", (t/is (= {:transaction/description-original "OtherMatch",
:transaction/approval-status :transaction-approval-status/requires-feedback :transaction/approval-status :transaction-approval-status/requires-feedback
:transaction/vendor 456} :transaction/vendor 456
:transaction/matched-rule 2}
(-> {:transaction/description-original "OtherMatch"} (-> {:transaction/description-original "OtherMatch"}
apply-rules))) apply-rules)))
(t/is (= {:transaction/description-original "Hello Not match"} (t/is (= {:transaction/description-original "Hello Not match"}
(-> {:transaction/description-original "Hello Not match"} (-> {:transaction/description-original "Hello Not match"}
apply-rules)))))))) apply-rules)))))
(t/testing "Should match if day of month matches"
(let [apply-rules (sut/rule-applying-fn [{:db/id 123
:transaction-rule/dom-gte 3
:transaction-rule/dom-lte 9
:transaction-rule/transaction-approval-status :transaction-approval-status/approved
:transaction-rule/vendor {:db/id 123}}])]
(t/is (= 123
(-> {:transaction/date #inst "2019-01-04T00:00:00.000-08:00"}
apply-rules
:transaction/matched-rule)))
(t/is (= 123
(-> {:transaction/date #inst "2019-01-03T00:00:00.000-08:00"}
apply-rules
:transaction/matched-rule)))
(t/is (= 123
(-> {:transaction/date #inst "2019-01-09T00:00:00.000-08:00"}
apply-rules
:transaction/matched-rule)))
(t/is (nil?
(-> {:transaction/date #inst "2019-01-01T00:00:00.000-08:00"}
apply-rules
:transaction/matched-rule)))
(t/is (nil?
(-> {:transaction/date #inst "2019-01-10T00:00:00.000-08:00"}
apply-rules
:transaction/matched-rule)))))
(t/testing "Should match if amount matches"
(let [apply-rules (sut/rule-applying-fn [{:db/id 123
:transaction-rule/amount-gte 3.0
:transaction-rule/amount-lte 9.0
:transaction-rule/transaction-approval-status :transaction-approval-status/approved
:transaction-rule/vendor {:db/id 123}}])]
(t/is (= 123
(-> {:transaction/amount 4.0}
apply-rules
:transaction/matched-rule)))
(t/is (= 123
(-> {:transaction/amount 3.0}
apply-rules
:transaction/matched-rule)))
(t/is (= 123
(-> {:transaction/amount 9.0}
apply-rules
:transaction/matched-rule)))
(t/is (nil?
(-> {:transaction/amount 9.01}
apply-rules
:transaction/matched-rule)))
(t/is (nil?
(-> {:transaction/amount 2.99}
apply-rules
:transaction/matched-rule)))))
(t/testing "Should match if client matches"
(let [apply-rules (sut/rule-applying-fn [{:db/id 123
:transaction-rule/client {:db/id 456}}])]
(t/is (= 123
(-> {:transaction/client 456}
apply-rules
:transaction/matched-rule)))
(t/is (nil?
(-> {:transaction/client 89}
apply-rules
:transaction/matched-rule)))))
(t/testing "Should match if bank-account matches"
(let [apply-rules (sut/rule-applying-fn [{:db/id 123
:transaction-rule/bank-account {:db/id 456}}])]
(t/is (= 123
(-> {:transaction/bank-account 456}
apply-rules
:transaction/matched-rule)))
(t/is (nil?
(-> {:transaction/bank-account 89}
apply-rules
:transaction/matched-rule)))))
(t/testing "Should prioritize rules"
(let [apply-rules (sut/rule-applying-fn (shuffle [{:db/id 2
:transaction-rule/description "Hello"
:transaction-rule/amount-gte 5.0}
{:db/id 1
:transaction-rule/description "Hello"}
{:db/id 3
:transaction-rule/description "Hello"
:transaction-rule/client {:db/id 789}}
{:db/id 4
:transaction-rule/description "Hello"
:transaction-rule/client {:db/id 789}
:transaction-rule/bank-account {:db/id 456}}]))]
(t/is (= 4
(-> {:transaction/bank-account 456
:transaction/client 789
:transaction/description-original "Hello"
:transaction/amount 6.0}
apply-rules
:transaction/matched-rule)))
(t/is (= 3
(-> {:transaction/bank-account 457
:transaction/client 789
:transaction/amount 6.0
:transaction/description-original "Hello"}
apply-rules
:transaction/matched-rule)))
(t/is (= 3
(-> {:transaction/bank-account 457
:transaction/client 789
:transaction/amount 6.0
:transaction/description-original "Hello"}
apply-rules
:transaction/matched-rule)))
#_(t/is (nil?
(-> {:transaction/bank-account 89}
apply-rules
:transaction/matched-rule))))))))