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

fix(transactions): drop suppressed transactions from the transactions page #19

Merged
notid merged 3 commits from worktree-revert-include-in-reports into staging 2026-08-16 08:40:49 -07:00
Conversation 0 Commits 3 Files Changed 2 +75 -1
2 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/clj/auto_ap/ssr/transaction/common.clj
View File

@@ -132,7 +132,13 @@
valid-clients]}
(cond-> {:query {:find []
:in ['$ '[?clients ?start ?end]]
:where '[[(iol-ion.query/scan-transactions $ ?clients ?start ?end) [[?e _ ?sort-default] ...]]]}
;; Suppressed transactions are never listed -- the GraphQL page has
;; always dropped them (auto-ap.datomic.transactions/graphql-results),
;; as do the ledger queries. The three status routes (approved,
;; unapproved, requires-feedback) constrain the status themselves, and
;; there is no suppressed route, so this never hides a page's own rows.
:where '[[(iol-ion.query/scan-transactions $ ?clients ?start ?end) [[?e _ ?sort-default] ...]]
(not [?e :transaction/approval-status :transaction-approval-status/suppressed])]}
:args [db
[valid-clients
(some-> (:start-date query-params) coerce/to-date)

68
test/clj/auto_ap/ssr/transaction/common_test.clj Normal file
View File

@@ -0,0 +1,68 @@
(ns auto-ap.ssr.transaction.common-test
(:require
[auto-ap.datomic :refer [conn]]
[auto-ap.integration.util :refer [setup-test-data test-bank-account test-client
test-transaction wrap-setup]]
[auto-ap.ssr.transaction.common :as sut]
[clojure.test :refer [deftest is testing use-fixtures]]
[datomic.api :as dc]))
(use-fixtures :each wrap-setup)
(defn- fetch
"Runs the transactions page query the way the page does, over a range wide
enough to cover the fixture data."
[client-id & {:keys [route-params query-params]}]
(sut/fetch-ids (dc/db conn)
{:clients [client-id]
:route-params (or route-params {})
:query-params (merge {:start-date "2021-01-01"
:end-date "2023-12-31"}
query-params)}))
(deftest fetch-ids-suppressed-test
(let [{:strs [suppressed-client kept-tx suppressed-tx]}
(setup-test-data
[(test-bank-account :db/id "suppressed-bank")
(test-client :db/id "suppressed-client"
:client/bank-accounts ["suppressed-bank"])
(test-transaction :db/id "kept-tx"
:transaction/client "suppressed-client"
:transaction/bank-account "suppressed-bank"
:transaction/date #inst "2022-06-01"
:transaction/amount 100.0
:transaction/approval-status :transaction-approval-status/approved)
(test-transaction :db/id "suppressed-tx"
:transaction/client "suppressed-client"
:transaction/bank-account "suppressed-bank"
:transaction/date #inst "2022-06-02"
:transaction/amount 250.0
:transaction/approval-status :transaction-approval-status/suppressed)])]
(testing "Should leave a suppressed transaction out of the transactions page"
(let [{:keys [ids all-ids count]} (fetch suppressed-client)]
(is (= [kept-tx] (vec ids)))
(is (not (contains? (set all-ids) suppressed-tx))
"a suppressed transaction must not reach the amount total either")
(is (= 1 count)
"the row count has to match what the page renders, not the unfiltered scan")))
(testing "Should still list a transaction on an explicit status route"
(let [{:keys [ids]} (fetch suppressed-client
:route-params {:status :transaction-approval-status/approved})]
(is (= [kept-tx] (vec ids)))))
(testing "Should return nothing for a client whose transactions are all suppressed"
(let [{:strs [empty-client]}
(setup-test-data
[(test-bank-account :db/id "empty-bank")
(test-client :db/id "empty-client"
:client/bank-accounts ["empty-bank"])
(test-transaction :db/id "only-tx"
:transaction/client "empty-client"
:transaction/bank-account "empty-bank"
:transaction/date #inst "2022-06-03"
:transaction/approval-status :transaction-approval-status/suppressed)])
{:keys [ids count]} (fetch empty-client)]
(is (empty? ids))
(is (= 0 count))))))