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

kind of applies rules.

Browse Source
This commit is contained in:
Bryce Covert
2019-05-15 07:12:56 -07:00
parent d5c3a73bef
commit 70714a2de1
2 changed files with 114 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@
nil)) nil))
nil)) nil))
(defn transactions->txs [transactions transaction->client transaction->bank-account-id] (defn transactions->txs [transactions transaction->client transaction->bank-account-id apply-rules]
(into [] (into []
(for [transaction transactions (for [transaction transactions
@@ -75,7 +75,8 @@
bank-account-id (transaction->bank-account-id transaction) bank-account-id (transaction->bank-account-id transaction)
check (transaction->payment transaction check-number client-id bank-account-id amount id)] check (transaction->payment transaction check-number client-id bank-account-id amount id)]
:when client-id] :when client-id]
(->> (remove-nils #:transaction (->
#:transaction
{:post-date (coerce/to-date (time/parse post-date "YYYY-MM-dd")) {:post-date (coerce/to-date (time/parse post-date "YYYY-MM-dd"))
:id (sha-256 (str id)) :id (sha-256 (str id))
:account-id account-id :account-id account-id
@@ -104,7 +105,10 @@
:accounts (when check :accounts (when check
[#:transaction-account {:account (:db/id (a/get-account-by-numeric-code-and-sets 2110 ["default"])) [#:transaction-account {:account (:db/id (a/get-account-by-numeric-code-and-sets 2110 ["default"]))
:location "A" :location "A"
:amount (Math/abs (double amount))}])}))))) :amount (Math/abs (double amount))}])}
remove-nils
apply-rules))))
(defn batch-transact [transactions] (defn batch-transact [transactions]
@@ -117,6 +121,21 @@
[] []
(partition-all 100 transactions))) (partition-all 100 transactions)))
(defn rule-applies? [transaction rule]
(re-find (:transaction-rule/description rule) (:transaction/description-original transaction)))
(defn rule-applying-fn [rules]
(let [rules (transduce (map (fn [r] (update r :transaction-rule/description #(some-> % re-pattern))))
conj
[]
rules)]
(fn [transaction]
(let [matching-rules (filter #(rule-applies? transaction %) rules)]
(if-let [top-match (first matching-rules)]
(assoc transaction :transaction/approval-status (:transaction-rule/transaction-approval-status (first matching-rules)))
transaction)))))
(defn manual-import [manual-transactions] (defn manual-import [manual-transactions]
(let [transformed-transactions (->> manual-transactions (let [transformed-transactions (->> manual-transactions
(filter #(= "posted" (:status %))) (filter #(= "posted" (:status %)))
@@ -137,7 +156,7 @@
transaction-group))))] transaction-group))))]
(println "importing manual transactions" transformed-transactions) (println "importing manual transactions" transformed-transactions)
(batch-transact (batch-transact
(transactions->txs transformed-transactions :client-id :bank-account-id)))) (transactions->txs transformed-transactions :client-id :bank-account-id (rule-applying-fn [])))))
@@ -155,5 +174,5 @@
(d-clients/get-all)) (d-clients/get-all))
transaction->client (comp (by :yodlee-account-id :client-id all-bank-accounts) :accountId) transaction->client (comp (by :yodlee-account-id :client-id all-bank-accounts) :accountId)
transaction->bank-account-id (comp (by :yodlee-account-id :bank-account-id all-bank-accounts) :accountId)] transaction->bank-account-id (comp (by :yodlee-account-id :bank-account-id all-bank-accounts) :accountId)]
(batch-transact (transactions->txs transactions transaction->client transaction->bank-account-id))))) (batch-transact (transactions->txs transactions transaction->client transaction->bank-account-id (rule-applying-fn []))))))

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

@@ -34,7 +34,8 @@
(t/testing "Should import single transaction" (t/testing "Should import single transaction"
(let [result (sut/transactions->txs [base-transaction] (let [result (sut/transactions->txs [base-transaction]
:client-id :client-id
:bank-account-id)] :bank-account-id
identity)]
(t/is (= [#:transaction {:amount -12.0 (t/is (= [#:transaction {:amount -12.0
:date #inst "2014-01-02T08:00:00.000-00:00" :date #inst "2014-01-02T08:00:00.000-00:00"
:bank-account 456 :bank-account 456
@@ -53,7 +54,8 @@
(t/testing "Should skip transaction if no client is found" (t/testing "Should skip transaction if no client is found"
(let [result (sut/transactions->txs [(assoc base-transaction :client-id nil)] (let [result (sut/transactions->txs [(assoc base-transaction :client-id nil)]
:client-id :client-id
:bank-account-id)] :bank-account-id
identity)]
(t/is (= [] result)))) (t/is (= [] result))))
(t/testing "Should match an uncleared check" (t/testing "Should match an uncleared check"
@@ -81,7 +83,8 @@
: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)]
(t/is (= {:db/id payment-id (t/is (= {:db/id payment-id
:payment/status :payment-status/cleared} :payment/status :payment-status/cleared}
@@ -97,7 +100,62 @@
: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)]
(t/is (= nil (t/is (= nil
(:transaction/payment result))))))))) (:transaction/payment result)))))))
(t/testing "Rules"
(t/testing "Should apply rules to imported transaction"
(let [{:strs [bank-account-id client-id payment-id]} (->> [#:payment {:status :payment-status/pending
:date #inst "2019-01-01"
:bank-account "bank-account-id"
:client "client-id"
:check-number 10001
:amount 30.0
:db/id "payment-id"}
#:bank-account {:name "Bank account"
:db/id "bank-account-id"}
#:client {:name "Client"
:db/id "client-id"
:bank-accounts ["bank-account-id"]}]
(d/transact (d/connect uri))
deref
:tempids)
[result] (sut/transactions->txs [(assoc base-transaction
:description {:original "Hello XXX039"
:simple ""}
:amount {:amount 30.0}
:id 789
:client-id client-id
:bank-account-id bank-account-id)]
:client-id
:bank-account-id
(sut/rule-applying-fn [{:transaction-rule/description "XXX039"
:transaction-rule/transaction-approval-status :transaction-approval-status/approved}]))]
(t/is (= :transaction-approval-status/approved
(:transaction/approval-status result)))))
(t/testing "Should match if description matches"
(let [apply-rules (sut/rule-applying-fn [{:transaction-rule/description "XXX039"
:transaction-rule/transaction-approval-status :transaction-approval-status/approved
:transaction-rule/vendor {:db/id 123}}
{:transaction-rule/description "OtherMatch"
:transaction-rule/transaction-approval-status :transaction-approval-status/requires-feedback
:transaction-rule/vendor {:db/id 456}}])]
(t/is (= {:transaction/description-original "Hello XXX039",
:transaction/approval-status :transaction-approval-status/approved}
(-> {:transaction/description-original "Hello XXX039"}
apply-rules)))
(t/is (= {:transaction/description-original "OtherMatch",
:transaction/approval-status :transaction-approval-status/requires-feedback}
(-> {:transaction/description-original "OtherMatch"}
apply-rules)))
(t/is (= {:transaction/description-original "Hello Not match"}
(-> {:transaction/description-original "Hello Not match"}
apply-rules
))))))))