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

added auditing.

Browse Source
This commit is contained in:
Bryce Covert
2020-08-27 07:24:12 -07:00
parent 6fce14ed6a
commit 183c74f128
13 changed files with 337 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
[auto-ap.datomic.transactions :as d-transactions]
[auto-ap.datomic.clients :as d-clients]
[auto-ap.datomic.bank-accounts :as d-bank-accounts]
[auto-ap.datomic :refer [uri remove-nils]]
[auto-ap.datomic :refer [uri remove-nils audit-transact]]
[auto-ap.utils :refer [by dollars-0?]]
[auto-ap.numeric :refer [num->words]]
[config.core :refer [env]]
@@ -246,21 +246,22 @@
:payment/type :payment-type/check
:payment/memo memo
:payment/status :payment-status/pending
:payment/pdf-data (pr-str {:vendor vendor
:paid-to (or (:vendor/paid-to vendor) (:vendor/name vendor))
:amount (reduce + 0 (map (comp invoice-amounts :db/id) invoices))
:check (str (+ index (:bank-account/check-number bank-account)))
:memo memo
:date (date->str (local-now))
:client client
:bank-account bank-account
#_#_:client {:name (:name client)
:address (:address client)
:signature-file (:signature-file client)
:bank {:name (:bank-account/bank-name bank-account)
:acct (:bank-account/bank-code bank-account)
:routing (:bank-account/routing bank-account)
:acct-number (:bank-account/number bank-account)}}})))]
:payment/pdf-data (doto (pr-str {:vendor vendor
:paid-to (or (:vendor/paid-to vendor) (:vendor/name vendor))
:amount (reduce + 0 (map (comp invoice-amounts :db/id) invoices))
:check (str (+ index (:bank-account/check-number bank-account)))
:memo memo
:date (date->str (local-now))
:client (dissoc client :client/bank-accounts)
:bank-account (dissoc bank-account :bank-account/start-date)
#_#_:client {:name (:name client)
:address (:address client)
:signature-file (:signature-file client)
:bank {:name (:bank-account/bank-name bank-account)
:acct (:bank-account/bank-code bank-account)
:routing (:bank-account/routing bank-account)
:acct-number (:bank-account/number bank-account)}}})
println)))]
(-> []
(conj payment)
@@ -306,7 +307,7 @@
:client-id client-id
:invoices (map :invoice/invoice-number invoices)}))))
(defn print-checks [invoice-payments client-id bank-account-id type]
(defn print-checks [invoice-payments client-id bank-account-id type id]
(let [type (keyword "payment-type" (name type))
invoices (d-invoices/get-multi (map :invoice-id invoice-payments))
client (d-clients/get-by-id client-id)
@@ -330,7 +331,7 @@
(> (:payment/amount %) 0.0)
)
checks)))
@(d/transact (d/connect uri) checks)
(audit-transact checks id)
{:invoices (d-invoices/get-multi (map :invoice-id invoice-payments))
@@ -372,13 +373,14 @@
0
invoice-payment-lookup)]
@(d/transact (d/connect uri)
(into [(assoc base-payment
:payment/type :payment-type/check
:payment/status :payment-status/pending
:payment/check-number (:check_number args)
:payment/date (c/to-date (parse (:date args) iso-date)))]
(invoice-payments invoices invoice-payment-lookup)))
(audit-transact
(into [(assoc base-payment
:payment/type :payment-type/check
:payment/status :payment-status/pending
:payment/check-number (:check_number args)
:payment/date (c/to-date (parse (:date args) iso-date)))]
(invoice-payments invoices invoice-payment-lookup))
(:id context))
(->graphql
{:s3-url nil
:invoices (d-invoices/get-multi (map :invoice_id (:invoice_payments args)))})))
@@ -404,7 +406,8 @@
:payment/amount 0.0
:payment/status :payment-status/voided}]
@(d/transact (d/connect uri) (conj removing-payments updated-payment)))
(audit-transact (conj removing-payments updated-payment)
(:id context)))
(-> (d-checks/get-by-id id)
(->graphql))))

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

