supports validation and multiple account entering.
This commit is contained in:
@@ -3,13 +3,15 @@
|
||||
[auto-ap.datomic.transactions :as d-transactions]
|
||||
[auto-ap.datomic.vendors :as d-vendors]
|
||||
[datomic.api :as d]
|
||||
[auto-ap.datomic :refer [uri]]
|
||||
[auto-ap.datomic :refer [uri remove-nils]]
|
||||
[com.walmartlabs.lacinia :refer [execute]]
|
||||
[com.walmartlabs.lacinia.executor :as executor]
|
||||
[com.walmartlabs.lacinia.resolve :as resolve]
|
||||
[auto-ap.utils :refer [by]]
|
||||
[auto-ap.utils :refer [by dollars=]]
|
||||
[auto-ap.time :refer [parse normal-date]]
|
||||
[auto-ap.datomic.clients :as d-clients]))
|
||||
[auto-ap.datomic.clients :as d-clients]
|
||||
[clojure.set :as set]
|
||||
[clojure.string :as str]))
|
||||
|
||||
(defn get-transaction-page [context args value]
|
||||
(let [args (assoc args :id (:id context))
|
||||
@@ -21,27 +23,50 @@
|
||||
:start (:start args 0)
|
||||
:end (+ (:start args 0) (count transactions))}]))
|
||||
|
||||
(defn transaction-account->entity [{:keys [id account_id amount location]}]
|
||||
(doto (remove-nils #:transaction-account {:amount (Double/parseDouble amount)
|
||||
:db/id id
|
||||
:account account_id
|
||||
:location location})
|
||||
println))
|
||||
|
||||
|
||||
(defn deleted-accounts [transaction accounts]
|
||||
(let [current-accounts (:transaction/accounts transaction)
|
||||
specified-ids (->> accounts
|
||||
(map :id)
|
||||
set)
|
||||
existing-ids (->> current-accounts
|
||||
(map :db/id)
|
||||
set)]
|
||||
(set/difference existing-ids specified-ids)))
|
||||
|
||||
|
||||
(defn edit-transaction [context {{:keys [id location account_id vendor_id] :as transaction} :transaction} value]
|
||||
(let [transaction (d-transactions/get-by-id id)]
|
||||
(defn edit-transaction [context {{:keys [id accounts vendor_id] :as transaction} :transaction} value]
|
||||
(let [transaction (d-transactions/get-by-id id)
|
||||
deleted (deleted-accounts transaction accounts)
|
||||
account-total (reduce + 0 (map (fn [x] (Double/parseDouble (:amount x))) accounts))
|
||||
missing-locations (seq (set/difference
|
||||
(->> (:transaction/accounts transaction)
|
||||
(map :transaction-account/location)
|
||||
set)
|
||||
(-> (:transaction/client transaction)
|
||||
:client/locations
|
||||
set
|
||||
(conj "A")
|
||||
(conj "HQ"))))]
|
||||
(assert-can-see-client (:id context) (:transaction/client transaction) )
|
||||
(when-not (-> (:transaction/client transaction)
|
||||
:client/locations
|
||||
set
|
||||
(conj "A")
|
||||
(conj "HQ")
|
||||
(get location))
|
||||
(throw (ex-info (str "Location '" location "' not found on client.") {}))
|
||||
)
|
||||
(when-not (dollars= (Math/abs (:transaction/amount transaction)) account-total)
|
||||
(let [error (str "Expense account total (" account-total ") does not equal transaction total (" (Math/abs (:transaction/amount transaction)) ")")]
|
||||
(throw (ex-info error {:validation-error error}))))
|
||||
(when missing-locations
|
||||
(throw (ex-info (str "Location '" (str/join ", " missing-locations) "' not found on client.") {})) )
|
||||
|
||||
@(d/transact (d/connect uri)
|
||||
[{:db/id id
|
||||
:transaction/vendor vendor_id
|
||||
:transaction/location location
|
||||
:transaction/account account_id}])
|
||||
(->graphql (d-transactions/get-by-id id)))
|
||||
#_(->graphql {:id id
|
||||
:vendor (d-vendors/get-by-id vendor_id) }))
|
||||
(concat [(remove-nils {:db/id id
|
||||
:transaction/vendor vendor_id
|
||||
:transaction/accounts (map transaction-account->entity accounts)
|
||||
})]
|
||||
(map (fn [d]
|
||||
[:db/retract id :transaction/accounts d])
|
||||
deleted)))
|
||||
(->graphql (d-transactions/get-by-id id))))
|
||||
|
||||
Reference in New Issue
Block a user