fixed loading issue
This commit is contained in:
@@ -341,6 +341,8 @@
|
||||
(sort-by last)
|
||||
last
|
||||
first
|
||||
coerce/to-date-time
|
||||
atime/as-local-time
|
||||
coerce/to-date)]]
|
||||
#:expected-deposit {:external-id (str "square/settlement/" (:id settlement))
|
||||
:vendor :vendor/ccp-square
|
||||
|
||||
@@ -48,6 +48,8 @@
|
||||
:source "Square 3"
|
||||
:background-job "Square 3")
|
||||
(client/request (assoc request
|
||||
:socket-timeout 10000
|
||||
:connection-timeout 10000
|
||||
:as :json
|
||||
:retry-handler retry-4))))
|
||||
(de/catch
|
||||
@@ -441,6 +443,8 @@
|
||||
([client location]
|
||||
(de/chain (settlements client location)
|
||||
(fn [settlements]
|
||||
(log/info ::transforming-settlements)
|
||||
(try
|
||||
(->> (for [settlement settlements
|
||||
:let [best-sales-date (->> (d/q '[:find ?s4 (count ?s)
|
||||
:in $ ?settlement-id
|
||||
@@ -457,6 +461,8 @@
|
||||
(sort-by last)
|
||||
last
|
||||
first
|
||||
coerce/to-date-time
|
||||
atime/as-local-time
|
||||
coerce/to-date)]]
|
||||
#:expected-deposit {:external-id (str "square/settlement/" (:id settlement))
|
||||
:vendor :vendor/ccp-square
|
||||
@@ -477,7 +483,11 @@
|
||||
:charges (->> (:entries settlement)
|
||||
(filter :payment_id)
|
||||
(map (fn [p] {:charge/external-id (str "square/charge/" (:payment_id p))})))})
|
||||
(filter :expected-deposit/date))))))
|
||||
(filter :expected-deposit/date)
|
||||
(into []))
|
||||
(catch Exception e
|
||||
(log/error ::transform-settlement-failed
|
||||
:exception e)))))))
|
||||
|
||||
(defn refunds
|
||||
([client l]
|
||||
@@ -544,6 +554,7 @@
|
||||
(de/chain (daily-settlements client location)
|
||||
(fn [settlements]
|
||||
(mu/with-context lc
|
||||
(log/info ::started-loading-deposits :settlement-count (count settlements))
|
||||
(doseq [x (partition-all 20 settlements)]
|
||||
(log/info ::loading-deposits
|
||||
:count (count x))
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
(defn localize [d]
|
||||
(time/to-time-zone d (time/time-zone-for-id "America/Los_Angeles")))
|
||||
|
||||
(defn as-local-time [d]
|
||||
(time/from-time-zone d (time/time-zone-for-id "America/Los_Angeles")))
|
||||
|
||||
(defn local-now []
|
||||
(time/to-time-zone (time/now) (time/time-zone-for-id "America/Los_Angeles")))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user