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

makes import check for accoutns

Browse Source
This commit is contained in:
Bryce Covert
2019-08-31 07:08:57 -07:00
parent c88840c719
commit 96ec3b1cf5
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/clj/auto_ap/datomic/accounts.clj
View File

@@ -3,17 +3,20 @@
[auto-ap.graphql.utils :refer [->graphql]] [auto-ap.graphql.utils :refer [->graphql]]
[auto-ap.datomic :refer [uri merge-query]])) [auto-ap.datomic :refer [uri merge-query]]))
(defn get-accounts [args] (defn get-accounts
(let [query (cond-> {:query {:find ['(pull ?e [* {:account/type [:db/ident :db/id]}])] ([]
:in ['$] (get-accounts {}))
:where [['?e :account/name]]} ([args]
:args [(d/db (d/connect uri))]} (let [query (cond-> {:query {:find ['(pull ?e [* {:account/type [:db/ident :db/id]}])]
(:account-set args) (merge-query {:query {:in ['?account-set] :in ['$]
:where [['?e :account/account-set '?account-set]]} :where [['?e :account/name]]}
:args [(:account-set args)]}))] :args [(d/db (d/connect uri))]}
(->> (:account-set args) (merge-query {:query {:in ['?account-set]
(d/query query) :where [['?e :account/account-set '?account-set]]}
(map first)))) :args [(:account-set args)]}))]
(->>
(d/query query)
(map first)))))
(defn get-account-by-numeric-code-and-sets [numeric-code sets] (defn get-account-by-numeric-code-and-sets [numeric-code sets]
(let [query (cond-> {:query {:find ['(pull ?e [* {:account/type [:db/ident :db/id]}])] (let [query (cond-> {:query {:find ['(pull ?e [* {:account/type [:db/ident :db/id]}])]

4
src/clj/auto_ap/graphql/ledger.clj
View File

@@ -167,8 +167,8 @@
{} {}
(:entries args)) (:entries args))
all-vendors (into all-vendors new-hidden-vendors) all-vendors (into all-vendors new-hidden-vendors)
all-accounts (transduce (map :account/code) conj #{} (a/get-accounts))
transaction (doall (map transaction (doall (map
(assoc-error (fn [entry] (assoc-error (fn [entry]
(let [entry (-> entry (let [entry (-> entry
(update :amount #(Double/parseDouble %)) (update :amount #(Double/parseDouble %))
@@ -207,7 +207,7 @@
(:location ea)) (:location ea))
(throw (Exception. (str "Location '" (:location ea) "' not found.")))) (throw (Exception. (str "Location '" (:location ea) "' not found."))))
(when (and (not (re-matches #"^[0-9]+$" (:account_identifier ea))) (when (and (not (all-accounts (:account_identifier ea)))
(not (get (not (get
(get all-client-bank-accounts (:client_code entry)) (get all-client-bank-accounts (:client_code entry))
(:account_identifier ea)))) (:account_identifier ea))))