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

Add vendor pre-population for bulk code and individual edit forms

Browse Source 
- Add vendor-changed HTMX handlers for both bulk code and individual edit
- Pre-populate default account at 100% when vendor is selected and no accounts exist
- Fix render-accounts-section to render from step-params correctly
- Change bulk code vendor-changed from hx-get to hx-post to include form data
- Add routes for vendor-changed endpoints
- Update e2e tests to cover vendor pre-population
- Run lein cljfmt fix across codebase
This commit is contained in:
Bryce
2026-05-21 14:45:19 -07:00
parent 8bd0cee1b1
commit ba87805d4c
210 changed files with 8694 additions and 9627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
test/clj/auto_ap/integration/graphql/transactions.clj
View File

@@ -22,8 +22,8 @@
(testing "Should list transactions"
(let [{:strs [transaction-id
test-client-id]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/client "test-client-id"
:transaction/bank-account "test-bank-account-id")])]
:transaction/client "test-client-id"
:transaction/bank-account "test-bank-account-id")])]
(is (= 1 (:total (sut/get-transaction-page {:id (admin-token)} {} nil))))
(is (= transaction-id (:id (first (:data (sut/get-transaction-page {:id (admin-token)} {} nil))))))
(testing "Should only show transactions you have access to"
@@ -39,18 +39,17 @@
(testing "Should only show potential duplicates if filtered enough"
(is (thrown? Exception (:total (sut/get-transaction-page {:id (admin-token)} {:filters {:potential_duplicates true}} nil))))))))
(deftest bulk-change-status
(testing "Should change status of multiple transactions"
(let [{:strs [transaction-id
test-client-id]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/client "test-client-id"
:transaction/approval-status :transaction-approval-status/approved
:transaction/bank-account "test-bank-account-id")])]
:transaction/client "test-client-id"
:transaction/approval-status :transaction-approval-status/approved
:transaction/bank-account "test-bank-account-id")])]
(is (= "Succesfully changed 1 transactions to be unapproved."
(:message (sut/bulk-change-status {:id (admin-token)
:clients [{:db/id test-client-id}]} {:filters {}
:status :unapproved} nil))))
:status :unapproved} nil))))
(is (= :transaction-approval-status/unapproved
(:db/ident (:transaction/approval-status (dc/pull (dc/db conn) '[{:transaction/approval-status [:db/ident]}] transaction-id)))))
@@ -65,9 +64,9 @@
test-client-id
test-account-id
test-vendor-id]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/client "test-client-id"
:transaction/bank-account "test-bank-account-id"
:transaction/amount 40.0)])]
:transaction/client "test-client-id"
:transaction/bank-account "test-bank-account-id"
:transaction/amount 40.0)])]
(is (= "Successfully coded 1 transactions."
(:message (sut/bulk-code-transactions {:id (admin-token)
:clients [{:db/id test-client-id}]}
@@ -94,18 +93,17 @@
(let [{:strs [transaction-id-1
transaction-id-2
test-client-id-2
test-client-id]} (setup-test-data [
(test-transaction :db/id "transaction-id-1"
:transaction/client "test-client-id"
:transaction/bank-account "test-bank-account-id"
:transaction/amount 40.0)
(test-transaction :db/id "transaction-id-2"
:transaction/client "test-client-id-2"
:transaction/bank-account "test-bank-account-id-2"
:transaction/amount 40.0)
(test-client :db/id "test-client-id-2"
:client/locations ["GR"])
(test-bank-account :db/id "test-bank-account-id-2")])]
test-client-id]} (setup-test-data [(test-transaction :db/id "transaction-id-1"
:transaction/client "test-client-id"
:transaction/bank-account "test-bank-account-id"
:transaction/amount 40.0)
(test-transaction :db/id "transaction-id-2"
:transaction/client "test-client-id-2"
:transaction/bank-account "test-bank-account-id-2"
:transaction/amount 40.0)
(test-client :db/id "test-client-id-2"
:client/locations ["GR"])
(test-bank-account :db/id "test-bank-account-id-2")])]
(is (= "Successfully coded 2 transactions."
(:message (sut/bulk-code-transactions {:id (admin-token)
:clients [{:db/id test-client-id}
@@ -116,7 +114,7 @@
:accounts [{:account_id test-account-id
:location "Shared"
:percentage 1.0}]} nil))))
(is (= #:transaction{:vendor {:db/id test-vendor-id}
:approval-status {:db/ident :transaction-approval-status/unapproved}
:accounts [#:transaction-account{:account {:db/id test-account-id}
@@ -143,8 +141,7 @@
(testing "should reject a location that doesnt exist"
(let [{:strs [test-client-id-1
test-client-id-2]} (setup-test-data [
(test-transaction :db/id "transaction-id-1"
test-client-id-2]} (setup-test-data [(test-transaction :db/id "transaction-id-1"
:transaction/client "test-client-id-1"
:transaction/bank-account "test-bank-account-id"
:transaction/amount 40.0)
@@ -158,14 +155,14 @@
:client/locations ["GR" "BOTH"])
(test-bank-account :db/id "test-bank-account-id-2")])]
(is (thrown? Exception (sut/bulk-code-transactions {:id (admin-token)
:clients [{:db/id test-client-id}
{:db/id test-client-id-2}]}
{:filters {}
:vendor test-vendor-id
:approval_status :unapproved
:accounts [{:account_id test-account-id
:location "OG"
:percentage 1.0}]} nil)))
:clients [{:db/id test-client-id}
{:db/id test-client-id-2}]}
{:filters {}
:vendor test-vendor-id
:approval_status :unapproved
:accounts [{:account_id test-account-id
:location "OG"
:percentage 1.0}]} nil)))
(is (thrown? Exception (sut/bulk-code-transactions {:id (admin-token)
:clients [{:db/id test-client-id}
{:db/id test-client-id-2}]}
@@ -223,7 +220,6 @@
:location "DT"
:amount 20.0}]}} nil)))))))
(deftest match-transaction
(testing "Should link a transaction to a payment, mark it as accounts payable"
(let [{:strs [transaction-id
@@ -275,36 +271,33 @@
:payment/bank-account "mismatched-bank-account-id"
:payment/amount 50.0)])]
(is (thrown? Exception (sut/match-transaction {:id (admin-token)} {:transaction_id transaction-id :payment_id mismatched-amount-payment-id} nil)))
(is (thrown? Exception (sut/match-transaction {:id (admin-token)} {:transaction_id transaction-id :payment_id mismatched-bank-account-payment-id} nil)))
)))
(is (thrown? Exception (sut/match-transaction {:id (admin-token)} {:transaction_id transaction-id :payment_id mismatched-bank-account-payment-id} nil))))))
(deftest match-transaction-autopay-invoices
(testing "Should link transaction to a set of autopaid invoices"
(let [{:strs [transaction-id
test-vendor-id
invoice-1
invoice-2
]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/total 30.0)
(test-invoice :db/id "invoice-2"
:invoice/total 20.0)])]
invoice-2]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/total 30.0)
(test-invoice :db/id "invoice-2"
:invoice/total 20.0)])]
(sut/match-transaction-autopay-invoices {:id (admin-token)} {:transaction_id transaction-id :autopay_invoice_ids [invoice-1 invoice-2]} nil)
(let [result (dc/pull (dc/db conn) '[:transaction/vendor
{:transaction/payment [:db/id {:payment/status [:db/ident]}]}
{:transaction/approval-status [:db/ident]
:transaction/accounts [:transaction-account/account
:transaction-account/location
:transaction-account/amount]}
]
:transaction-account/amount]}]
transaction-id)]
(testing "should have created a payment"
(is (some? (:transaction/payment result)))
(is (= :payment-status/cleared (-> result
:transaction/payment
:payment/status
:db/ident)))
:transaction/payment
:payment/status
:db/ident)))
(is (= :transaction-approval-status/approved (-> result :transaction/approval-status :db/ident))))
(testing "Should have completed the invoice"
(is (= :invoice-status/paid (->> invoice-1
@@ -320,11 +313,10 @@
(let [{:strs [transaction-id
test-vendor-id
invoice-1
invoice-2
]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/total 30.0)])]
invoice-2]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/total 30.0)])]
(is (thrown? Exception (sut/match-transaction-autopay-invoices {:id (admin-token)} {:transaction_id transaction-id :autopay_invoice_ids [invoice-1 invoice-2]} nil))))))
(deftest match-transaction-unpaid-invoices
@@ -332,30 +324,28 @@
(let [{:strs [transaction-id
test-vendor-id
invoice-1
invoice-2
]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/outstanding-balance 30.0 ;; TODO this part is a little different
:invoice/total 30.0)
(test-invoice :db/id "invoice-2"
:invoice/outstanding-balance 20.0 ;; TODO this part is a little different
:invoice/total 20.0)])]
invoice-2]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/outstanding-balance 30.0 ;; TODO this part is a little different
:invoice/total 30.0)
(test-invoice :db/id "invoice-2"
:invoice/outstanding-balance 20.0 ;; TODO this part is a little different
:invoice/total 20.0)])]
(sut/match-transaction-unpaid-invoices {:id (admin-token)} {:transaction_id transaction-id :unpaid_invoice_ids [invoice-1 invoice-2]} nil)
(let [result (dc/pull (dc/db conn) '[:transaction/vendor
{:transaction/payment [:db/id {:payment/status [:db/ident]}]}
{:transaction/approval-status [:db/ident]
:transaction/accounts [:transaction-account/account
:transaction-account/location
:transaction-account/amount]}
]
:transaction-account/amount]}]
transaction-id)]
(testing "should have created a payment"
(is (some? (:transaction/payment result)))
(is (= :payment-status/cleared (-> result
:transaction/payment
:payment/status
:db/ident)))
:transaction/payment
:payment/status
:db/ident)))
(is (= :transaction-approval-status/approved (-> result :transaction/approval-status :db/ident))))
(testing "Should have completed the invoice"
(is (= :invoice-status/paid (->> invoice-1
@@ -371,29 +361,25 @@
(let [{:strs [transaction-id
test-vendor-id
invoice-1
invoice-2
]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/total 30.0)])]
invoice-2]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-invoice :db/id "invoice-1"
:invoice/total 30.0)])]
(is (thrown? Exception (sut/match-transaction-autopay-invoices {:id (admin-token)} {:transaction_id transaction-id :autopay_invoice_ids [invoice-1 invoice-2]} nil))))))
(deftest match-transaction-rules
(testing "Should match transactions without linked payments"
(let [{:strs [transaction-id
transaction-rule-id
]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-transaction-rule :db/id "transaction-rule-id"
:transaction-rule/client "test-client-id"
:transaction-rule/transaction-approval-status :transaction-approval-status/excluded
:transaction-rule/description ".*"
)])]
transaction-rule-id]} (setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-transaction-rule :db/id "transaction-rule-id"
:transaction-rule/client "test-client-id"
:transaction-rule/transaction-approval-status :transaction-approval-status/excluded
:transaction-rule/description ".*")])]
(is (= transaction-rule-id (-> (sut/match-transaction-rules {:id (admin-token)} {:transaction_ids [transaction-id] :transaction_rule_id transaction-rule-id} nil)
first
:matched_rule
:id)))
first
:matched_rule
:id)))
(testing "Should apply statuses"
(is (= :excluded
@@ -401,8 +387,7 @@
{:transaction_ids [transaction-id] :transaction_rule_id transaction-rule-id}
nil)
first
:approval_status
))))))
:approval_status))))))
(testing "Should not apply to transactions if they don't match"
(let [{:strs [transaction-id
@@ -410,12 +395,11 @@
(setup-test-data [(test-transaction :db/id "transaction-id"
:transaction/amount -50.0)
(test-transaction-rule :db/id "transaction-rule-id"
:transaction-rule/description "NOMATCH"
)])]
:transaction-rule/description "NOMATCH")])]
(is (thrown? Exception (-> (sut/match-transaction-rules {:id (admin-token)} {:transaction_ids [transaction-id] :transaction_rule_id transaction-rule-id} nil)
first
:matched_rule
:id)))))
first
:matched_rule
:id)))))
(testing "Should not apply to transactions if they are already matched"
(let [{:strs [transaction-id
transaction-rule-id]}
@@ -424,8 +408,7 @@
:transaction/payment {:db/id "extant-payment-id"}
:transaction/amount -50.0)
(test-transaction-rule :db/id "transaction-rule-id"
:transaction-rule/description ".*"
)])]
:transaction-rule/description ".*")])]
(is (thrown? Exception (-> (sut/match-transaction-rules {:id (admin-token)} {:transaction_ids [transaction-id] :transaction_rule_id transaction-rule-id} nil)
first
:matched_rule
@@ -438,8 +421,7 @@
:transaction/description-original "MATCH"
:transaction/amount -50.0)
(test-transaction-rule :db/id "transaction-rule-id"
:transaction-rule/description ".*"
)])]
:transaction-rule/description ".*")])]
(sut/match-transaction-rules {:id (admin-token)} {:all true
:transaction_rule_id transaction-rule-id} nil)
(= {:transaction/matched-rule {:db/id transaction-rule-id}}