diff --git a/src/clj/auto_ap/graphql/ledger.clj b/src/clj/auto_ap/graphql/ledger.clj index 1e4d107d..87397ace 100644 --- a/src/clj/auto_ap/graphql/ledger.clj +++ b/src/clj/auto_ap/graphql/ledger.clj @@ -259,7 +259,12 @@ (defn import-ledger [context args _] (assert-admin (:id context)) (lc/with-context {:area "import ledger"} - (let [all-vendors (by :vendor/name (d-vendors/get-graphql {})) + (let [all-vendors (->> (d/q '[:find [?e ...] + :in $ + :where [?e :vendor/name]] + (d/db conn)) + (d/pull-many (d/db conn) d-vendors/default-read) + (by :vendor/name)) all-clients (by :client/code (d-clients/get-all )) all-client-bank-accounts (reduce (fn [acc client] @@ -289,7 +294,12 @@ {} (:entries args)) _ (audit-transact-batch (vec (vals new-hidden-vendors)) (:id context)) - all-vendors (by :vendor/name (d-vendors/get-graphql {})) + all-vendors (->> (d/q '[:find [?e ...] + :in $ + :where [?e :vendor/name]] + (d/db conn)) + (d/pull-many (d/db conn) d-vendors/default-read) + (by :vendor/name)) all-accounts (transduce (map (comp str :account/numeric-code)) conj #{} (a/get-accounts)) transaction (doall (map (assoc-error (fn [entry] diff --git a/src/clj/auto_ap/routes/exports.clj b/src/clj/auto_ap/routes/exports.clj index 5bd37416..c737d934 100644 --- a/src/clj/auto_ap/routes/exports.clj +++ b/src/clj/auto_ap/routes/exports.clj @@ -208,7 +208,11 @@ (GET "/vendors/export" {:keys [identity]} (assert-admin identity) (statsd/time! [(str "export.time") {:tags #{"export:vendors"}}] - (map <-graphql (d-vendors/get-graphql {})))) + (map <-graphql (->> (d/q '[:find [?e ...] + :in $ + :where [?e :vendor/name]] + (d/db conn)) + (d/pull-many (d/db conn) d-vendors/default-read))))) (GET "/ledger/export" {:keys [identity query-params]} (let [start-date (or (some-> (query-params "start-date") (atime/parse atime/iso-date)) diff --git a/src/clj/auto_ap/routes/invoices.clj b/src/clj/auto_ap/routes/invoices.clj index 6b3249a4..158b7596 100644 --- a/src/clj/auto_ap/routes/invoices.clj +++ b/src/clj/auto_ap/routes/invoices.clj @@ -75,7 +75,12 @@ (defn parse-invoice-rows [excel-rows] (let [columns [:raw-date :vendor-name :check :location :invoice-number :amount :client-name :bill-entered :bill-rejected :added-on :exported-on :account-numeric-code] - all-vendors (by :vendor/name (d-vendors/get-graphql {})) + all-vendors (->> (d/q '[:find [?e ...] + :in $ + :where [?e :vendor/name]] + (d/db conn)) + (d/pull-many (d/db conn) d-vendors/default-read) + (by :vendor/name)) all-clients (d-clients/get-all) all-clients (merge (by :client/code all-clients) (by :client/name all-clients)) rows (->> (str/split excel-rows #"\n")