From 052e7c2d3633498e408697c1044e331de2b11f21 Mon Sep 17 00:00:00 2001
From: Bryce <bryce@brycecovertoperations.com>
Date: Wed, 6 Nov 2024 09:47:37 -0800
Subject: [PATCH] fixes broken query

---
 src/clj/auto_ap/ssr/utils.clj        |  4 ++++
 src/cljc/auto_ap/ledger/reports.cljc | 11 +++++------
 src/cljc/auto_ap/utils.cljc          |  5 +++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/clj/auto_ap/ssr/utils.clj b/src/clj/auto_ap/ssr/utils.clj
index d2b7bf52..e804cd89 100644
--- a/src/clj/auto_ap/ssr/utils.clj
+++ b/src/clj/auto_ap/ssr/utils.clj
@@ -668,6 +668,10 @@
   (with-precision 2
     (double (.setScale (bigdec d) 2 java.math.RoundingMode/HALF_UP))))
 
+(defn or-0 [x]
+  (if (nil? x)
+    0.0
+    x))
 
 (defn wrap-implied-route-param [handler & {:as route-params}]
   (fn [request]
diff --git a/src/cljc/auto_ap/ledger/reports.cljc b/src/cljc/auto_ap/ledger/reports.cljc
index 4bbd9531..d179f471 100644
--- a/src/cljc/auto_ap/ledger/reports.cljc
+++ b/src/cljc/auto_ap/ledger/reports.cljc
@@ -4,14 +4,13 @@
     [(:require
       [auto-ap.time :as atime]
       [auto-ap.time-utils :refer [user-friendly-date]]
-      [auto-ap.utils :refer [dollars-0? dollars=]]
-      [clojure.string :as str]
-      [clj-time.coerce :as coerce]
       [auto-ap.time-utils :refer [user-friendly-date]]
-      )]
+      [auto-ap.utils :refer [dollars-0? dollars= or-0]]
+      [clj-time.coerce :as coerce]
+      [clojure.string :as str])]
     :cljs
     [(:require
-      [auto-ap.utils :refer [dollars-0? dollars=]]
+      [auto-ap.utils :refer [dollars-0? dollars= or-0]]
       [auto-ap.views.utils :as au]
       [clojure.string :as str]
       [auto-ap.time-utils :refer [user-friendly-date]])]))
@@ -168,7 +167,7 @@
        (filter #(not= "A" (:location %)))
        (group-by (juxt :client-id :location))
        (filter (fn [[_ as]]
-                 (not (dollars-0?  (reduce + 0 (map :amount as))))))
+                 (not (dollars-0?  (reduce + 0 (map (comp or-0 :amount) as))))))
        (mapcat second)
        (map (fn [a]
               (if (or (not (:client-id a))
diff --git a/src/cljc/auto_ap/utils.cljc b/src/cljc/auto_ap/utils.cljc
index c8ea7e09..0f59063b 100644
--- a/src/cljc/auto_ap/utils.cljc
+++ b/src/cljc/auto_ap/utils.cljc
@@ -81,3 +81,8 @@
 
        :cljs (do (println "Heartbeat for " id)
                  (f)))))
+
+(defn or-0 [x]
+  (if (nil? x)
+    0.0
+    x))
\ No newline at end of file