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

Tons of small fixes

Browse Source
This commit is contained in:
Bryce Covert
2020-07-27 21:28:02 -07:00
parent 3737cfa628
commit fdc1d3e9e4
26 changed files with 428 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/datomic/bank_accounts.clj
View File

@@ -11,7 +11,7 @@
(update-in [:query :where] conj where))]
(reduce #(update-in %1 [:query :where] conj %2) query rest)))
(def default-read '(pull ?e [*]))
(def default-read '(pull ?e [* {:client/_bank-accounts [:db/id]}]))
(defn <-datomic [x]
(->> x

6
src/clj/auto_ap/datomic/checks.clj
View File

@@ -72,6 +72,12 @@
:where ['[?e :payment/check-number ?check-number]]}
:args [(:check-number args)]})
(not-empty (:invoice-number args))
(merge-query {:query {:in ['?invoice-number]
:where ['[?e :payment/invoices ?i]
'[?i :invoice/invoice-number ?invoice-number]]}
:args [(:invoice-number args)]})
(:bank-account-id args)
(merge-query {:query {:in ['?bank-account-id]
:where ['[?e :payment/bank-account ?bank-account-id]]}

2
src/clj/auto_ap/datomic/ledger.clj
View File

@@ -115,11 +115,13 @@
(group-by :db/id))]
(->> ids
(map results)
(filter identity)
(map first))))
(defn get-graphql [args]
(let [db (d/db (d/connect uri))
{ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)]
[(->> (graphql-results ids-to-retrieve db args))
matching-count]))

11
src/clj/auto_ap/datomic/migrate.clj
View File

@@ -299,7 +299,16 @@
{:db/ident :client/week-b-credits
:db/doc "How much money gets credited each week"
:db/valueType :db.type/double
:db/cardinality :db.cardinality/one}]]}}
:db/cardinality :db.cardinality/one}]]}
:auto-ap/auto-pay {:txes [[{:db/ident :vendor/automatically-paid-when-due
:db/doc "The clients for which invoices will automatically be paid."
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/many}
{:db/ident :invoice/automatically-paid-when-due
:db/doc "Whether this invoice should be marked as paid when it's due"
:db/valueType :db.type/boolean
:db/cardinality :db.cardinality/one}]]}}
]
(println "Conforming database...")
(c/ensure-conforms conn norms-map)

6
src/clj/auto_ap/datomic/vendors.clj
View File

@@ -15,7 +15,8 @@
(def default-read
'[* {:vendor/account-overrides [* {:vendor-account-override/client [:client/name :db/id]
:vendor-account-override/account [:account/name :account/numeric-code :db/id]}]
:vendor/terms-overrides [* {:vendor-terms-override/client [:client/name :db/id]}]}])
:vendor/terms-overrides [* {:vendor-terms-override/client [:client/name :client/code :db/id]}]
:vendor/automatically-paid-when-due [:db/id :client/name]}])
(defn get-graphql [args]
(->> (cond-> {:query {:find [(list 'pull '?e default-read)]
@@ -32,7 +33,8 @@
{:default-account [:account/name :db/id :account/location]
:vendor/account-overrides [* {:vendor-account-override/client [:client/name :db/id]
:vendor-account-override/account [:account/name :account/numeric-code :db/id]}]
:vendor/terms-overrides [* {:vendor-terms-override/client [:client/name :db/id]}]}])
:vendor/terms-overrides [* {:vendor-terms-override/client [:client/name :db/id]}]
:vendor/automatically-paid-when-due [:db/id :client/name]}])
:in $ ?e
:where [?e]]
(d/db (d/connect uri))