other tweak
This commit is contained in:
@@ -35,39 +35,5 @@
|
|||||||
|
|
||||||
(require 'auto-ap.time_reader)
|
(require 'auto-ap.time_reader)
|
||||||
|
|
||||||
(let [start #clj-time/date-time "2024-02-01"
|
|
||||||
end #clj-time/date-time "2024-04-01"]
|
|
||||||
(for [[ib ba c] (seq (get-intuit-bank-accounts (dc/db conn) "BCFM"))
|
|
||||||
:let [raw-transactions (i/get-transactions (atime/unparse-local start atime/iso-date)
|
|
||||||
(atime/unparse-local end atime/iso-date)
|
|
||||||
ib)
|
|
||||||
ideal-transactions (intuits->transactions raw-transactions ba c)
|
|
||||||
|
|
||||||
found-transactions (when (seq ideal-transactions)
|
|
||||||
(into {} (dc/q '[:find ?si (count ?t)
|
|
||||||
:in $ [?eid ...]
|
|
||||||
:where
|
|
||||||
[?t :transaction/id ?eid]
|
|
||||||
[?t :transaction/approval-status ?s]
|
|
||||||
[?s :db/ident ?si]]
|
|
||||||
(dc/db conn)
|
|
||||||
(map :transaction/id ideal-transactions))))
|
|
||||||
|
|
||||||
missing-transaction-ids (when (seq ideal-transactions)
|
|
||||||
(->>
|
|
||||||
(dc/q '[:find ?eid
|
|
||||||
:in $ [?eid ...]
|
|
||||||
:where (not [_ :transaction/id ?eid])]
|
|
||||||
(dc/db conn)
|
|
||||||
(map :transaction/id ideal-transactions))
|
|
||||||
(map first)
|
|
||||||
(into #{})))
|
|
||||||
missing-transactions (filter (comp missing-transaction-ids :transaction/id) ideal-transactions)]]
|
|
||||||
{:bank-account/name (pull-attr (dc/db conn) :bank-account/name ba)
|
|
||||||
:external-transaction-count (count raw-transactions)
|
|
||||||
:integreat-transaction-count (reduce + 0 (vals found-transactions))
|
|
||||||
:approved-count (:transaction-approval-status/approved found-transactions 0)
|
|
||||||
:unapproved-count (:transaction-approval-status/unapproved found-transactions 0)
|
|
||||||
:requires-feedback-count (:transaction-approval-status/requires-feedback found-transactions 0)
|
|
||||||
:missing-transactions missing-transactions}))
|
|
||||||
|
|
||||||
|
|||||||
@@ -121,7 +121,7 @@
|
|||||||
{:id id
|
{:id id
|
||||||
:name name
|
:name name
|
||||||
:last-updated (c/to-date-time (-> metadata :LastUpdatedTime))
|
:last-updated (c/to-date-time (-> metadata :LastUpdatedTime))
|
||||||
:current-balance current-balance}))))
|
:current-balance (try (double current-balance) (catch Exception _ nil))}))))
|
||||||
|
|
||||||
|
|
||||||
(defn get-all-transactions [start end]
|
(defn get-all-transactions [start end]
|
||||||
|
|||||||
Reference in New Issue
Block a user