Added yodlee account balances
This commit is contained in:
@@ -140,6 +140,7 @@
|
|||||||
:bank_code {:type 'String}
|
:bank_code {:type 'String}
|
||||||
:bank_name {:type 'String}
|
:bank_name {:type 'String}
|
||||||
:current_balance {:type :money}
|
:current_balance {:type :money}
|
||||||
|
:yodlee_balance_old {:type :money}
|
||||||
:yodlee_account_id {:type 'Int}
|
:yodlee_account_id {:type 'Int}
|
||||||
:yodlee_account {:type :yodlee_account}
|
:yodlee_account {:type :yodlee_account}
|
||||||
:locations {:type '(list String)}}}
|
:locations {:type '(list String)}}}
|
||||||
|
|||||||
@@ -2,6 +2,9 @@
|
|||||||
(:require [auto-ap.datomic :refer [audit-transact conn remove-nils]]
|
(:require [auto-ap.datomic :refer [audit-transact conn remove-nils]]
|
||||||
[auto-ap.datomic.clients :as d-clients]
|
[auto-ap.datomic.clients :as d-clients]
|
||||||
[auto-ap.graphql.utils :refer [->graphql assert-admin can-see-client? is-admin?]]
|
[auto-ap.graphql.utils :refer [->graphql assert-admin can-see-client? is-admin?]]
|
||||||
|
[auto-ap.utils :refer [by]]
|
||||||
|
[auto-ap.yodlee.core :refer [in-memory-cache]]
|
||||||
|
|
||||||
[clj-time.coerce :as coerce]
|
[clj-time.coerce :as coerce]
|
||||||
[config.core :refer [env]]
|
[config.core :refer [env]]
|
||||||
[clojure.string :as str]
|
[clojure.string :as str]
|
||||||
@@ -213,4 +216,12 @@
|
|||||||
(map (fn [c]
|
(map (fn [c]
|
||||||
(if (is-admin? (:id context))
|
(if (is-admin? (:id context))
|
||||||
c
|
c
|
||||||
(dissoc c :client/yodlee-provider-accounts)))))))
|
(dissoc c :client/yodlee-provider-accounts))))
|
||||||
|
(map (fn [c]
|
||||||
|
(update c :client/bank-accounts
|
||||||
|
(fn [bank-accounts]
|
||||||
|
(mapv (fn [ba]
|
||||||
|
;; TODO remove when new yodlee replaces
|
||||||
|
(assoc ba :bank-account/yodlee-balance-old (get-in (by :id (mapcat :accounts @in-memory-cache) )
|
||||||
|
[(:bank-account/yodlee-account-id ba) :balance :amount])))
|
||||||
|
bank-accounts))))))))
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
[:location-matches [:id :location :match]]
|
[:location-matches [:id :location :match]]
|
||||||
[:bank-accounts [:id :start-date :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id
|
[:bank-accounts [:id :start-date :code :number :bank-name :bank-code :check-number :name :routing :type :sort-order :visible :yodlee-account-id
|
||||||
[:yodlee-account [:name :id :number]]
|
[:yodlee-account [:name :id :number]]
|
||||||
:locations :include-in-reports :current-balance] ]
|
:locations :include-in-reports :current-balance :yodlee-balance-old] ]
|
||||||
[:address [:street1 :street2 :city :state :zip]]
|
[:address [:street1 :street2 :city :state :zip]]
|
||||||
[:forecasted-transactions [:id :amount :identifier :day-of-month]]]
|
[:forecasted-transactions [:id :amount :identifier :day-of-month]]]
|
||||||
(= "admin" (or (get (jwt->data token) "role") (get (jwt->data token) "user/role")) ) (conj [:yodlee-provider-accounts [:id [:accounts [:id :name :number :available-balance]]]])))
|
(= "admin" (or (get (jwt->data token) "role") (get (jwt->data token) "user/role")) ) (conj [:yodlee-provider-accounts [:id [:accounts [:id :name :number :available-balance]]]])))
|
||||||
|
|||||||
@@ -34,4 +34,10 @@
|
|||||||
]
|
]
|
||||||
(:name ba) (when (and (:current-balance ba)
|
(:name ba) (when (and (:current-balance ba)
|
||||||
is-power-user?)
|
is-power-user?)
|
||||||
(str ": " (->$ (:current-balance ba))))])]))
|
(str ": " (->$ (:current-balance ba))))
|
||||||
|
|
||||||
|
(when (and (:yodlee-balance-old ba)
|
||||||
|
is-power-user?)
|
||||||
|
[:<>
|
||||||
|
[:div.tag [:img {:src "/img/yodlee.png" :style {:width "16px" :height "16px"}}]
|
||||||
|
(->$ (:yodlee-balance-old ba 0.00))]])])]))
|
||||||
|
|||||||
Reference in New Issue
Block a user