adds total.

src/clj/auto_ap/datomic/invoices.clj

@@ -1,12 +1,8 @@
 (ns auto-ap.datomic.invoices
   (:require [datomic.api :as d]
-            [auto-ap.datomic :refer [uri remove-nils merge-query apply-pagination apply-sort-3 add-sorter-fields]]
+            [auto-ap.datomic :refer [uri merge-query apply-pagination apply-sort-3 add-sorter-fields conn]]
             [auto-ap.graphql.utils :refer [limited-clients]]
-            [auto-ap.parse :as parse]
-            [clj-time.coerce :as c]
             [clojure.set :refer [rename-keys]]
-            [clojure.string :as str]
-            [clojure.tools.logging :as log]
             [clj-time.coerce :as coerce]
             [auto-ap.time-utils :refer [next-dom]]
             [clj-time.core :as time]
@@ -174,23 +170,39 @@
                      :in ['$ '[?id ...]]
                      :where ['[?id :invoice/outstanding-balance ?o]]
                      }
-             :args [(d/db (d/connect uri))
+             :args [(d/db conn)
                     ids]})
    (map last)
    (reduce
     +
     0.0)))
 
+(defn sum-total-amount [ids]
+  
+  (->> 
+    (d/query {:query {:find  ['?id '?o]
+                      :in    ['$ '[?id ...]]
+                      :where ['[?id :invoice/total ?o]]
+                      }
+              :args  [(d/db conn)
+                     ids]})
+    (map last)
+    (reduce
+      +
+      0.0)))
+
 (defn get-graphql [args]
   
   (let [db (d/db (d/connect uri))
         {ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)
-        outstanding (sum-outstanding ids-to-retrieve)]
+        outstanding (sum-outstanding ids-to-retrieve)
+        total-amount (sum-total-amount ids-to-retrieve)]
 
     
     [(->> (graphql-results ids-to-retrieve db args))
      matching-count
-     outstanding]))
+     outstanding
+     total-amount]))
 
 (defn get-by-id [id]
   (-> (d/db (d/connect uri))