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

adding some safety checks to not continue matching indefinitely.

Browse Source
This commit is contained in:
Bryce Covert
2019-04-24 06:54:29 -07:00
parent b9b0147d7c
commit deef4eb4a4
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/graphql/checks.clj
View File

@@ -359,7 +359,7 @@
(defn void-check [context {id :payment_id} value] (defn void-check [context {id :payment_id} value]
(let [check (d-checks/get-by-id id)] (let [check (d-checks/get-by-id id)]
(assert (or (= :payment-status/pending (:payment/status check)) (assert (or (= :payment-status/pending (:payment/status check))
(#{:payment-type/cash :payment-type/debit} (:payment/type check)))) (#{:payment-type/cash} (:payment/type check))))
(assert-can-see-client (:id context) (:db/id (:payment/client check))) (assert-can-see-client (:id context) (:db/id (:payment/client check)))
(let [removing-payments (mapcat (fn [x] (let [removing-payments (mapcat (fn [x]
(let [invoice (:invoice-payment/invoice x) (let [invoice (:invoice-payment/invoice x)

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

@@ -7,14 +7,18 @@
[clj-time.coerce :as coerce] [clj-time.coerce :as coerce]
[digest :refer [sha-256]] [digest :refer [sha-256]]
[auto-ap.datomic.checks :as d-checks] [auto-ap.datomic.checks :as d-checks]
[auto-ap.datomic.transactions :as d-transactions]
[auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.clients :as d-clients]
[auto-ap.time :as time])) [auto-ap.time :as time]))
(defn transaction->payment [_ check-number client-id bank-account-id amount] (defn transaction->payment [_ check-number client-id bank-account-id amount id]
(cond (and check-number client-id bank-account-id) (cond (:transaction/payment (d-transactions/get-by-id [:transaction/id (sha-256 (str id))]))
nil
(and check-number client-id bank-account-id)
(-> (d-checks/get-graphql {:client-id client-id (-> (d-checks/get-graphql {:client-id client-id
:bank-account-id bank-account-id :bank-account-id bank-account-id
:check-number check-number :check-number check-number
@@ -25,9 +29,9 @@
(and client-id bank-account-id amount) (and client-id bank-account-id amount)
(let [matching-checks (d-checks/get-graphql {:client-id client-id (let [matching-checks (d-checks/get-graphql {:client-id client-id
:bank-account-id bank-account-id :bank-account-id bank-account-id
:amount (- amount) :amount (- amount)
:status :payment-status/pending})] :status :payment-status/pending})]
(if (= 1 (count matching-checks)) (if (= 1 (count matching-checks))
(first matching-checks) (first matching-checks)
nil)) nil))
@@ -65,7 +69,7 @@
check-number (extract-check-number transaction) check-number (extract-check-number transaction)
client-id (transaction->client transaction) client-id (transaction->client transaction)
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)]] check (transaction->payment transaction check-number client-id bank-account-id amount id)]]
(try (try
(when client-id (when client-id
@(->> [(remove-nils #:transaction @(->> [(remove-nils #:transaction

2
src/cljs/auto_ap/views/pages/checks.cljs
View File

@@ -214,7 +214,7 @@
[:td status] [:td status]
[:td [:td
(when (or (= :pending status) (when (or (= :pending status)
(and (#{":cash" ":debit" :cash :debit} type) (and (#{":cash" :cash } type)
(not= :voided status))) (not= :voided status)))
[:button.button.is-warning.is-outlined {:on-click (dispatch-event [::void-check i])} [:span [:span.icon [:i.fa.fa-minus-circle]]]]) [:button.button.is-warning.is-outlined {:on-click (dispatch-event [::void-check i])} [:span [:span.icon [:i.fa.fa-minus-circle]]]])
(if s3-url (if s3-url