From d2473ca915e8306691c4f9dd53d24c0889ff83ff Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 16 Apr 2019 06:37:32 -0700 Subject: [PATCH] yodlee vendors --- src/clj/auto_ap/datomic/migrate.clj | 2 +- src/clj/auto_ap/datomic/migrate/add_general_ledger.clj | 2 +- src/clj/auto_ap/datomic/transactions.clj | 4 ++-- src/clj/auto_ap/graphql.clj | 3 ++- src/clj/auto_ap/yodlee/import.clj | 3 +-- src/cljs/auto_ap/views/pages/transactions/common.cljs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/clj/auto_ap/datomic/migrate.clj b/src/clj/auto_ap/datomic/migrate.clj index b8f48c4c..88a37de4 100644 --- a/src/clj/auto_ap/datomic/migrate.clj +++ b/src/clj/auto_ap/datomic/migrate.clj @@ -124,7 +124,7 @@ :requires [:auto-ap/convert-vendors]} :auto-ap/convert-transactions {:txes-fn `add-general-ledger/convert-transactions :requires [:auto-ap/convert-invoices]} - :auto-ap/add-yodlee-merchant {:txes add-general-ledger/add-yodlee-merchant :requires [:auto-ap/convert-transactions]} + :auto-ap/add-yodlee-merchant2 {:txes add-general-ledger/add-yodlee-merchant :requires [:auto-ap/convert-transactions]} #_#_:auto-ap/bulk-load-invoice-ledger3 {:txes-fn `add-general-ledger/bulk-load-invoice-ledger :requires [:auto-ap/convert-transactions]} #_#_:auto-ap/bulk-load-transaction-ledger3 {:txes-fn `add-general-ledger/bulk-load-transaction-ledger :requires [:auto-ap/convert-transactions]} diff --git a/src/clj/auto_ap/datomic/migrate/add_general_ledger.clj b/src/clj/auto_ap/datomic/migrate/add_general_ledger.clj index 02ab3be4..c50cebf1 100644 --- a/src/clj/auto_ap/datomic/migrate/add_general_ledger.clj +++ b/src/clj/auto_ap/datomic/migrate/add_general_ledger.clj @@ -87,7 +87,7 @@ :db/cardinality :db.cardinality/one :db/doc "The yodlee merchant name"} - {:db/ident :yodlee-merchant/id + {:db/ident :yodlee-merchant/yodlee-id :db/valueType :db.type/string :db/unique :db.unique/identity :db/cardinality :db.cardinality/one diff --git a/src/clj/auto_ap/datomic/transactions.clj b/src/clj/auto_ap/datomic/transactions.clj index 47f0eed7..224704ba 100644 --- a/src/clj/auto_ap/datomic/transactions.clj +++ b/src/clj/auto_ap/datomic/transactions.clj @@ -76,7 +76,7 @@ :transaction/bank-account [:bank-account/name :bank-account/code :bank-account/yodlee-account-id :db/id] :transaction/vendor [:db/id :vendor/name] :transaction/account [:db/id :account/name :account/numeric-code] - :transaction/yodlee-merchant [:db/id :yodlee-merchant/id :yodlee-merchant/name]}] + :transaction/yodlee-merchant [:db/id :yodlee-merchant/yodlee-id :yodlee-merchant/name]}] ids) (map #(update % :transaction/date c/from-date)) (map #(update % :transaction/post-date c/from-date)) @@ -97,7 +97,7 @@ :transaction/bank-account [:bank-account/name :bank-account/code :bank-account/yodlee-account-id :db/id] :transaction/vendor [:db/id :vendor/name] :transaction/account [:db/id :account/name :account/numeric-code] - :transaction/yodlee-merchant [:db/id :yodlee-merchant/id :yodlee-merchant/name]}] + :transaction/yodlee-merchant [:db/id :yodlee-merchant/yodlee-id :yodlee-merchant/name]}] id) (update :transaction/date c/from-date) (update :transaction/post-date c/from-date) diff --git a/src/clj/auto_ap/graphql.clj b/src/clj/auto_ap/graphql.clj index 1d51bab3..f357eb49 100644 --- a/src/clj/auto_ap/graphql.clj +++ b/src/clj/auto_ap/graphql.clj @@ -151,7 +151,8 @@ :invoices {:type '(list :invoice_payment)} }} - :yodlee_merchant {:fields {:id {:type 'String} + :yodlee_merchant {:fields {:id {:type :id} + :yodlee_id {:type 'String} :name {:type 'String}}} :transaction {:fields {:id {:type :id} diff --git a/src/clj/auto_ap/yodlee/import.clj b/src/clj/auto_ap/yodlee/import.clj index 54ff5c34..711dd3f9 100644 --- a/src/clj/auto_ap/yodlee/import.clj +++ b/src/clj/auto_ap/yodlee/import.clj @@ -74,8 +74,7 @@ :account-id account-id :date (coerce/to-date (time/parse date "YYYY-MM-dd")) :yodlee-merchant (when (and merchant-id merchant-name) - (println "INCLUDING MERCHANT") - {:yodlee-merchant/id merchant-id + {:yodlee-merchant/yodlee-id merchant-id :yodlee-merchant/name merchant-name}) :amount (double amount) :description-original description-original diff --git a/src/cljs/auto_ap/views/pages/transactions/common.cljs b/src/cljs/auto_ap/views/pages/transactions/common.cljs index 47cd4545..5cae7593 100644 --- a/src/cljs/auto_ap/views/pages/transactions/common.cljs +++ b/src/cljs/auto_ap/views/pages/transactions/common.cljs @@ -7,7 +7,7 @@ [:vendor [:name :id]] [:account [:id :name]] :date - [:yodlee_merchant [:name :id]] + [:yodlee_merchant [:name :yodlee-id]] :post_date :status :description_original