notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fixed loading issue

Browse Source
This commit is contained in:
Bryce Covert
2023-01-10 09:41:42 -08:00
parent 1b3eff8301
commit ec4e6624b5
3 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/square/core2.clj
View File

@@ -341,6 +341,8 @@
(sort-by last) (sort-by last)
last last
first first
coerce/to-date-time
atime/as-local-time
coerce/to-date)]] coerce/to-date)]]
#:expected-deposit {:external-id (str "square/settlement/" (:id settlement)) #:expected-deposit {:external-id (str "square/settlement/" (:id settlement))
:vendor :vendor/ccp-square :vendor :vendor/ccp-square

13
src/clj/auto_ap/square/core3.clj
View File

@@ -48,6 +48,8 @@
:source "Square 3" :source "Square 3"
:background-job "Square 3") :background-job "Square 3")
(client/request (assoc request (client/request (assoc request
:socket-timeout 10000
:connection-timeout 10000
:as :json :as :json
:retry-handler retry-4)))) :retry-handler retry-4))))
(de/catch (de/catch
@@ -441,6 +443,8 @@
([client location] ([client location]
(de/chain (settlements client location) (de/chain (settlements client location)
(fn [settlements] (fn [settlements]
(log/info ::transforming-settlements)
(try
(->> (for [settlement settlements (->> (for [settlement settlements
:let [best-sales-date (->> (d/q '[:find ?s4 (count ?s) :let [best-sales-date (->> (d/q '[:find ?s4 (count ?s)
:in $ ?settlement-id :in $ ?settlement-id
@@ -457,6 +461,8 @@
(sort-by last) (sort-by last)
last last
first first
coerce/to-date-time
atime/as-local-time
coerce/to-date)]] coerce/to-date)]]
#:expected-deposit {:external-id (str "square/settlement/" (:id settlement)) #:expected-deposit {:external-id (str "square/settlement/" (:id settlement))
:vendor :vendor/ccp-square :vendor :vendor/ccp-square
@@ -477,7 +483,11 @@
:charges (->> (:entries settlement) :charges (->> (:entries settlement)
(filter :payment_id) (filter :payment_id)
(map (fn [p] {:charge/external-id (str "square/charge/" (:payment_id p))})))}) (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 (defn refunds
([client l] ([client l]
@@ -544,6 +554,7 @@
(de/chain (daily-settlements client location) (de/chain (daily-settlements client location)
(fn [settlements] (fn [settlements]
(mu/with-context lc (mu/with-context lc
(log/info ::started-loading-deposits :settlement-count (count settlements))
(doseq [x (partition-all 20 settlements)] (doseq [x (partition-all 20 settlements)]
(log/info ::loading-deposits (log/info ::loading-deposits
:count (count x)) :count (count x))

3
src/clj/auto_ap/time.clj
View File

@@ -6,6 +6,9 @@
(defn localize [d] (defn localize [d]
(time/to-time-zone d (time/time-zone-for-id "America/Los_Angeles"))) (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 [] (defn local-now []
(time/to-time-zone (time/now) (time/time-zone-for-id "America/Los_Angeles"))) (time/to-time-zone (time/now) (time/time-zone-for-id "America/Los_Angeles")))