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

Fixes two types of bugs.

Browse Source
This commit is contained in:
Bryce Covert
2021-12-09 08:53:36 -08:00
parent f95a3b2c3a
commit 4a7215a74b
7 changed files with 225 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scratch-sessions/find-ledgers-not-matching-invoices-or-transactions.clj
View File

@@ -6,18 +6,27 @@
(require '[auto-ap.utils :refer [dollars=]])
(defn get-bad-ones []
(->> (d/query {:query {:find ['?je '?a '(sum ?debit) '(sum ?credit)]
(->> (->> (d/q '[:find ?c
:in $
:where [?c :client/code]]
(d/db auto-ap.datomic/conn))
(map first))
(mapcat #(->> (d/query {:query {:find ['?je '?a '(sum ?debit) '(sum ?credit)]
:with ['?jel]
:in '[$]
:where ['[?je :journal-entry/amount ?a]
:in '[$ ?c]
:where ['[?je :journal-entry/client ?c]
'[?je :journal-entry/amount ?a]
'[?je :journal-entry/line-items ?jel]
'[(get-else $ ?jel :journal-entry-line/debit 0.0) ?debit]
'[(get-else $ ?jel :journal-entry-line/credit 0.0) ?credit]]
}
:args [(d/db auto-ap.datomic/conn)]})
:args [(d/db auto-ap.datomic/conn) %]})
(filter (fn [[_ a d c]]
(or (not (dollars= a d))
(not (dollars= a c)))))
(not (dollars= a c)))))))
#_(count)
#_(take 3)))
@@ -32,7 +41,7 @@
je))))
(filter (fn [invoice?]
(:invoice/total invoice?)))
(map (fn [invoice]
#_(map (fn [invoice]
{:total (:invoice/total invoice)
:client-code (:client/code (:invoice/client invoice))
:invoice-number (:invoice/invoice-number invoice)

1
src/clj/auto_ap/graphql/invoices.clj
View File

@@ -265,6 +265,7 @@
(assert-can-see-client (:id context) (:db/id (:invoice/client (d-invoices/get-by-id (:invoice_id args)))))
(let [invoice-id (:invoice_id args)
invoice (d-invoices/get-by-id invoice-id)
_ (assert-valid-expense-accounts (:expense_accounts args))
deleted (deleted-expense-accounts invoice (:expense_accounts args))
updated {:db/id invoice-id
:invoice/expense-accounts (map

3
src/clj/auto_ap/ledger.clj
View File

@@ -338,7 +338,8 @@
:args [(d/db auto-ap.datomic/conn)]}))
]
(filter
(fn [[e accounts]] (not= accounts (get jel-accounts e)))
(fn [[e accounts]]
(not= accounts (get jel-accounts e)))
invoice-accounts)))
(defn touch-broken-ledger []

31
src/clj/auto_ap/rule_matching.clj
View File

@@ -100,25 +100,36 @@
(map (fn [r] (update r :transaction-rule/description #(some-> % ->pattern))))
(filter #(rule-applies? transaction %))))
(defn spread-cents [cents n]
(let [default-spread (for [x (range n)]
(int (* cents (/ 1.0 n))))
short-by (- cents (reduce + 0 default-spread)) ;; amount that was lost in the differenc
adjusted-spread (map
(fn [cents increments]
(+ cents increments))
default-spread
(concat (take short-by (repeat 1)) (repeat 0)))]
(filter #(> % 0) adjusted-spread)))
(defn apply-rule [transaction rule valid-locations]
(with-precision 2
(let [accounts (vec (mapcat
(fn [tra]
(let [cents-to-distribute (int (Math/round (Math/abs (* (:transaction-rule-account/percentage tra)
(:transaction/amount transaction)
100))))]
(if (= "Shared" (:transaction-rule-account/location tra))
(->> valid-locations
(map
(fn [location]
(fn [cents location]
{:transaction-account/account (:db/id (:transaction-rule-account/account tra))
:transaction-account/amount (Math/abs (* (/ 1.0 (count valid-locations))
(:transaction-rule-account/percentage tra)
(:transaction/amount transaction)))
:transaction-account/amount (* 0.01 cents)
:transaction-account/location location})
valid-locations)
(spread-cents cents-to-distribute (count valid-locations))))
[(cond-> {:transaction-account/account (:db/id (:transaction-rule-account/account tra))
:transaction-account/amount (Math/abs (* (:transaction-rule-account/percentage tra)
(:transaction/amount transaction)))}
(:transaction-rule-account/location tra) (assoc :transaction-account/location (:transaction-rule-account/location tra)))]))
:transaction-account/amount (* 0.01 cents-to-distribute)}
(:transaction-rule-account/location tra) (assoc :transaction-account/location (:transaction-rule-account/location tra)))])))
(filter (comp seq :transaction-rule-account/account) (:transaction-rule/accounts rule))))
accounts (mapv
(fn [a]

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

@@ -173,7 +173,6 @@
first)))
(defn transactions->txs [transactions transaction->bank-account apply-rules existing]
(doto
(into []
(for [transaction transactions
@@ -251,8 +250,7 @@
(and (not (seq autopay-invoices-matches))
(not (seq unpaid-invoices-matches))
(not expected-deposit)) (update 0 #(apply-rules % valid-locations))
true (update 0 remove-nils)))))
println))
true (update 0 remove-nils))))))
(defn batch-transact [transactions]

99
test/clj/auto_ap/integration/rule_matching.clj Normal file
View File

@@ -0,0 +1,99 @@
(ns auto-ap.integration.rule-matching
(:require [auto-ap.rule-matching :as sut]
[datomic.api :as d]
[auto-ap.datomic :refer [uri]]
[auto-ap.datomic.migrate :as m]
[clojure.test :as t]
[clojure.tools.logging :as log]
[clojure.set :as set]))
(defn wrap-setup
[f]
(with-redefs [auto-ap.datomic/uri "datomic:mem://datomic-transactor:4334/invoice"]
(d/create-database uri)
(with-redefs [auto-ap.datomic/conn (d/connect uri)]
(m/migrate auto-ap.datomic/conn)
(f)
(d/release auto-ap.datomic/conn)
(d/delete-database uri))))
(t/use-fixtures :each wrap-setup)
(defn noop-rule [transaction locations]
transaction)
(def base-transaction #:transaction {:amount -12.0
:date #inst "2014-01-02T08:00:00.000-00:00"
:bank-account 456
:client 123
:post-date #inst "2014-01-04T08:00:00.000-00:00"
:account-id 1234
:description-original "original-description"
:status "POSTED"
:id "6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b"
:raw-id "1"
:approval-status :transaction-approval-status/unapproved
:description-simple "simple-description"})
(t/deftest rule-applying-fn
(t/testing "Should apply if description matches"
(t/is (sut/rule-applies?
base-transaction
{:transaction-rule/description #"original-description"
:transaction-rule/transaction-approval-status :transaction-approval-status/approved}))
(t/is (not (sut/rule-applies?
base-transaction
{:transaction-rule/description #"xxx"
:transaction-rule/transaction-approval-status :transaction-approval-status/approved}))))
(t/testing "Should do nothing if there are no rules"
(let [process (sut/rule-applying-fn [])]
(t/is (= base-transaction
(process base-transaction ["NG"])))))
(t/testing "Should approve a simple rule"
(let [process (sut/rule-applying-fn [{:transaction-rule/description "simple-description"
:transaction-rule/transaction-approval-status :transaction-approval-status/approved}])
transaction (assoc base-transaction :transaction/description-original "simple-description")]
(t/is (= :transaction-approval-status/approved
(:transaction/approval-status (process transaction ["NG"]))))))
(t/testing "spread cents"
(t/testing "Should split evenly"
(t/is (= [50 50] (sut/spread-cents 100 2)))
(t/is (= [50 49] (sut/spread-cents 99 2)))
(t/is (= [34 33 33] (sut/spread-cents 100 3)))
(t/is (= [100] (sut/spread-cents 100 1)))
(t/is (= [2 2] (sut/spread-cents 4 2)))
(t/is (= [2 1 1] (sut/spread-cents 4 3)))
(t/is (= [2 2 1] (sut/spread-cents 5 3)))
(t/is (= [2 1 1 1] (sut/spread-cents 5 4)))
(t/is (= [3 2 2] (sut/spread-cents 7 3)))
(t/is (= [2 2 2 1] (sut/spread-cents 7 4)))
(t/is (= [2 1] (sut/spread-cents 3 2)))
(t/is (= [1 1 1] (sut/spread-cents 3 4)))
(doseq [x (range 20)]
(t/is (= 11323 (reduce + 0 (sut/spread-cents 11323 (inc x))))))))
(t/testing "Should spread across locations"
(let [process (sut/rule-applying-fn [{:transaction-rule/description "simple-description"
:transaction-rule/accounts [{:transaction-rule-account/location "Shared"
:transaction-rule-account/account {:account/numeric-code 2500}
:transaction-rule-account/percentage 1.0}]
:transaction-rule/transaction-approval-status :transaction-approval-status/approved}])
transaction (assoc base-transaction :transaction/description-original "simple-description" :transaction/amount 1.0)]
(t/is (= [1.0]
(map :transaction-account/amount (:transaction/accounts (process transaction ["NG"])))))
(t/is (= [0.5 0.5]
(map :transaction-account/amount (:transaction/accounts (process transaction ["NG" "BT"])))))
(t/is (= [0.34 0.33 0.33]
(map :transaction-account/amount (:transaction/accounts (process transaction ["NG" "BT" "DE"])))))
(t/is (= [0.01 0.01]
(map :transaction-account/amount (:transaction/accounts (process (assoc transaction :transaction/amount 0.02) ["NG" "BT" "DE"])))))
(t/is (= [0.02 0.01 0.01]
(map :transaction-account/amount (:transaction/accounts (process (assoc transaction :transaction/amount 0.04) ["NG" "BT" "DE"])))))
)))

1
test/clj/auto_ap/integration/yodlee/import.clj
View File

@@ -55,6 +55,7 @@
:description-original "original-description"
:status "POSTED"
:id "6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b"
:raw-id "1"
:approval-status :transaction-approval-status/unapproved
:description-simple "simple-description"}]
result))))