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

Should fix most of the authentication issues

Browse Source
This commit is contained in:
Bryce
2023-09-05 23:08:22 -07:00
parent a6e4080746
commit a56d3b0b84
22 changed files with 506 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,13 +6,13 @@
apply-sort-3
conn
merge-query
pull-many
query2]]
[auto-ap.graphql.utils :refer [limited-clients]]
observable-query
pull-many]]
[auto-ap.graphql.utils :refer [extract-client-ids]]
[clj-time.coerce :as c]
[clojure.set :refer [rename-keys]]
[clojure.tools.logging :as log]
[datomic.api :as dc]))
[datomic.api :as dc]
[clj-time.coerce :as coerce]))
(defn <-datomic [result]
(-> result
@@ -38,18 +38,25 @@
(defn raw-graphql-ids
([args] (raw-graphql-ids (dc/db conn) args))
([db args]
(let [check-number-like (try (Long/parseLong (:check-number-like args)) (catch Exception _ nil))
(let [valid-clients (extract-client-ids (:clients args)
(:client-id args)
(when (:client-code args)
[:client/code (:client-code args)]))
check-number-like (try (Long/parseLong (:check-number-like args)) (catch Exception _ nil))
query (if (:exact-match-id args)
{:query {:find '[?e]
:in '[$ ?e [?c ...]]
:where '[[?e :payment/client ?c]]}
:args [db
(:exact-match-id args)
(map :db/id (:clients args))]}
valid-clients]}
(cond-> {:query {:find []
:in ['$]
:where []}
:args [db]}
:in '[$ [?clients ?start ?end]]
:where '[[(iol-ion.query/scan-payments $ ?clients ?start ?end) [[?e _ ?sort-default] ...]]]}
:args [db
[valid-clients
(some-> (:start (:date-range args)) coerce/to-date)
(some-> (:end (:date-range args)) coerce/to-date)]]}
(:sort args) (add-sorter-fields {"client" ['[?e :payment/client ?c]
'[?c :client/name ?sort-client]]
"vendor" ['[?e :payment/vendor ?v]
@@ -66,23 +73,6 @@
:where []}
:args [(:exact-match-id args)]})
true
(merge-query {:query {:in ['[?xx ...]]
:where ['[?e :payment/client ?xx]]}
:args [(map :db/id (:clients args))]})
(:client-id args)
(merge-query {:query {:in ['?client-id]
:where ['[?e :payment/client ?client-id]]}
:args [(:client-id args)]})
(:client-code args)
(merge-query {:query {:in ['?client-code]
:where ['[?e :payment/client ?client-id]
'[?client-id :client/code ?client-code]]}
:args [(:client-code args)]})
(:vendor-id args)
(merge-query {:query {:in ['?vendor-id]
:where ['[?e :payment/vendor ?vendor-id]]}
@@ -133,18 +123,6 @@
(merge-query {:query {:in ['?status]
:where ['[?e :payment/status ?status]]}
:args [(:status args)]})
(:start (:date-range args))
(merge-query {:query {:in '[?start-date]
:where ['[?e :payment/date ?date]
'[(>= ?date ?start-date)]]}
:args [(c/to-date (:start (:date-range args)))]})
(:end (:date-range args))
(merge-query {:query {:in '[?end-date]
:where ['[?e :payment/date ?date]
'[(<= ?date ?end-date)]]}
:args [(c/to-date (:end (:date-range args)))]})
(:payment-type args)
(merge-query {:query {:in '[?payment-type]
@@ -157,12 +135,10 @@
:args [check-number-like]})
true
(merge-query {:query {:find ['?sort-default '?e]
:where ['[?e :payment/date ?sort-default]]}})))]
(merge-query {:query {:find ['?sort-default '?e]}})))]
(log/info query)
(cond->> (query2 query)
(cond->> (observable-query query)
true (apply-sort-3 (assoc args :default-asc? false))
true (apply-pagination args)))))