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

Supports editing the approval status.

Browse Source
This commit is contained in:
Bryce Covert
2019-05-14 09:06:58 -07:00
parent 76c903d16d
commit 66fd9a87bc
7 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/clj/auto_ap/datomic/migrate/add_general_ledger.clj
View File

@@ -74,14 +74,7 @@
:db/cardinality :db.cardinality/one
:db/doc "Location of the entry"}
{:db/ident :transaction/approval-status
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/one
:db/doc "Status of a transaction"}
{:db/ident :transaction-approval-status/approved}
{:db/ident :transaction-approval-status/unapproved}
{:db/ident :transaction-approval-status/requires-feedback}]
]
]
)
(def add-transaction-account
@@ -385,6 +378,20 @@
:db/cardinality :db.cardinality/many
:db/isComponent true
:db/doc "The outcome split"}
{:db/ident :transaction/approval-status
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/one
:db/doc "Status of a transaction"}
{:db/ident :transaction-rule/transaction-approval-status
:db/valueType :db.type/ref
:db/cardinality :db.cardinality/one
:db/doc "Status of a transaction"}
{:db/ident :transaction-approval-status/approved}
{:db/ident :transaction-approval-status/unapproved}
{:db/ident :transaction-approval-status/requires-feedback}
]])
(def add-credit-bank-account

3
src/clj/auto_ap/datomic/transaction_rules.clj
View File

@@ -12,7 +12,7 @@
{:transaction-rule/client [:client/name :db/id :client/code]}
{:transaction-rule/bank-account [*]}
{:transaction-rule/yodlee-merchant [*]}
{:transaction-rule/transaction-status [:db/id :db/ident]}
{:transaction-rule/transaction-approval-status [:db/id :db/ident]}
{:transaction-rule/vendor [:vendor/name :db/id :vendor/default-account]}
{:transaction-rule/accounts [:transaction-rule-account/percentage
:transaction-rule-account/location
@@ -70,7 +70,6 @@
(defn get-graphql [args]
(let [db (d/db (d/connect uri))
{ids-to-retrieve :ids matching-count :count} (raw-graphql-ids db args)]
[(->> (graphql-results ids-to-retrieve db args))
matching-count]))

12
src/clj/auto_ap/graphql/transaction_rules.clj
View File

@@ -9,10 +9,16 @@
[clojure.set :as set])
(:import [java.time.temporal ChronoField]))
(defn ident->enum-f [k]
#(update % k
(fn [value] (some-> value :db/ident name keyword))))
(defn get-transaction-rule-page [context args value]
(let [args (assoc args :id (:id context))
[journal-entries journal-entries-count] (tr/get-graphql (<-graphql args))]
(result->page journal-entries journal-entries-count :transaction_rules args)))
(result->page (->> journal-entries
(map (ident->enum-f :transaction-rule/transaction-approval-status)))
journal-entries-count :transaction_rules args)))
(defn deleted-accounts [transaction accounts]
(let [current-accounts (:transaction-rule/accounts transaction)
@@ -30,7 +36,7 @@
:account account_id
:location location}))
;; TODO ASSERT ADMIN
(defn upsert-transaction-rule [context {{:keys [id description note client_id bank_account_id amount_lte amount_gte vendor_id accounts ]} :transaction_rule :as z} value]
(defn upsert-transaction-rule [context {{:keys [id description note client_id bank_account_id amount_lte amount_gte vendor_id accounts transaction_approval_status ]} :transaction_rule :as z} value]
#_(assert-admin (:id context))
(let [existing-transaction (tr/get-by-id id)
deleted (deleted-accounts existing-transaction accounts)
@@ -50,6 +56,7 @@
:amount-lte amount_lte
:amount-gte amount_gte
:vendor vendor_id
:transaction-approval-status (keyword "transaction-approval-status" (name (<-graphql transaction_approval_status)))
:accounts (map transaction-rule-account->entity accounts)})]
transaction (into transaction
@@ -59,6 +66,7 @@
transaction-result @(d/transact (d/connect uri) transaction)]
(-> (tr/get-by-id (or (-> transaction-result :tempids (get "transaction-rule"))
id))
((ident->enum-f :transaction-rule/transaction-approval-status))
(->graphql))))
(defn tr [z x]