Makes integreat run on datomic cloud
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
(ns auto-ap.datomic.accounts
|
||||
(:require
|
||||
[auto-ap.datomic
|
||||
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query uri]]
|
||||
:refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query conn pull-many]]
|
||||
[clojure.string :as str]
|
||||
[datomic.api :as d]
|
||||
[datomic.client.api :as dc]
|
||||
[clojure.tools.logging :as log]))
|
||||
|
||||
(defn <-datomic [a]
|
||||
@@ -37,21 +37,21 @@
|
||||
(let [query (cond-> {:query {:find [(list 'pull '?e default-read)]
|
||||
:in ['$]
|
||||
:where [['?e :account/name]]}
|
||||
:args [(d/db (d/connect uri))]}
|
||||
:args [(dc/db conn)]}
|
||||
(:account-set args) (merge-query {:query {:in ['?account-set]
|
||||
:where [['?e :account/account-set '?account-set]]}
|
||||
:args [(:account-set args)]}))]
|
||||
(->>
|
||||
(d/query query)
|
||||
(dc/q query)
|
||||
(map first)
|
||||
(map <-datomic)))))
|
||||
|
||||
(defn get-by-id [id]
|
||||
(let [query {:query {:find [(list 'pull '?e default-read)]
|
||||
:in ['$ '?e]}
|
||||
:args [(d/db (d/connect uri) ) id]}]
|
||||
:args [(dc/db conn ) id]}]
|
||||
(->>
|
||||
(d/query query)
|
||||
(dc/q query)
|
||||
(map first)
|
||||
(map <-datomic)
|
||||
first)))
|
||||
@@ -59,38 +59,40 @@
|
||||
(defn get-for-vendor [vendor-id client-id]
|
||||
(if client-id
|
||||
(->>
|
||||
(d/q [:find (list 'pull '?e default-read)
|
||||
:in '$ '?v '?c
|
||||
:where '(or-join [?v ?c ?e]
|
||||
(and [?v :vendor/account-overrides ?ao]
|
||||
[?ao :vendor-account-override/client ?c]
|
||||
[?ao :vendor-account-override/account ?e])
|
||||
(and [?v :vendor/account-overrides ?ao]
|
||||
(not [?ao vendor-account-override/client ?c])
|
||||
[?v :vendor/default-account ?e])
|
||||
(and (not [?v :vendor/account-overrides])
|
||||
[?v :vendor/default-account ?e]))]
|
||||
(dc/q '[:find (pull ?e r)
|
||||
:in $ ?v ?c r
|
||||
:where (or-join [?v ?c ?e]
|
||||
(and [?v :vendor/account-overrides ?ao]
|
||||
[?ao :vendor-account-override/client ?c]
|
||||
[?ao :vendor-account-override/account ?e])
|
||||
(and [?v :vendor/account-overrides ?ao]
|
||||
(not [?ao :vendor-account-override/client ?c])
|
||||
[?v :vendor/default-account ?e])
|
||||
(and (not [?v :vendor/account-overrides])
|
||||
[?v :vendor/default-account ?e]))]
|
||||
|
||||
(d/db conn )
|
||||
(dc/db conn )
|
||||
vendor-id
|
||||
client-id)
|
||||
client-id
|
||||
default-read)
|
||||
(map first)
|
||||
(map <-datomic)
|
||||
first)
|
||||
(d/q [:find (list 'pull '?e default-read)
|
||||
:in '$ '?v
|
||||
:where '[?v :vendor/default-account ?e]]
|
||||
(<-datomic (dc/q '[:find (pull ?e r)
|
||||
:in $ ?v r
|
||||
:where [?v :vendor/default-account ?e]]
|
||||
|
||||
(d/db conn )
|
||||
vendor-id)))
|
||||
(dc/db conn )
|
||||
vendor-id
|
||||
default-read))))
|
||||
|
||||
(defn get-account-by-numeric-code-and-sets [numeric-code _]
|
||||
(let [query (cond-> {:query {:find ['(pull ?e [* {:account/type [:db/ident :db/id]}])]
|
||||
:in ['$ '?numeric-code]
|
||||
:where ['[?e :account/numeric-code ?numeric-code]]}
|
||||
:args [(d/db (d/connect uri)) numeric-code]})]
|
||||
:args [(dc/db conn) numeric-code]})]
|
||||
(->>
|
||||
(d/query query)
|
||||
(dc/q query)
|
||||
(map first)
|
||||
(map <-datomic)
|
||||
(first))))
|
||||
@@ -121,13 +123,13 @@
|
||||
|
||||
|
||||
(cond->> query
|
||||
true (d/query)
|
||||
true (dc/q)
|
||||
true (apply-sort-3 args)
|
||||
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))
|
||||
accounts (->> ids
|
||||
(map results)
|
||||
@@ -137,7 +139,7 @@
|
||||
|
||||
(defn get-graphql [args]
|
||||
(log/info "ARGS" args)
|
||||
(let [db (d/db conn)
|
||||
(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