allows you to use date instead of post date

This commit is contained in:
2022-06-23 08:29:55 -07:00
parent 1db8d7a52c
commit 519f88592e
6 changed files with 46 additions and 14 deletions

View File

@@ -12,10 +12,9 @@
[datomic.api :as d]
[digest :refer [sha-256]]
[mount.core :as mount]
[unilog.context :as lc]
[yang.scheduler :as scheduler]))
(defn yodlee->transaction [transaction]
(defn yodlee->transaction [transaction use-date-instead-of-post-date?]
(let [{post-date :postDate
account-id :accountId
date :date
@@ -23,8 +22,6 @@
{amount :amount} :amount
{description-original :original
description-simple :simple} :description
{merchant-id :id
merchant-name :name} :merchant
base-type :baseType
type :type
status :status} transaction
@@ -37,7 +34,9 @@
:id (sha-256 (str id))
:raw-id (str id)
:account-id account-id
:date (coerce/to-date date)
:date (if use-date-instead-of-post-date?
(coerce/to-date (atime/parse post-date "YYYY-MM-dd"))
(coerce/to-date date))
:amount (double amount)
:description-original (some-> description-original (str/replace #"\s+" " "))
:description-simple (some-> description-simple (str/replace #"\s+" " "))
@@ -51,18 +50,19 @@
nil)
(let [import-batch (t/start-import-batch :import-source/yodlee "Automated yodlee user")]
(try
(let [account-lookup (d/q '[:find ?ya ?ba ?c
(let [account-lookup (d/q '[:find ?ya ?ba ?ud ?c
:in $
:where [?ba :bank-account/yodlee-account-id ?ya]
[(get-else $ ?ba :bank-account/use-date-instead-of-post-date? false) ?ud]
[?c :client/bank-accounts ?ba]]
(d/db conn))]
(doseq [[yodlee-account bank-account client-id] account-lookup
(doseq [[yodlee-account bank-account use-date-instead-of-post-date? client-id] account-lookup
transaction (try
(client/get-specific-transactions yodlee-account (client/get-auth-header))
(catch Exception e
(log/warn e)
[]))]
(t/import-transaction! import-batch (assoc (yodlee->transaction transaction)
(t/import-transaction! import-batch (assoc (yodlee->transaction transaction use-date-instead-of-post-date?)
:transaction/bank-account bank-account
:transaction/client client-id)))

View File

@@ -19,17 +19,19 @@
nil)
(let [import-batch (t/start-import-batch :import-source/yodlee2 "Automated yodlee2 user")]
(try
(let [account-lookup (d/q '[:find ?ya ?ba ?cd
(let [account-lookup (d/q '[:find ?ya ?ba ?cd ?ud
:in $
:where
[?ba :bank-account/yodlee-account ?y]
[(get-else $ ?ba :bank-account/use-date-instead-of-post-date? false) ?ud]
[?c :client/bank-accounts ?ba]
[?c :client/code ?cd]
[?y :yodlee-account/id ?ya]]
[?y :yodlee-account/id ?ya]
]
(d/db conn))]
(doseq [[yodlee-account bank-account client-code] account-lookup
(doseq [[yodlee-account bank-account client-code use-date-instead-of-post-date?] account-lookup
transaction (client2/get-specific-transactions client-code yodlee-account)]
(t/import-transaction! import-batch (assoc (y/yodlee->transaction transaction)
(t/import-transaction! import-batch (assoc (y/yodlee->transaction transaction use-date-instead-of-post-date?)
:transaction/bank-account bank-account
:transaction/client [:client/code client-code])))