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

minor tweak.

Browse Source
This commit is contained in:
Bryce Covert
2022-02-07 19:17:47 -08:00
parent 24cc03ccd2
commit 72b31fe6bd
1 changed files with 113 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,14 +19,14 @@
(defn <-datomic [x] (defn <-datomic [x]
(-> x (-> x
(update :invoice/date c/from-date) (update :invoice/date coerce/from-date)
(update :invoice/due c/from-date) (update :invoice/due coerce/from-date)
(update :invoice/scheduled-payment c/from-date) (update :invoice/scheduled-payment coerce/from-date)
(update :invoice/status :db/ident) (update :invoice/status :db/ident)
(rename-keys {:invoice-payment/_invoice :invoice/payments}))) (rename-keys {:invoice-payment/_invoice :invoice/payments})))
(defn raw-graphql-ids [db args] (defn raw-graphql-ids [db args]
(->> (doto (cond-> {:query {:find [] (->> (cond-> {:query {:find []
:in ['$] :in ['$]
:where ['[?e :invoice/client]]} :where ['[?e :invoice/client]]}
:args [(d/db (d/connect uri))]} :args [(d/db (d/connect uri))]}
@@ -61,22 +61,22 @@
(:start (:date-range args)) (merge-query {:query {:in '[?start-date] (:start (:date-range args)) (merge-query {:query {:in '[?start-date]
:where ['[?e :invoice/date ?date] :where ['[?e :invoice/date ?date]
'[(>= ?date ?start-date)]]} '[(>= ?date ?start-date)]]}
:args [(c/to-date (:start (:date-range args)))]}) :args [(coerce/to-date (:start (:date-range args)))]})
(:end (:date-range args)) (merge-query {:query {:in '[?end-date] (:end (:date-range args)) (merge-query {:query {:in '[?end-date]
:where ['[?e :invoice/date ?date] :where ['[?e :invoice/date ?date]
'[(<= ?date ?end-date)]]} '[(<= ?date ?end-date)]]}
:args [(c/to-date (:end (:date-range args)))]}) :args [(coerce/to-date (:end (:date-range args)))]})
(:start (:due-range args)) (merge-query {:query {:in '[?start-due] (:start (:due-range args)) (merge-query {:query {:in '[?start-due]
:where ['[?e :invoice/due ?due] :where ['[?e :invoice/due ?due]
'[(>= ?due ?start-due)]]} '[(>= ?due ?start-due)]]}
:args [(c/to-date (:start (:due-range args)))]}) :args [(coerce/to-date (:start (:due-range args)))]})
(:end (:due-range args)) (merge-query {:query {:in '[?end-due] (:end (:due-range args)) (merge-query {:query {:in '[?end-due]
:where ['[?e :invoice/due ?due] :where ['[?e :invoice/due ?due]
'[(<= ?due ?end-due)]]} '[(<= ?due ?end-due)]]}
:args [(c/to-date (:end (:due-range args)))]}) :args [(coerce/to-date (:end (:due-range args)))]})
(:import-status args) (:import-status args)
(merge-query {:query {:in ['?import-status] (merge-query {:query {:in ['?import-status]
@@ -145,9 +145,6 @@
(merge-query {:query {:find ['?sort-default '?e ] (merge-query {:query {:find ['?sort-default '?e ]
:where ['[?e :invoice/client] :where ['[?e :invoice/client]
'[?e :invoice/date ?sort-default]]}}) ) '[?e :invoice/date ?sort-default]]}}) )
(#(log/info %)))
(d/query) (d/query)
(apply-sort-3 args) (apply-sort-3 args)
(apply-pagination args))) (apply-pagination args)))