Migrates back to datomic on-prem

src/clj/auto_ap/datomic/vendors.clj

@@ -1,10 +1,17 @@
 (ns auto-ap.datomic.vendors
   (:require
-   [auto-ap.datomic :refer [conn merge-query add-sorter-fields apply-pagination merge-query apply-sort-3 pull-many]]
+   [auto-ap.datomic
+    :refer [add-sorter-fields
+            apply-pagination
+            apply-sort-3
+            conn
+            merge-query
+            pull-many
+            query2]]
+   [auto-ap.datomic.accounts :as d-accounts]
    [auto-ap.graphql.utils :refer [limited-clients]]
    [clojure.string :as str]
-   [datomic.client.api :as dc]
-   [auto-ap.datomic.accounts :as d-accounts]))
+   [datomic.api :as dc]))
 
 (defn <-datomic [a]
   (cond-> a
@@ -63,8 +70,7 @@
                                       :where ['[?e :vendor/name]]}}))]
 
     
-    (cond->> query
-      true (dc/q)
+    (cond->> (query2 query)
       true (apply-sort-3 args)
       true (apply-pagination args))))
 
@@ -102,11 +108,10 @@
   )
 
 (defn get-graphql-by-id [args id]
-  (->> (cond-> {:query {:find [(list 'pull '?e default-read)]
-                        :in ['$ '?e]
-                        :where ['[?e :vendor/name]]}
-                :args [(dc/db conn) id]})
-       (dc/q)
+  (->> (dc/q {:find  [(list 'pull '?e default-read)]
+              :in    ['$ '?e]
+              :where ['[?e :vendor/name]]}
+             (dc/db conn) id)
        (map first)
        (map #(cleanse (:id args) %))
        (map <-datomic)