Migrates back to datomic on-prem

src/clj/auto_ap/datomic/transactions.clj

@@ -1,13 +1,19 @@
 (ns auto-ap.datomic.transactions
   (:require
    [auto-ap.datomic
-    :refer [add-sorter-fields apply-pagination apply-sort-3 conn merge-query conn pull-many]]
+    :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]]
    [clj-time.coerce :as coerce]
    [clojure.string :as str]
    [clojure.tools.logging :as log]
-   [datomic.client.api :as dc]))
+   [datomic.api :as dc]))
 
 (defn potential-duplicate-ids [db args]
   (when (and (:potential-duplicates args)
@@ -168,8 +174,7 @@
                                                '[?e :transaction/date ?sort-default]
                                                '(not [?e :transaction/approval-status :transaction-approval-status/suppressed])]}}))]
      (log/info "query is" query)
-     (cond->> query
-       true (dc/q)
+     (cond->> (query2 query)
        true (apply-sort-3 (assoc args :default-asc? false))
        true (apply-pagination args)))))
 
@@ -220,11 +225,10 @@
 
 (defn filter-ids [ids]
   (if ids 
-    (->> {:query {:find ['?e]
-                  :in ['$ '[?e ...]]
-                  :where ['[?e :transaction/date]]}
-          :args [(dc/db conn) ids]}
-         (dc/q)
+    (->> (dc/q {:find  ['?e]
+                :in    ['$ '[?e ...]]
+                :where ['[?e :transaction/date]]}
+               (dc/db conn) ids)
          (map first)
          vec)
     []))