added auditing.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
[auto-ap.datomic.checks :as d-checks]
|
||||
[auto-ap.graphql.transaction-rules :as g-tr]
|
||||
[datomic.api :as d]
|
||||
[auto-ap.datomic :refer [uri remove-nils]]
|
||||
[auto-ap.datomic :refer [uri remove-nils audit-transact audit-transact-batch]]
|
||||
[com.walmartlabs.lacinia :refer [execute]]
|
||||
[com.walmartlabs.lacinia.executor :as executor]
|
||||
[com.walmartlabs.lacinia.resolve :as resolve]
|
||||
@@ -23,14 +23,14 @@
|
||||
(def approval-status->graphql (ident->enum-f :transaction/approval-status))
|
||||
|
||||
(defn get-transaction-page [context args value]
|
||||
(let [args (assoc args :id (:id context))
|
||||
[transactions transactions-count] (d-transactions/get-graphql (update (<-graphql (:filters args)) :approval-status enum->keyword "transaction-approval-status"))
|
||||
(let [args (assoc (:filters args) :id (:id context))
|
||||
[transactions transactions-count] (d-transactions/get-graphql (update (<-graphql args) :approval-status enum->keyword "transaction-approval-status"))
|
||||
transactions (map ->graphql (map approval-status->graphql transactions))]
|
||||
{:data transactions
|
||||
:total transactions-count
|
||||
:count (count transactions)
|
||||
:start (:start (:filters args) 0)
|
||||
:end (+ (:start (:filters args) 0) (count transactions))}))
|
||||
:start (:start args 0)
|
||||
:end (+ (:start args 0) (count transactions))}))
|
||||
|
||||
(defn unapprove-transactions [context args value]
|
||||
(let [_ (assert-admin (:id context))
|
||||
@@ -45,7 +45,13 @@
|
||||
all-ids (into (set ids) specific-ids)]
|
||||
|
||||
(log/info "Unapproving " (count all-ids) args)
|
||||
(d-transactions/unapprove all-ids)
|
||||
|
||||
(audit-transact-batch
|
||||
(mapv (fn [i]
|
||||
{:db/id i
|
||||
:transaction/approval-status :transaction-approval-status/unapproved})
|
||||
all-ids)
|
||||
(:id context))
|
||||
{:message (str "Succesfully unapproved " (count all-ids) " transactions.")}))
|
||||
|
||||
|
||||
@@ -62,7 +68,12 @@
|
||||
all-ids (into (set ids) specific-ids)]
|
||||
|
||||
(log/info "Deleting " (count all-ids) args)
|
||||
(d-transactions/delete all-ids)
|
||||
(audit-transact-batch
|
||||
(mapcat (fn [i]
|
||||
[[:db/retractEntity i]
|
||||
[:db/retractEntity [:journal-entry/original-entity i]]])
|
||||
all-ids)
|
||||
(:id context))
|
||||
{:message (str "Succesfully deleted " (count all-ids) " transactions.")}))
|
||||
|
||||
(defn transaction-account->entity [{:keys [id account_id amount location]}]
|
||||
@@ -103,29 +114,28 @@
|
||||
(when missing-locations
|
||||
(throw (ex-info (str "Location '" (str/join ", " missing-locations) "' not found on client.") {})) )
|
||||
|
||||
@(d/transact (d/connect uri)
|
||||
(doto (concat [(remove-nils {:db/id id
|
||||
:transaction/vendor vendor_id
|
||||
:transaction/approval-status (some->> approval_status
|
||||
name
|
||||
snake->kebab
|
||||
(keyword "transaction-approval-status"))
|
||||
:transaction/accounts (map transaction-account->entity accounts)
|
||||
})
|
||||
]
|
||||
(cond forecast_match
|
||||
[[:db/add id :transaction/forecast-match forecast_match]]
|
||||
(audit-transact (concat [(remove-nils {:db/id id
|
||||
:transaction/vendor vendor_id
|
||||
:transaction/approval-status (some->> approval_status
|
||||
name
|
||||
snake->kebab
|
||||
(keyword "transaction-approval-status"))
|
||||
:transaction/accounts (map transaction-account->entity accounts)
|
||||
})
|
||||
]
|
||||
(cond forecast_match
|
||||
[[:db/add id :transaction/forecast-match forecast_match]]
|
||||
|
||||
(:db/id (:transaction/forecast-match existing-transaction))
|
||||
[[:db/retract id :transaction/forecast-match (:db/id (:transaction/forecast-match existing-transaction))]]
|
||||
(:db/id (:transaction/forecast-match existing-transaction))
|
||||
[[:db/retract id :transaction/forecast-match (:db/id (:transaction/forecast-match existing-transaction))]]
|
||||
|
||||
:else
|
||||
[])
|
||||
:else
|
||||
[])
|
||||
|
||||
(map (fn [d]
|
||||
[:db/retract id :transaction/accounts d])
|
||||
deleted))
|
||||
clojure.pprint/pprint))
|
||||
(map (fn [d]
|
||||
[:db/retract id :transaction/accounts d])
|
||||
deleted))
|
||||
(:id context))
|
||||
(-> (d-transactions/get-by-id id)
|
||||
approval-status->graphql
|
||||
->graphql)))
|
||||
@@ -142,20 +152,20 @@
|
||||
(when-not (dollars= (- (:transaction/amount transaction))
|
||||
(:payment/amount payment))
|
||||
(throw (ex-info "Amounts don't match" {:validation-error "Amounts don't match"})))
|
||||
@(d/transact (d/connect uri)
|
||||
(into
|
||||
[{:db/id (:db/id payment)
|
||||
:payment/status :payment-status/cleared}
|
||||
(audit-transact (into
|
||||
[{:db/id (:db/id payment)
|
||||
:payment/status :payment-status/cleared}
|
||||
|
||||
{:db/id (:db/id transaction)
|
||||
:transaction/payment (:db/id payment)
|
||||
:transaction/vendor (:db/id (:payment/vendor payment))
|
||||
:transaction/location "A"
|
||||
:transaction/accounts [{:transaction-account/account (:db/id (a/get-account-by-numeric-code-and-sets 21000 ["default"]))
|
||||
:transaction-account/location "A"
|
||||
:transaction-account/amount (Math/abs (:transaction/amount transaction))}]}]
|
||||
(map (fn [x] [:db/retractEntity (:db/id x)] )
|
||||
(:transaction/accounts transaction)))))
|
||||
{:db/id (:db/id transaction)
|
||||
:transaction/payment (:db/id payment)
|
||||
:transaction/vendor (:db/id (:payment/vendor payment))
|
||||
:transaction/location "A"
|
||||
:transaction/accounts [{:transaction-account/account (:db/id (a/get-account-by-numeric-code-and-sets 21000 ["default"]))
|
||||
:transaction-account/location "A"
|
||||
:transaction-account/amount (Math/abs (:transaction/amount transaction))}]}]
|
||||
(map (fn [x] [:db/retractEntity (:db/id x)] )
|
||||
(:transaction/accounts transaction)))
|
||||
(:id context)))
|
||||
(-> (d-transactions/get-by-id transaction_id)
|
||||
approval-status->graphql
|
||||
->graphql))
|
||||
@@ -188,20 +198,20 @@
|
||||
(when (:transaction/payment transaction)
|
||||
|
||||
(throw (ex-info "Transaction already associated with a payment" {:validation-error "Transaction already associated with a payment"}))))
|
||||
@(d/transact (d/connect uri)
|
||||
(transduce
|
||||
(map #(into
|
||||
[(remove-nils (rm/apply-rule {:db/id (:db/id %)
|
||||
:transaction/amount (:transaction/amount %)}
|
||||
transaction-rule
|
||||
(audit-transact (transduce
|
||||
(map #(into
|
||||
[(remove-nils (rm/apply-rule {:db/id (:db/id %)
|
||||
:transaction/amount (:transaction/amount %)}
|
||||
transaction-rule
|
||||
|
||||
(or (-> % :transaction/bank-account :bank-account/locations)
|
||||
(-> % :transaction/client :client/locations))))]
|
||||
(map (fn [x] [:db/retractEntity (:db/id x)] )
|
||||
(:transaction/accounts %))))
|
||||
into
|
||||
[]
|
||||
transactions))
|
||||
(or (-> % :transaction/bank-account :bank-account/locations)
|
||||
(-> % :transaction/client :client/locations))))]
|
||||
(map (fn [x] [:db/retractEntity (:db/id x)] )
|
||||
(:transaction/accounts %))))
|
||||
into
|
||||
[]
|
||||
transactions)
|
||||
(:id context))
|
||||
)
|
||||
(transduce
|
||||
(comp
|
||||
|
||||
Reference in New Issue
Block a user