From 9ab89b295268bce9b2e5b4898e27dd526e993bd4 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 26 Apr 2023 09:56:42 -0700 Subject: [PATCH] bug fix for ledgers missing bank account details. --- docker-compose.dev.yml | 8 ++++++-- src/clj/auto_ap/graphql/ledger.clj | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 52e826ab..b1f5cd74 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -18,7 +18,11 @@ services: restart: "always" environment: - DATOMIC_PORT=4334 - - XMS=-Xms4g - - XMX=-Xmx8g + - XMS=-Xms3g + - XMX=-Xmx6g + ulimits: + nofile: + soft: 65536 + hard: 65536 ports: - 4334:4334 diff --git a/src/clj/auto_ap/graphql/ledger.clj b/src/clj/auto_ap/graphql/ledger.clj index c0948b96..588c6e10 100644 --- a/src/clj/auto_ap/graphql/ledger.clj +++ b/src/clj/auto_ap/graphql/ledger.clj @@ -69,15 +69,17 @@ ({:bank-account-type/check :account-type/asset :bank-account-type/cash :account-type/asset :bank-account-type/credit :account-type/liability} - (:db/ident (:bank-account/type (:account li)))))] + (:db/ident (:bank-account/type (:journal-entry-line/account li)))))] [(-> j :journal-entry/client :client/code) (-> j :journal-entry/vendor :vendor/name) (atime/unparse (coerce/to-date-time (-> j :journal-entry/date)) atime/normal-date) (-> j :db/id) (-> li :db/id) - (-> li :journal-entry-line/account :account/numeric-code) - (-> li :journal-entry-line/account :account/name) + (or (-> li :journal-entry-line/account :account/numeric-code) + (-> li :journal-entry-line/account :bank-account/numeric-code)) + (or (-> li :journal-entry-line/account :account/name) + (-> li :journal-entry-line/account :bank-account/name)) (some-> account-type name ) (-> li :journal-entry-line/debit) (-> li :journal-entry-line/credit)