Makes integreat run on datomic cloud
This commit is contained in:
@@ -1,10 +1,18 @@
|
||||
(ns auto-ap.datomic.sales-orders
|
||||
(:require [auto-ap.datomic :refer [add-sorter-fields apply-pagination apply-sort-3 merge-query uri]]
|
||||
[auto-ap.graphql.utils :refer [limited-clients]]
|
||||
[clj-time.coerce :as c]
|
||||
[datomic.api :as d]
|
||||
[clojure.tools.logging :as log]
|
||||
[clojure.set :as set]))
|
||||
(:require
|
||||
[auto-ap.datomic
|
||||
:refer [add-sorter-fields-2
|
||||
apply-pagination
|
||||
apply-sort-3
|
||||
merge-query
|
||||
pull-many
|
||||
conn]]
|
||||
[auto-ap.graphql.utils :refer [limited-clients]]
|
||||
[clj-time.coerce :as c]
|
||||
[clojure.set :as set]
|
||||
[clojure.tools.logging :as log]
|
||||
[datomic.client.api :as dc]
|
||||
))
|
||||
|
||||
(defn <-datomic [result]
|
||||
(-> result
|
||||
@@ -21,12 +29,96 @@
|
||||
{:sales-order/client [:client/name :db/id :client/code]
|
||||
:sales-order/charges [* {:charge/processor [:db/ident]} {:expected-deposit/_charges [:db/id]}]}])
|
||||
|
||||
#_(defn client-index-search [db attr client-ids [start end]]
|
||||
(for [c client-ids
|
||||
d
|
||||
(dc/q '[:find ?e
|
||||
:in $ ?start ?end
|
||||
:where [?e :sales-order/client+date ?g]
|
||||
[(>= ?g ?start)]
|
||||
[(<= ?g ?end)]]
|
||||
db [c start] [c end])
|
||||
|
||||
#_(dc/index-range db {:attrid attr
|
||||
:start [c start]
|
||||
:end [c end]})]
|
||||
(first d)))
|
||||
|
||||
#_(comment
|
||||
(do
|
||||
(println "starting")
|
||||
(doseq [n (partition-all 500 (dc/q '[:find ?s ?d
|
||||
:where [?s :sales-order/date ?d]]
|
||||
(dc/db conn)))]
|
||||
(print ".")
|
||||
(dc/transact conn {:tx-data (map (fn [[n d]] {:db/id n :sales-order/date d}) n)}))
|
||||
(println "done"))
|
||||
|
||||
|
||||
(time (count (client-index-search (dc/db conn)
|
||||
:sales-order/client+date
|
||||
[3575611821801781]
|
||||
[#inst "2021-05-21T18:06:02.000-00:00"
|
||||
#inst "2022-09-25T18:06:02.000-00:00"]
|
||||
)))
|
||||
|
||||
(time (count (dc/q '[:find ?e
|
||||
:in $ ?client ?start ?end
|
||||
:where [?e :sales-order/client ?client]
|
||||
[?e :sales-order/date ?date]
|
||||
[(>= ?date ?start)]
|
||||
[(<= ?date ?end)]]
|
||||
(dc/db conn)
|
||||
3575611821801781
|
||||
|
||||
#inst "2021-05-21T18:06:02.000-00:00"
|
||||
#inst "2022-09-25T18:06:02.000-00:00"
|
||||
)))
|
||||
|
||||
(time (do (count (dc/q '[:find ?e,
|
||||
:in $ [[?s1 ?e1]]
|
||||
:where
|
||||
#_[(untuple ?period) [?s1 ?e1]]
|
||||
[(q '[:find ?e
|
||||
:in $ ?s1 ?e1
|
||||
:where [?e :sales-order/client+date ?g]
|
||||
[(>= ?g ?s1)]
|
||||
[(<= ?g ?e1)]]
|
||||
$ ?s1 ?e1) [?e ...]]
|
||||
]
|
||||
(dc/db conn) [[[3575611821801781 #inst "2022-08-21T18:06:02.000-00:00" ] [3575611821801781 #inst "2022-09-25T18:06:02.000-00:00"]]
|
||||
[[3575611821801766 #inst "2022-08-21T18:06:02.000-00:00" ] [3575611821801766 #inst "2022-09-25T18:06:02.000-00:00"]]]))
|
||||
(println "done")))
|
||||
|
||||
(dc/index-range (dc/db conn) {:attrid :sales-order/date+client3
|
||||
:start [#inst "2022-08-25T18:06:02.000-00:00" ]
|
||||
:end [#inst "2022-08-25T20:06:02.000-00:00" ]})
|
||||
(dc/pull (dc/db conn) '[*] :sales-order/date+client3)
|
||||
(dc/pull (dc/db conn) '[*] 5040161313201309)
|
||||
|
||||
#_(time (do (dc/q {:query '{:find [(count ?x)],
|
||||
:in [$ ?client-id],
|
||||
:where [[?e :sales-order/date+client3 ?x]]},
|
||||
:args [(dc/db conn) 3575611821801781]})
|
||||
(println "done")))
|
||||
|
||||
#_(datomic.dev-local.async/return-1)
|
||||
|
||||
(clojure.core.async/<!! (dca/transact conn {:tx-data [{:db/ident :sales-order/client+date
|
||||
:db/valueType :db.type/tuple
|
||||
:db/tupleAttrs [:sales-order/client :sales-order/date]
|
||||
:db/cardinality :db.cardinality/one}]
|
||||
:timeout 600000}))
|
||||
|
||||
|
||||
)
|
||||
|
||||
(defn raw-graphql-ids [db args]
|
||||
(let [query (cond-> {:query {:find []
|
||||
:in ['$]
|
||||
:where []}
|
||||
:args [db]}
|
||||
(:sort args) (add-sorter-fields {"client" ['[?e :sales-order/client ?c]
|
||||
(:sort args) (add-sorter-fields-2 {"client" ['[?e :sales-order/client ?c]
|
||||
'[?c :client/name ?sort-client]]
|
||||
"location" ['[?e :sales-order/location ?sort-location]]
|
||||
"source" ['[?e :sales-order/source ?sort-source]]
|
||||
@@ -100,17 +192,17 @@
|
||||
:args [(:total args)]})
|
||||
|
||||
true
|
||||
(merge-query {:query {:find ['?sort-default '?e]
|
||||
:where ['[?e :sales-order/date ?sort-default]]}}))]
|
||||
(merge-query {:query {:find ['?date '?e]
|
||||
:where ['[?e :sales-order/date ?date]]}}))]
|
||||
(log/info "Sales query" query)
|
||||
|
||||
(cond->> query
|
||||
true (d/query)
|
||||
true (dc/q)
|
||||
true (apply-sort-3 (assoc args :default-asc? false))
|
||||
true (apply-pagination args))))
|
||||
|
||||
(defn graphql-results [ids db _]
|
||||
(let [results (->> (d/pull-many db default-read ids)
|
||||
(let [results (->> (pull-many db default-read ids)
|
||||
(group-by :db/id))
|
||||
payments (->> ids
|
||||
(map results)
|
||||
@@ -121,19 +213,19 @@
|
||||
(defn summarize-orders [ids]
|
||||
|
||||
(let [[total tax] (->>
|
||||
(d/query {:query {:find ['(sum ?t) '(sum ?tax)]
|
||||
(dc/q {:query {:find ['(sum ?t) '(sum ?tax)]
|
||||
:with ['?id]
|
||||
:in ['$ '[?id ...]]
|
||||
:where ['[?id :sales-order/total ?t]
|
||||
'[?id :sales-order/tax ?tax]]}
|
||||
:args [(d/db (d/connect uri))
|
||||
:args [(dc/db conn)
|
||||
ids]})
|
||||
first)]
|
||||
{:total total
|
||||
:tax tax}))
|
||||
|
||||
(defn get-graphql [args]
|
||||
(let [db (d/db (d/connect uri))
|
||||
(let [db (dc/db conn)
|
||||
{ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)]
|
||||
[(->> (graphql-results ids-to-retrieve db args))
|
||||
matching-count
|
||||
|
||||
Reference in New Issue
Block a user