fixes
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -1019,6 +1019,10 @@
|
||||
:db/cardinality #:db{:ident :db.cardinality/one},
|
||||
:db/doc "Available Balance",
|
||||
:db/ident :plaid-account/balance}
|
||||
{:db/valueType #:db{:ident :db.type/instant},
|
||||
:db/cardinality #:db{:ident :db.cardinality/one},
|
||||
:db/doc "Last synced",
|
||||
:db/ident :plaid-account/last-synced}
|
||||
|
||||
{:db/unique #:db{:ident :db.unique/identity},
|
||||
:db/valueType #:db{:ident :db.type/string},
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
(ns auto-ap.import.plaid
|
||||
(:require
|
||||
[auto-ap.datomic :refer [conn random-tempid]]
|
||||
[auto-ap.import.common :refer [wrap-integration]]
|
||||
[auto-ap.import.transactions :as t]
|
||||
[auto-ap.logging :as alog]
|
||||
[auto-ap.plaid.core :as p]
|
||||
[auto-ap.solr]
|
||||
[auto-ap.time :as atime]
|
||||
[auto-ap.utils :refer [allow-once by]]
|
||||
[clj-time.coerce :as coerce]
|
||||
[clj-time.core :as time]
|
||||
[datomic.api :as dc]
|
||||
[digest :as di]
|
||||
[manifold.deferred :as de]
|
||||
[manifold.executor :as ex]
|
||||
[clojure.string :as str]
|
||||
[auto-ap.ezcater.core :as e]))
|
||||
(:require [auto-ap.datomic :refer [conn random-tempid]]
|
||||
[auto-ap.import.common :refer [wrap-integration]]
|
||||
[auto-ap.import.transactions :as t]
|
||||
[auto-ap.logging :as alog]
|
||||
[auto-ap.plaid.core :as p]
|
||||
[auto-ap.solr]
|
||||
[auto-ap.time :as atime]
|
||||
[auto-ap.utils :refer [allow-once by]]
|
||||
[clj-time.coerce :as coerce]
|
||||
[clj-time.core :as time]
|
||||
[clojure.string :as str]
|
||||
[datomic.api :as dc]
|
||||
[digest :as di]
|
||||
[iol-ion.utils :refer [remove-nils]]
|
||||
[manifold.deferred :as de]
|
||||
[manifold.executor :as ex]))
|
||||
|
||||
(defn get-plaid-accounts
|
||||
([db]
|
||||
@@ -86,31 +85,33 @@
|
||||
"name" (:plaid-merchant/name result)}))))
|
||||
|
||||
(defn upsert-accounts []
|
||||
(try
|
||||
(doseq [[bank-account-id client-id external-id access-token] (get-plaid-accounts (dc/db conn))
|
||||
]
|
||||
|
||||
(try
|
||||
(let [accounts (p/get-accounts access-token)]
|
||||
@(dc/transact
|
||||
conn
|
||||
(for [a (:accounts accounts)]
|
||||
(try
|
||||
(doseq [[bank-account-id client-id external-id access-token] (get-plaid-accounts (dc/db conn))]
|
||||
(try
|
||||
(let [accounts (p/get-accounts access-token)
|
||||
item (p/get-item access-token)]
|
||||
@(dc/transact
|
||||
conn
|
||||
(for [a (:accounts accounts)]
|
||||
(remove-nils
|
||||
{:plaid-account/external-id (:account_id a)
|
||||
:plaid-account/last-synced (coerce/to-date (coerce/to-date-time (-> item :status :transactions :last_successful_update)))
|
||||
:plaid-account/balance (or (some-> a
|
||||
:balances
|
||||
:current
|
||||
double)
|
||||
0.0) }))
|
||||
)
|
||||
(catch Exception e
|
||||
(alog/warn ::couldnt-upsert-account :error e))))
|
||||
|
||||
|
||||
(catch Exception e
|
||||
(alog/warn ::couldnt-upsert-accounts :error e))))
|
||||
0.0)}))))
|
||||
(catch Exception e
|
||||
(alog/warn ::couldnt-upsert-account :error e))))
|
||||
|
||||
|
||||
(catch Exception e
|
||||
(alog/warn ::couldnt-upsert-accounts :error e))))
|
||||
|
||||
|
||||
(defn import-plaid-int []
|
||||
(let [import-batch (t/start-import-batch :import-source/plaid "Automated plaid user")
|
||||
(let [_ (upsert-accounts)
|
||||
import-batch (t/start-import-batch :import-source/plaid "Automated plaid user")
|
||||
end (atime/local-now)
|
||||
start (time/plus end (time/days -30))
|
||||
plaid-merchant->vendor-id (build-plaid-merchant->vendor-id)]
|
||||
|
||||
@@ -11,6 +11,11 @@
|
||||
(def client-id (-> env :plaid :client-id))
|
||||
(def secret-key (-> env :plaid :secret-key))
|
||||
|
||||
(def base-url "https://production.plaid.com")
|
||||
|
||||
(def client-id "61bfab05f7e762001b323f79")
|
||||
|
||||
(def secret-key "2be026ca5e7f7e9f23f2fb4d7c914d")
|
||||
|
||||
(defn get-link-token [client-code]
|
||||
(-> (client/post (str base-url "/link/token/create")
|
||||
@@ -49,8 +54,16 @@
|
||||
:body (json/write-str {"client_id" client-id
|
||||
"secret" secret-key
|
||||
"public_token" public-token})})
|
||||
:body
|
||||
(doto println)))
|
||||
:body))
|
||||
|
||||
(defn get-item [access-token ]
|
||||
(-> (client/post (str base-url "/item/get")
|
||||
{:as :json
|
||||
:headers {"Content-Type" "application/json"}
|
||||
:body (json/write-str {"client_id" client-id
|
||||
"secret" secret-key
|
||||
"access_token" access-token})})
|
||||
:body))
|
||||
|
||||
(defn get-accounts [access-token ]
|
||||
(-> (client/post (str base-url "/accounts/get")
|
||||
|
||||
@@ -13,40 +13,73 @@
|
||||
|
||||
(defn- page-contents [request]
|
||||
[:div
|
||||
[:div {:class "grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 gap-4 overflow-scroll"}
|
||||
[:div.bg-blue-300.p-4.flex.flex-grow-0 "report-1"]
|
||||
[:div.bg-red-300.p-4.flex.flex-grow-0 "hi"]
|
||||
[:div.row-span-2
|
||||
(com/card {:class "inline-block"}
|
||||
[:div.p-4
|
||||
|
||||
[:h1.text-2xl.font-bold "Bank Accounts"]
|
||||
(com/card {:class "inline-block"}
|
||||
[:div.inline-flex.flex-wrap
|
||||
(for [c (:clients request)
|
||||
b (:client/bank-accounts (dc/pull (dc/db conn) '[{ :client/bank-accounts
|
||||
[:bank-account/current-balance
|
||||
[ :bank-account/current-balance-synced :xform clj-time.coerce/from-date]
|
||||
:bank-account/name
|
||||
{:bank-account/intuit-bank-account [:intuit-bank-account/current-balance
|
||||
[ :intuit-bank-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/yodlee-account [:yodlee-account/available-balance
|
||||
[:yodlee-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/plaid-account [:plaid-account/balance
|
||||
#_[:yodlee-account/last-synced :xform clj-time.coerce/from-date]]}]}]
|
||||
(:db/id c)))]
|
||||
[:div.flex.flex-col.p-4.border-l-2
|
||||
[:div (:client/name c)]
|
||||
[:div (:bank-account/name b)]
|
||||
[:div.inline-flex.justify-between [:div "Ledger Balance"] (format "$%,.2f" (or (:bank-account/current-balance b) 0.0)) ]
|
||||
[:div.inline-flex.justify-end.text-xs.text-gray-400.it (some-> (:bank-account/current-balance-synced b)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %))) ]
|
||||
[:div.inline-flex.justify-between [:div "Source Balance"] (format "$%,.2f" (or (-> b :bank-account/intuit-bank-account :intuit-bank-account/current-balance)
|
||||
(-> b :bank-account/yodlee-account :yodlee-account/available-balance)
|
||||
(-> b :bank-account/plaid-account :plaid-account/balance)
|
||||
0.0))]
|
||||
[:div.inline-flex.justify-end.text-xs.text-gray-400.it (or (some-> (:bank-account/intuit-bank-account b)
|
||||
(:intuit-bank-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))
|
||||
(some-> (:bank-account/yodlee-account b)
|
||||
(:yodlee-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %))))]])]) ])
|
||||
[:div {:class "max-h-[800px] overflow-scroll"}
|
||||
(for [c (:clients request)
|
||||
b (:client/bank-accounts (dc/pull (dc/db conn) '[{ :client/bank-accounts
|
||||
|
||||
[:bank-account/current-balance
|
||||
{[:bank-account/type :xform iol-ion.query/ident] [:db/ident]}
|
||||
|
||||
[:bank-account/current-balance-synced :xform clj-time.coerce/from-date]
|
||||
:bank-account/name
|
||||
{:bank-account/intuit-bank-account [:intuit-bank-account/current-balance
|
||||
[:intuit-bank-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/yodlee-account [:yodlee-account/available-balance
|
||||
[:yodlee-account/last-synced :xform clj-time.coerce/from-date]]}
|
||||
{:bank-account/plaid-account [:plaid-account/balance
|
||||
[:plaid-account/last-synced :xform clj-time.coerce/from-date]]}]}]
|
||||
(:db/id c)))
|
||||
:when (not= :bank-account-type/cash (:bank-account/type b))]
|
||||
[:div.flex.flex-col.p-4.border-b-2.border-gray-200
|
||||
[:div.font-bold.text-gray-700 (:client/name c)]
|
||||
[:div (:bank-account/name b)]
|
||||
[:div.grid.grid-cols-3.gap-x-2.items-baseline
|
||||
[:div "Ledger Balance"]
|
||||
[:div.text-right (format "$%,.2f" (or (:bank-account/current-balance b) 0.0))]
|
||||
[:div.text-xs.text-gray-400.text-right (some-> (:bank-account/current-balance-synced b)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))]
|
||||
|
||||
(when-let [n (cond (-> b :bank-account/intuit-bank-account)
|
||||
"Intuit"
|
||||
(-> b :bank-account/yodlee-account)
|
||||
"Yodlee"
|
||||
(-> b :bank-account/plaid-account)
|
||||
"Plaid"
|
||||
:else
|
||||
nil)]
|
||||
(list
|
||||
[:div (str n " Balance")]
|
||||
[:div.text-right (format "$%,.2f" (or (-> b :bank-account/intuit-bank-account :intuit-bank-account/current-balance)
|
||||
(-> b :bank-account/yodlee-account :yodlee-account/available-balance)
|
||||
(-> b :bank-account/plaid-account :plaid-account/balance)
|
||||
0.0))]
|
||||
[:div.text-xs.text-gray-400.text-right (or (some-> (:bank-account/intuit-bank-account b)
|
||||
(:intuit-bank-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))
|
||||
(some-> (:bank-account/yodlee-account b)
|
||||
(:yodlee-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %)))
|
||||
(some-> (:bank-account/plaid-account b)
|
||||
(:plaid-account/last-synced)
|
||||
(atime/unparse-local atime/standard-time)
|
||||
(#(str "Synced " %))))]
|
||||
[:div.inline-flex.justify-end.text-xs.text-gray-400.it ]))
|
||||
#_[:div.inline-flex.justify-between.items-baseline]]])]])]
|
||||
|
||||
[:div.bg-purple-300.p-4 "hi"]
|
||||
[:div.bg-slate-300.p-4 "hi"]
|
||||
] ])
|
||||
|
||||
(defn page [request]
|
||||
(base-page
|
||||
|
||||
Reference in New Issue
Block a user