diff --git a/iol_ion/src/iol_ion/query.clj b/iol_ion/src/iol_ion/query.clj new file mode 100644 index 00000000..c975aea3 --- /dev/null +++ b/iol_ion/src/iol_ion/query.clj @@ -0,0 +1,9 @@ +(ns iol-ion.query) + +#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} +(defn dollars-0? [amt] + (< -0.001 amt 0.001)) + +#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]} +(defn dollars= [amt1 amt2] + (dollars-0? (- amt1 amt2) )) diff --git a/resources/datomic/ion-config.edn b/resources/datomic/ion-config.edn index a3132268..8064bdeb 100644 --- a/resources/datomic/ion-config.edn +++ b/resources/datomic/ion-config.edn @@ -3,5 +3,8 @@ iol-ion.tx/reset-rels iol-ion.tx/upsert-ledger iol-ion.tx/min-by - iol-ion.tx/propose-invoice] + iol-ion.tx/propose-invoice + + iol-ion.query/dollars= + iol-ion.query/dollars-0?] :app-name "iol-cloud"} diff --git a/src/clj/auto_ap/datomic/checks.clj b/src/clj/auto_ap/datomic/checks.clj index eb115db4..1e36f99e 100644 --- a/src/clj/auto_ap/datomic/checks.clj +++ b/src/clj/auto_ap/datomic/checks.clj @@ -117,7 +117,7 @@ (:amount args) (merge-query {:query {:in ['?amount] :where ['[?e :payment/amount ?transaction-amount] - '[(auto-ap.utils/dollars= ?transaction-amount ?amount)]]} + '[(iol-ion.query/dollars= ?transaction-amount ?amount)]]} :args [(:amount args)]}) diff --git a/src/clj/auto_ap/datomic/expected_deposit.clj b/src/clj/auto_ap/datomic/expected_deposit.clj index fc57fb10..2061e07c 100644 --- a/src/clj/auto_ap/datomic/expected_deposit.clj +++ b/src/clj/auto_ap/datomic/expected_deposit.clj @@ -67,7 +67,7 @@ (:total args) (merge-query {:query {:in ['?total] :where ['[?e :expected-deposit/total ?expected-deposit-total] - '[(auto-ap.utils/dollars= ?expected-deposit-total ?total)]]} + '[(iol-ion.query/dollars= ?expected-deposit-total ?total)]]} :args [(:total args)]}) diff --git a/src/clj/auto_ap/datomic/sales_orders.clj b/src/clj/auto_ap/datomic/sales_orders.clj index 1c462918..add87462 100644 --- a/src/clj/auto_ap/datomic/sales_orders.clj +++ b/src/clj/auto_ap/datomic/sales_orders.clj @@ -189,7 +189,7 @@ (:total args) (merge-query {:query {:in ['?total] :where ['[?e :sales-order/total ?sales-order-total] - '[(auto-ap.utils/dollars= ?sales-order-total ?total)]]} + '[(iol-ion.query/dollars= ?sales-order-total ?total)]]} :args [(:total args)]}) true