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

transactions find bank accounts when manual import.

Browse Source
This commit is contained in:
BC
2018-07-12 23:54:23 -07:00
parent d6345832dc
commit 77eade2f15
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/routes/invoices.clj
View File

@@ -103,7 +103,7 @@
:amount amount
:account-id account-id}))))]
(manual-import raw-transactions company-id 1)
(manual-import raw-transactions company-id)
{:status 200
:body (pr-str {:imported (count raw-transactions)

26
src/clj/auto_ap/yodlee/import.clj
View File

@@ -37,7 +37,7 @@
(Integer/parseInt check-number)
nil))
(defn import-transactions [transactions yodlee-account-id->company yodlee-account-id->bank-account-id]
(defn import-transactions [transactions transaction->company transaction->bank-account-id]
(doseq [transaction transactions
:let [{post-date :postDate
account-id :accountId
@@ -56,11 +56,11 @@
(- amount)
amount)
check-number (extract-check-number transaction)
company-id (yodlee-account-id->company account-id)
bank-account-id (yodlee-account-id->bank-account-id account-id)
check-id (transaction->check-id transaction check-number company-id bank-account-id amount)
]]
(println transaction)
company-id (transaction->company transaction)
bank-account-id (transaction->bank-account-id transaction)
check-id (transaction->check-id transaction check-number company-id bank-account-id amount)]]
(try
(transactions/upsert!
@@ -75,7 +75,7 @@
:status status
:company-id company-id
:check-number check-number
:bank-account-id (yodlee-account-id->bank-account-id account-id)
:bank-account-id (transaction->bank-account-id transaction)
:check-id check-id
})
(when check-id
@@ -84,7 +84,7 @@
(catch Exception e
(println e)))))
(defn manual-import [manual-transactions company-id bank-account-id]
(defn manual-import [manual-transactions company-id]
(let [transformed-transactions (->> manual-transactions
(filter #(= "posted" (:status %)))
(group-by #(select-keys % [:date :original-description :amount]))
@@ -95,7 +95,7 @@
(map
(fn [index {:keys [date description-original high-level-category amount account-id] :as transaction}]
{:id (str date "-" description-original "-" amount "-" index)
:bank-account-id account-id
:date (time/unparse date "YYYY-MM-dd")
:amount {:amount amount}
:description {:original description-original
@@ -105,7 +105,7 @@
transaction-group))))]
(println "importing manual transactions" transformed-transactions)
(import-transactions transformed-transactions (constantly company-id) (constantly bank-account-id))))
(import-transactions transformed-transactions (constantly company-id) :bank-account-id)))
(defn do-import []
(let [transactions (client/get-transactions)
@@ -117,7 +117,7 @@
:yodlee-account-id yodlee-account-id}))
(:bank-accounts c)))
(companies/get-all))
yodlee-account-id->company (by :yodlee-account-id :company-id all-bank-accounts)
yodlee-account-id->bank-account-id (by :yodlee-account-id :bank-account-id all-bank-accounts)]
(import-transactions transactions yodlee-account-id->company yodlee-account-id->bank-account-id)))
transaction->company (comp (by :yodlee-account-id :company-id all-bank-accounts) :accountId)
transaction->bank-account-id (comp (by :yodlee-account-id :bank-account-id all-bank-accounts) :accountId)]
(import-transactions transactions transaction->company transaction->bank-account-id)))