diff --git a/src/clj/auto_ap/routes/exports.clj b/src/clj/auto_ap/routes/exports.clj index 19c4a1f0..baa19da5 100644 --- a/src/clj/auto_ap/routes/exports.clj +++ b/src/clj/auto_ap/routes/exports.clj @@ -179,53 +179,55 @@ (assert-admin identity) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) "export:ledger2"}}] - (let [results (->> (d/q '[:find (pull ?e [:journal-entry/external-id - :journal-entry/cleared - :journal-entry/alternate-description - :journal-entry/date - :journal-entry/note - :journal-entry/amount - :journal-entry/source - :journal-entry/cleared-against - :journal-entry/original-entity - {:journal-entry/client [:client/name :client/code :db/id] - :journal-entry/vendor [:vendor/name :db/id] - :journal-entry/line-items [:journal-entry-line/location - :journal-entry-line/debit - :journal-entry-line/credit - {:journal-entry-line/account [:bank-account/include-in-reports - :bank-account/bank-name - :bank-account/code - :bank-account/visible - :bank-account/name - :bank-account/number - :account/code - :account/name - :account/numeric-code - :account/location - {:account/type [:db/ident :db/id]} - {:bank-account/type [:db/ident :db/id]}]}]}]) - :in $ ?c ?start-date - :where [?e :journal-entry/client ?c] - [?e :journal-entry/date ?date] - [(>= ?date ?start-date)]] - (d/db conn) - [:client/code (query-params "client-code")] - (coerce/to-date start-date))) - tf-result (transduce (comp - (map first) - (filter (fn [je] - (every? - (fn [jel] - (let [include-in-reports (-> jel :journal-entry-line/account :bank-account/include-in-reports)] - (or (nil? include-in-reports) - (true? include-in-reports)))) - (:journal-entry/line-items je)))) - (map <-graphql)) - conj - (list) - results)] - tf-result)))) + (let [results (->> (d/q '[:find (pull ?e [:db/id + :journal-entry/external-id + :journal-entry/cleared + :journal-entry/alternate-description + :journal-entry/date + :journal-entry/note + :journal-entry/amount + :journal-entry/source + :journal-entry/cleared-against + :journal-entry/original-entity + {:journal-entry/client [:client/name :client/code :db/id] + :journal-entry/vendor [:vendor/name :db/id] + :journal-entry/line-items [:db/id + :journal-entry-line/location + :journal-entry-line/debit + :journal-entry-line/credit + {:journal-entry-line/account [:bank-account/include-in-reports + :bank-account/bank-name + :bank-account/code + :bank-account/visible + :bank-account/name + :bank-account/number + :account/code + :account/name + :account/numeric-code + :account/location + {:account/type [:db/ident :db/id]} + {:bank-account/type [:db/ident :db/id]}]}]}]) + :in $ ?c ?start-date + :where [?e :journal-entry/client ?c] + [?e :journal-entry/date ?date] + [(>= ?date ?start-date)]] + (d/db conn) + [:client/code (query-params "client-code")] + (coerce/to-date start-date))) + tf-result (transduce (comp + (map first) + (filter (fn [je] + (every? + (fn [jel] + (let [include-in-reports (-> jel :journal-entry-line/account :bank-account/include-in-reports)] + (or (nil? include-in-reports) + (true? include-in-reports)))) + (:journal-entry/line-items je)))) + (map <-graphql)) + conj + (list) + results)] + tf-result))))