various fixes.

This commit is contained in:
Bryce Covert
2020-10-16 14:20:51 -07:00
parent 9c34a188fc
commit 8c746e2100
7 changed files with 47 additions and 23 deletions

View File

@@ -28,7 +28,7 @@
(defn raw-graphql-ids [db args]
(->> (doto (cond-> {:query {:find []
:in ['$]
:where []}
:where ['[?e :invoice/client]]}
:args [(d/db (d/connect uri))]}
(limited-clients (:id args))
@@ -105,6 +105,14 @@
'[(.contains ^String ?invoice-number ?invoice-number-like)]]}
:args [(:invoice-number-like args)]})
(:unresolved args)
(merge-query {:query {:in []
:where ['(or-join [?e]
(not [?e :invoice/expense-accounts ])
(and [?e :invoice/expense-accounts ?ea]
(not [?ea :invoice-expense-account/account])))]}
:args []})
(seq (:location args))
(merge-query {:query {:in ['?location]
:where ['[?e :invoice/expense-accounts ?eas]