@@ -9,7 +9,7 @@
[auto-ap.time :refer [parse iso-date]]
[auto-ap.utils :refer [dollars=]]
[datomic.api :as d]
[auto-ap.datomic :refer [uri remove-nils]]
[auto-ap.datomic :refer [uri remove-nils audit-transact]]
[clj-time.coerce :as coerce]
[clj-time.core :as time]
[clojure.set :as set]))
@@ -34,15 +34,14 @@
(defn reject-invoices [context {:keys [invoices] :as in} value]
(assert-admin (:id context))
(let [transactions (map (fn [i] [:db/retractEntity i ]) invoices)
transaction-result @(d/transact (d/connect uri) transactions)]
transaction-result (audit-transact transactions (:id context))]
invoices))
(defn approve-invoices [context {:keys [invoices] :as in} value]
(assert-admin (:id context))
(let [transactions (map (fn [i] {:db/id i :invoice/import-status :import-status/imported}) invoices)
transaction-result @(d/transact (d/connect uri) transactions)]
transaction-result (audit-transact transactions (:id context))]
invoices))
(defn assert-no-conflicting [{:keys [total invoice_number location client_id vendor_id vendor_name date] :as in}]
@@ -95,7 +94,7 @@
(defn add-invoice [context {{:keys [total invoice_number location client_id vendor_id vendor_name date] :as in} :invoice} value]
(assert-no-conflicting in)
(assert-can-see-client (:id context) client_id)
(let [transaction-result @(d/transact (d/connect uri) [(add-invoice-transaction in)])]
(let [transaction-result (audit-transact [(add-invoice-transaction in)] (:id context))]
(-> (d-invoices/get-by-id (get-in transaction-result [:tempids "invoice"]))
(->graphql))))
@@ -107,12 +106,13 @@
(assert-no-conflicting in)
(assert-can-see-client (:id context) client_id)
(assert-bank-account-belongs client_id bank-account-id)
(let [transaction-result @(d/transact (d/connect uri) [(add-invoice-transaction in)])]
(let [transaction-result (audit-transact [(add-invoice-transaction in)] (:id context))]
(-> (gq-checks/print-checks [{:invoice-id (get-in transaction-result [:tempids "invoice"])
:amount total}]
client_id
bank-account-id
type)
type
(:id context))
->graphql)))
@@ -142,24 +142,25 @@
expense_accounts)}
due (assoc :invoice/due (coerce/to-date due))
(boolean? automatically_paid_when_due) (assoc :invoice/automatically-paid-when-due automatically_paid_when_due))]
@(d/transact (d/connect uri) (concat [updated-invoice]
(map (fn [d] [:db/retract id :invoice/expense-accounts d]) deleted)))
(audit-transact (concat [updated-invoice]
(map (fn [d] [:db/retract id :invoice/expense-accounts d]) deleted))
(:id context))
(-> (d-invoices/get-by-id id)
(->graphql))))
(defn void-invoice [context {id :invoice_id} value]
(let [invoice (d-invoices/get-by-id id)
_ (assert-can-see-client (:id context) (:db/id (:invoice/client invoice)))
updated-invoice (d-invoices/update {:db/id id
:invoice/total 0.0
:invoice/outstanding-balance 0.0
:invoice/status :invoice-status/voided
:invoice/expense-accounts (map (fn [ea] {:db/id (:db/id ea)
:invoice-expense-account/amount 0.0})
(:invoice/expense-accounts invoice))})]
_ (assert-can-see-client (:id context) (:db/id (:invoice/client invoice)))]
(audit-transact [{:db/id id
:invoice/total 0.0
:invoice/outstanding-balance 0.0
:invoice/status :invoice-status/voided
:invoice/expense-accounts (map (fn [ea] {:db/id (:db/id ea)
:invoice-expense-account/amount 0.0})
(:invoice/expense-accounts invoice))}]
(:id context))
(-> updated-invoice
(->graphql))))
(-> (d-invoices/get-by-id id) (->graphql))))
(defn unvoid-invoice [context {id :invoice_id} value]
@@ -176,17 +177,18 @@
:in ['$ '?e]}
:args [history id]})
[last-transaction] (->> txs (sort-by first) (last))]
@(d/transact conn [(->> txs
(filter (fn [[tx]] (= tx last-transaction)))
(reduce (fn [new-transaction [_ entity original-status original-outstanding total expense-account expense-account-amount]]
(-> new-transaction
(assoc :db/id entity
:invoice/total total
:invoice/status original-status
:invoice/outstanding-balance original-outstanding)
(audit-transact [(->> txs
(filter (fn [[tx]] (= tx last-transaction)))
(reduce (fn [new-transaction [_ entity original-status original-outstanding total expense-account expense-account-amount]]
(-> new-transaction
(assoc :db/id entity
:invoice/total total
:invoice/status original-status
:invoice/outstanding-balance original-outstanding)
(update :invoice/expense-accounts conj {:db/id expense-account :invoice-expense-account/amount expense-account-amount}))
) {}))])
(update :invoice/expense-accounts conj {:db/id expense-account :invoice-expense-account/amount expense-account-amount}))
) {}))]
(:id context))
(-> (d-invoices/get-by-id id)
(->graphql))))
@@ -201,8 +203,9 @@
expense-account->entity
(:expense_accounts args))}]
@(d/transact (d/connect uri) (concat [updated]
(map (fn [d] [:db/retract invoice-id :invoice/expense-accounts d])deleted)))
(audit-transact (concat [updated]
(map (fn [d] [:db/retract invoice-id :invoice/expense-accounts d])deleted))
(:id context))
(->graphql
(d-invoices/get-by-id (:invoice_id args)))))

116
src/clj/auto_ap/graphql/transactions.clj
View File

@@ -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