Migrates back to datomic on-prem

src/clj/auto_ap/datomic/clients.clj

@@ -1,17 +1,19 @@
 (ns auto-ap.datomic.clients
   (:require
-   [auto-ap.datomic :refer [add-sorter-fields
-                            apply-pagination
-                            apply-sort-3
-                            conn
-                            merge-query
-                            pull-many]]
-   [auto-ap.graphql.utils :refer [can-see-client? limited-clients]]
+   [auto-ap.datomic
+    :refer [add-sorter-fields
+            apply-pagination
+            apply-sort-3
+            conn
+            merge-query
+            pull-many
+            query2]]
+   [auto-ap.graphql.utils :refer [limited-clients]]
    [auto-ap.search :as search]
    [clj-time.coerce :as coerce]
    [clojure.string :as str]
-   [datomic.client.api :as dc]
-   [com.brunobonacci.mulog :as mu]))
+   [com.brunobonacci.mulog :as mu]
+   [datomic.api :as dc]))
 
 (def full-read '[*
                  {:client/square-integration-status [:integration-status/message
@@ -97,10 +99,10 @@
 
 (defn code->id [code]
   (->> 
-   (dc/q (-> {:query {:find ['?e]
-                         :in ['$ '?code]
-                         :where [['?e :client/code '?code ]]}
-                 :args [(dc/db conn) code]}))
+    (dc/q (-> {:find  ['?e]
+               :in    ['$ '?code]
+               :where [['?e :client/code '?code ]]}
+              (dc/db conn) code))
    (first)
    (first)))
 
@@ -155,8 +157,7 @@
                 (merge-query {:query {:find ['?sort-default '?e] :where ['[?e :client/name ?sort-default]]}}))]
     (mu/log ::q
             :query query)
-    (->> query
-      (dc/q)
+    (->> (query2 query)
       (apply-sort-3 (update args :sort conj {:sort-key "default-2" :asc true}))
       (apply-pagination args))))