From 3bd97edf2e05bbf4a44f2f0b8374de971a85f324 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@brycecovertoperations.com>
Date: Tue, 7 Sep 2021 08:31:35 -0700
Subject: [PATCH] square improvements

---
 src/clj/auto_ap/square/core.clj | 46 +++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/clj/auto_ap/square/core.clj b/src/clj/auto_ap/square/core.clj
index 15a1b141..be480b21 100644
--- a/src/clj/auto_ap/square/core.clj
+++ b/src/clj/auto_ap/square/core.clj
@@ -19,7 +19,7 @@
                    "Content-Type" "application/json"})
 
 (defn lookup-dates []
-  (->> (clj-time.periodic/periodic-seq (time/plus (time/now) (time/days -10))
+  (->> (clj-time.periodic/periodic-seq (time/plus (time/now) (time/days -15))
                                        (time/now)
                                        (time/days 5))
        (map (fn [d]
@@ -123,8 +123,6 @@
                             :as :json}) 
               :body
               :orders)]
-     (println (cond-> {"location_ids" [l] "limit" 4000}
-                d (merge (pc d)))) 
      (log/info "found " (count result))
      result)))
 
@@ -269,24 +267,36 @@
         output-chan (async/chan)]
     (async/pipeline-blocking concurrent
                              output-chan
-                             (comp (map (fn [p]
-                                          (lc/with-context {:source "Square settlements loading "}
-                                            (log/info "looking up payment " p " for settlement " (:id settlement))
-                                            (->
-                                             (get-payment p)
-                                             :created_at
-                                             coerce/to-date))))
-                                   (filter identity ))
+                             (map (fn [p]
+                                    (lc/with-context {:source "Square settlements loading "}
+                                      (log/info "looking up payment " p " for settlement " (:id settlement))
+                                      (println (or 
+                                                (-> p
+                                                    get-payment
+                                                    :created_at
+                                                    coerce/to-date)
+                                                (coerce/to-date (time/now))))
+                                      (or 
+                                       (-> p
+                                           get-payment
+                                           :created_at
+                                           coerce/to-date)
+                                       (coerce/to-date (time/now))))))
                              (async/to-chan (->> settlement
                                                  :entries
+                                                 (filter #(= "CHARGE" (:type %)))
                                                  (map :payment_id)
                                                  (filter identity)
                                                  (set)
                                                  (take 20)
-                                                 )))
+                                                 ))
+                             true
+                             (fn [e]
+                               (lc/with-context {:source "Square settlements loading "}
+                                 (log/error "Error loading sales date details" e))))
     (->> (async/<!! (async/into [] output-chan))
          sort
-         (drop 1)
+         (drop 2)
          first)))
 
 (defn get-settlement-details [settlements] ;; pairs of [location settlement]
@@ -306,10 +316,12 @@
                                                                                                     (if (> try-count 4) false true))})))]
                                         
                                         (log/info "sales date for " s " is " (get-settlement-sales-date settlement))
-                                        (assoc settlement :sales-date (get-settlement-sales-date settlement) ))
-                                      (log/info "Done loading settlements"))
-                                    ))
-                             (async/to-chan settlements))
+                                        (assoc settlement :sales-date (get-settlement-sales-date settlement) )))))
+                             (async/to-chan settlements)
+                             true
+                             (fn [e]
+                               (lc/with-context {:source "Square settlements loading "}
+                                 (log/error "Error loading settlements details" e))))
     (async/<!! (async/into [] output-chan))))
 
 (defn settlements