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

Makes multiple client selection somewhat possible via graphql.

Browse Source
This commit is contained in:
Bryce
2023-08-31 13:05:06 -07:00
parent 9c472dfc8e
commit 1d82ec29e0
29 changed files with 274 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,15 +40,13 @@
([db args]
(let [check-number-like (try (Long/parseLong (:check-number-like args)) (catch Exception _ nil))
query (if (:exact-match-id args)
(cond-> {:query {:find '[?e]
:in '[$ ?e]
:where '[[?e :payment/client ?c]]}
:args [db
(:exact-match-id args)]}
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :payment/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]}))
{:query {:find '[?e]
:in '[$ ?e [?c ...]]
:where '[[?e :payment/client ?c]]}
:args [db
(:exact-match-id args)
(map :db/id (:clients args))]
}
(cond-> {:query {:find []
:in ['$]
:where []}
@@ -69,10 +67,10 @@
:where []}
:args [(:exact-match-id args)]})
(limited-clients (:id args))
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :payment/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]})
:args [(map :db/id (:clients args))]})
(:client-id args)

10
src/clj/auto_ap/datomic/clients.clj
View File

@@ -165,18 +165,20 @@
:else
nil)
valid-ids (cond
matching-ids (cond
(and name-like-ids (limited-clients (:id args)))
(set/intersection name-like-ids (limited-clients (:id args)))
(limited-clients (:id args))
(limited-clients (:id args))
name-like-ids
name-like-ids
:else
nil)
valid-ids (if matching-ids
(set/intersection (set (map :db/id (:clients args)))
matching-ids)
(set (map :db/id (:clients args))))
query (cond-> {:query {:find []
:in ['$ ]

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

@@ -38,10 +38,10 @@
"fee" ['[?e :expected-deposit/fee ?sort-fee]]}
args)
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :expected-deposit/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]})
:args [(set (map :db/id (:clients args)))]})
(:exact-match-id args)
(merge-query {:query {:in ['?e]

31
src/clj/auto_ap/datomic/invoices.clj
View File

@@ -49,24 +49,21 @@
([db args]
(let [query
(if (:exact-match-id args)
(cond-> {:query {:find '[?e]
:in '[$ ?e]
:where '[[?e :invoice/client ?c]]}
:args [db
(:exact-match-id args)]}
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :invoice/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]}))
{:query {:find '[?e]
:in '[$ ?e [?c ...]]
:where '[[?e :invoice/client ?c]]}
:args [db
(:exact-match-id args)
(map :db/id (:clients args))]}
(cond-> {:query {:find []
:in ['$]
:where ['[?e :invoice/client]]}
:args [db]}
(limited-clients (:id args))
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :invoice/client ?xx]]}
:args [ (set (map :db/id (limited-clients (:id args))))]})
:args [ (map :db/id (:clients args))]})
(:client-id args)
(merge-query {:query {:in ['?client-id]
:where ['[?e :invoice/client ?client-id]]}
@@ -87,14 +84,14 @@
(string? (:original-id args)) Long/parseLong )]})
(:start (:date-range args)) (merge-query {:query {:in '[?start-date]
:where ['[?e :invoice/date ?date]
'[(>= ?date ?start-date)]]}
:args [(coerce/to-date (:start (:date-range args)))]})
:where ['[?e :invoice/date ?date]
'[(>= ?date ?start-date)]]}
:args [(coerce/to-date (:start (:date-range args)))]})
(:end (:date-range args)) (merge-query {:query {:in '[?end-date]
:where ['[?e :invoice/date ?date]
'[(<= ?date ?end-date)]]}
:args [(coerce/to-date (:end (:date-range args)))]})
:where ['[?e :invoice/date ?date]
'[(<= ?date ?end-date)]]}
:args [(coerce/to-date (:end (:date-range args)))]})
(:start (:due-range args)) (merge-query {:query {:in '[?start-due]
:where ['[?e :invoice/due ?due]

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

@@ -16,24 +16,21 @@
(defn raw-graphql-ids [db args]
(let [query
(if (:exact-match-id args)
(cond-> {:query {:find '[?e]
:in '[$ ?e]
:where '[[?e :journal-entry/client ?c]]}
:args [db
(:exact-match-id args)]}
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :journal-entry/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]}))
{:query {:find '[?e]
:in '[$ ?e [?c ...]]
:where '[[?e :journal-entry/client ?c]]}
:args [db
(:exact-match-id args)
(map :db/id (:clients args))]}
(cond-> {:query {:find []
:in ['$ ]
:where []}
:args [db]}
(:client-id args)
(merge-query {:query {:in ['?client-id]
:where ['[?e :journal-entry/client ?client-id]]}
:args [(:client-id args)]})
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :journal-entry/client ?xx]]}
:args [(set (map :db/id (:clients args)))]})
(:only-external args)
(merge-query {:query {:where ['(not [?e :journal-entry/original-entity ])]}})
@@ -86,7 +83,7 @@
'[(>= ?c ?from-numeric-code)]
'[(<= ?c ?to-numeric-code)]]}
:args [(vec (for [{:keys [from to]} (:numeric-code args)]
[(or from 0) (or to 99999)]))]})
[(or from 0) (or to 99999)]))]})
(:amount-gte args)
@@ -127,10 +124,10 @@
:where ['[?e :journal-entry/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]})
(:sort args) (add-sorter-fields {"client" ['[?e :journal-entry/client ?c]
'[?c :client/name ?sort-client]]
'[?c :client/name ?sort-client]]
"date" ['[?e :journal-entry/date ?sort-date]]
"vendor" ['[?e :journal-entry/vendor ?v]
'[?v :vendor/name ?sort-vendor]]
'[?v :vendor/name ?sort-vendor]]
"amount" ['[?e :journal-entry/amount ?sort-amount]]
"external-id" ['[?e :journal-entry/external-id ?sort-external-id]]
"source" ['[?e :journal-entry/source ?sort-source]]}

8
src/clj/auto_ap/datomic/reports.clj
View File

@@ -21,10 +21,10 @@
:args [db]}
(:client-id args)
(merge-query {:query {:in ['?client-id]
:where ['[?e :report/client ?client-id]]}
:args [(:client-id args)]})
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :report/client ?xx]]}
:args [(set (map :db/id (:clients args)))]})
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]

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

@@ -57,7 +57,7 @@
{:charge/processor [:db/ident]} {:expected-deposit/_charges [:db/id]}]}])
(defn raw-graphql-ids [db args]
(let [visible-clients (visible-clients (:id args))
(let [visible-clients (set (map :db/id (:clients args)))
selected-clients (->> (cond
(:client-id args)
(set/intersection #{(:client-id args)}

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

@@ -50,15 +50,10 @@
"amount-gte" ['[?e :transaction-rule/amount-gte ?sort-amount-gte]]}
args)
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :transaction-rule/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]})
(:client-id args)
(merge-query {:query {:in ['?client-id]
:where ['[?e :transaction-rule/client ?client-id]]}
:args [(:client-id args)]})
:args [(set (map :db/id (:clients args)))]})
(:vendor-id args)
(merge-query {:query {:in ['?vendor-id]

13
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -45,14 +45,11 @@
query
(if (:exact-match-id args)
(cond-> {:query {:find '[?e]
:in '[$ ?e]
:in '[$ ?e [?c ...]]
:where '[[?e :transaction/client ?c]]}
:args [db
(:exact-match-id args)]}
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :transaction/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]}))
(:exact-match-id args)
(map :db/id (:clients args))]})
(cond-> {:query {:find []
:in ['$ ]
:where []}
@@ -62,10 +59,10 @@
(merge-query {:query {:in '[[?e ...]]}
:args [potential-duplicates]})
(limited-clients (:id args))
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :transaction/client ?xx]]}
:args [(set (map :db/id (limited-clients (:id args))))]})
:args [(set (map :db/id (:clients args)))]})
(:bank-account-id args)
(merge-query {:query {:in ['?bank-account-id]

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

@@ -23,10 +23,10 @@
:where ['[?e :yodlee-provider-account/id]]}
:args [db]}
(limited-clients (:id args))
(merge-query {:query {:in ['[?xx ...]]
(seq (:clients args))
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :yodlee-provider-account/client ?xx]]}
:args [ (set (map :db/id (limited-clients (:id args))))]})
:args [(set (map :db/id (:clients args)))]})
(:client-id args)
(merge-query {:query {:in ['?client-id]