makes expected deposit linking work.

src/clj/auto_ap/datomic/expected_deposit.clj

@@ -1,18 +1,22 @@
 (ns auto-ap.datomic.expected-deposit
   (:require [auto-ap.datomic :refer [add-sorter-fields apply-pagination apply-sort-3 merge-query conn]]
             [auto-ap.graphql.utils :refer [limited-clients]]
-            [auto-ap.utils :refer [dollars=]]
             [clj-time.coerce :as c]
-            [datomic.api :as d]
-            [clojure.tools.logging :as log]))
+            [datomic.api :as d]))
 
 
 (defn <-datomic [result]
-  (-> result
-       (update :expected-deposit/date c/from-date)))
+  (let [transaction (first (:transaction/_expected-deposit result))
+        transaction (when transaction
+                      (update transaction :transaction/date c/from-date))]
+    (cond-> result
+      true        (update :expected-deposit/date c/from-date)
+      transaction (assoc :transaction transaction))))
 
 (def default-read '[*
-                   {:expected-deposit/client [:client/name :db/id :client/code]}])
+                    {:expected-deposit/client [:client/name :db/id :client/code]
+                     :expected-deposit/status [:db/ident]
+                     :transaction/_expected-deposit [:transaction/date :db/id]}])
 
 (defn raw-graphql-ids [db args]
   (let [query (cond-> {:query {:find []
@@ -87,7 +91,7 @@
       true (apply-sort-3 args)
       true (apply-pagination args))))
 
-(defn graphql-results [ids db args]
+(defn graphql-results [ids db _]
   (let [results (->> (d/pull-many db default-read ids)
                      (group-by :db/id))
         payments (->> ids
@@ -97,7 +101,6 @@
     payments))
 
 (defn get-graphql [args]
-  (log/info "ARGS" args)
   (let [db (d/db conn)
         {ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)]