diff --git a/src/clj/auto_ap/datomic.clj b/src/clj/auto_ap/datomic.clj index d1449867..40b45729 100644 --- a/src/clj/auto_ap/datomic.clj +++ b/src/clj/auto_ap/datomic.clj @@ -4,18 +4,12 @@ [clojure.tools.logging :as log] [clojure.edn :as edn] [config.core :refer [env]] -<<<<<<< HEAD [datomic.client.api :as dc] [com.brunobonacci.mulog :as mu] [mount.core :as mount] [clojure.java.io :as io]) (:import (java.util UUID))) -======= - [datomic.api :as d] - [mount.core :as mount] - [com.brunobonacci.mulog :as mu])) ->>>>>>> master (def uri (:datomic-url env)) diff --git a/test/clj/auto_ap/integration/graphql/checks.clj b/test/clj/auto_ap/integration/graphql/checks.clj index ca5797c9..5d34df96 100644 --- a/test/clj/auto_ap/integration/graphql/checks.clj +++ b/test/clj/auto_ap/integration/graphql/checks.clj @@ -6,7 +6,7 @@ [auto-ap.integration.util :refer [admin-token user-token wrap-setup]] [clojure.test :as t :refer [deftest is testing use-fixtures]] [com.brunobonacci.mulog :as mu] - [datomic.api :as d])) + [datomic.client.api :as d])) (use-fixtures :each wrap-setup) @@ -26,19 +26,19 @@ (deftest get-payment-page (testing "Should list payments" - (let [{{:strs [bank-id check-id client-id]} :tempids} @(d/transact conn [{:bank-account/code "bank" - :db/id "bank-id"} - {:client/code "client" - :db/id "client-id"} - {:db/id "check-id" - :payment/check-number 1000 - :payment/bank-account "bank-id" - :payment/client "client-id" - :payment/type :payment-type/check - :payment/amount 123.50 - :payment/paid-to "Someone" - :payment/status :payment-status/pending - :payment/date #inst "2022-01-01"}])] + (let [{{:strs [bank-id check-id client-id]} :tempids} (d/transact conn {:tx-data [{:bank-account/code "bank" + :db/id "bank-id"} + {:client/code "client" + :db/id "client-id"} + {:db/id "check-id" + :payment/check-number 1000 + :payment/bank-account "bank-id" + :payment/client "client-id" + :payment/type :payment-type/check + :payment/amount 123.50 + :payment/paid-to "Someone" + :payment/status :payment-status/pending + :payment/date #inst "2022-01-01"}]})] (is (= [ {:amount 123.5, :type :check, :bank_account {:id bank-id, :code "bank"}, @@ -81,103 +81,103 @@ (deftest void-payment (testing "Should void payments" - (let [{{:strs [bank-id check-id client-id]} :tempids} @(d/transact conn [{:bank-account/code "bank" - :db/id "bank-id"} - {:client/code "client" - :db/id "client-id"} - (sample-payment :db/id "check-id")])] + (let [{{:strs [bank-id check-id client-id]} :tempids} (d/transact conn {:tx-data [{:bank-account/code "bank" + :db/id "bank-id"} + {:client/code "client" + :db/id "client-id"} + (sample-payment :db/id "check-id")]})] (sut/void-payment {:id (admin-token)} {:payment_id check-id} nil) (is (= :payment-status/voided (-> (d/pull (d/db conn) [{:payment/status [:db/ident ]}] check-id) :payment/status :db/ident))))) (testing "Should not void payments if account is locked" - (let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank" - :db/id "bank-id"} - {:client/code "client" - :db/id "client-id" - :client/locked-until #inst "2030-01-01"} - (sample-payment :payment/client "client-id" - :db/id "check-id" - :payment/date #inst "2020-01-01")])] + (let [{{:strs [check-id]} :tempids} (d/transact conn {:tx-data [{:bank-account/code "bank" + :db/id "bank-id"} + {:client/code "client" + :db/id "client-id" + :client/locked-until #inst "2030-01-01"} + (sample-payment :payment/client "client-id" + :db/id "check-id" + :payment/date #inst "2020-01-01")]})] (is (thrown? Exception (sut/void-payment {:id (admin-token)} {:payment_id check-id} nil)))))) (deftest void-payments (testing "bulk void" (testing "Should bulk void payments if account is not locked" - (let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank" - :db/id "bank-id"} - {:client/code "client-new" - :db/id "client-id"} - (sample-payment :payment/client "client-id" - :db/id "check-id" - :payment/date #inst "2020-01-01")])] + (let [{{:strs [check-id]} :tempids} (d/transact conn {:tx-data [{:bank-account/code "bank" + :db/id "bank-id"} + {:client/code "client-new" + :db/id "client-id"} + (sample-payment :payment/client "client-id" + :db/id "check-id" + :payment/date #inst "2020-01-01")]})] (sut/void-payments {:id (admin-token)} {:filters {:date_range {:start #inst "2000-01-01"}}} nil) (is (= :payment-status/voided (-> (d/pull (d/db conn) '[{:payment/status [:db/ident]}] check-id) :payment/status :db/ident))))) (testing "Should only void a payment if it matches filter criteria" - (let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank" - :db/id "bank-id"} - {:client/code "client-new" - :db/id "client-id"} - (sample-payment :payment/client "client-id" - :db/id "check-id" - :payment/date #inst "2020-01-01")])] + (let [{{:strs [check-id]} :tempids} (d/transact conn {:tx-data [{:bank-account/code "bank" + :db/id "bank-id"} + {:client/code "client-new" + :db/id "client-id"} + (sample-payment :payment/client "client-id" + :db/id "check-id" + :payment/date #inst "2020-01-01")]})] (sut/void-payments {:id (admin-token)} {:filters {:date_range {:start #inst "2022-01-01"}}} nil) (is (= :payment-status/pending (-> (d/pull (d/db conn) '[{:payment/status [:db/ident]}] check-id) :payment/status :db/ident))))) (testing "Should not bulk void payments if account is locked" - (let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank" - :db/id "bank-id"} - {:client/code "client" - :db/id "client-id" - :client/locked-until #inst "2030-01-01"} - (sample-payment :payment/client "client-id" - :db/id "check-id" - :payment/date #inst "2020-01-01")])] + (let [{{:strs [check-id]} :tempids} (d/transact conn {:tx-data [{:bank-account/code "bank" + :db/id "bank-id"} + {:client/code "client" + :db/id "client-id" + :client/locked-until #inst "2030-01-01"} + (sample-payment :payment/client "client-id" + :db/id "check-id" + :payment/date #inst "2020-01-01")]})] (sut/void-payments {:id (admin-token)} {:filters {:date_range {:start #inst "2000-01-01"}}} nil) (is (= :payment-status/pending (-> (d/pull (d/db conn) '[{:payment/status [:db/ident]}] check-id) :payment/status :db/ident))))) (testing "Only admins should be able to bulk void" - (let [{{:strs [check-id]} :tempids} @(d/transact conn [{:bank-account/code "bank" - :db/id "bank-id"} - {:client/code "client" - :db/id "client-id"} - (sample-payment :payment/client "client-id" - :db/id "check-id" - :payment/date #inst "2020-01-01")])] + (let [{{:strs [check-id]} :tempids} (d/transact conn {:tx-data [{:bank-account/code "bank" + :db/id "bank-id"} + {:client/code "client" + :db/id "client-id"} + (sample-payment :payment/client "client-id" + :db/id "check-id" + :payment/date #inst "2020-01-01")]})] (is (thrown? Exception (sut/void-payments {:id (user-token)} {:filters {:date_range {:start #inst "2000-01-01"}}} nil))))))) (deftest print-checks (testing "Print checks" (testing "Should allow 'printing' cash checks" - (let [{{:strs [invoice-id client-id bank-id]} :tempids} @(d/transact conn [{:client/code "client" - :db/id "client-id" - :client/locked-until #inst "2030-01-01" - :client/bank-accounts [{:bank-account/code "bank" - :db/id "bank-id"}]} - {:db/id "vendor-id" - :vendor/name "V" - :vendor/default-account "account-id"} - {:db/id "account-id" - :account/name "My account" - :account/numeric-code 21000} - {:db/id "invoice-id" - :invoice/client "client-id" - :invoice/date #inst "2022-01-01" - :invoice/vendor "vendor-id" - :invoice/total 30.0 - :invoice/outstanding-balance 30.0 - :invoice/expense-accounts [{:db/id "invoice-expense-account" - :invoice-expense-account/account "account-id" - :invoice-expense-account/amount 30.0}]}])] + (let [{{:strs [invoice-id client-id bank-id]} :tempids} (d/transact conn {:tx-data [{:client/code "client" + :db/id "client-id" + :client/locked-until #inst "2030-01-01" + :client/bank-accounts [{:bank-account/code "bank" + :db/id "bank-id"}]} + {:db/id "vendor-id" + :vendor/name "V" + :vendor/default-account "account-id"} + {:db/id "account-id" + :account/name "My account" + :account/numeric-code 21000} + {:db/id "invoice-id" + :invoice/client "client-id" + :invoice/date #inst "2022-01-01" + :invoice/vendor "vendor-id" + :invoice/total 30.0 + :invoice/outstanding-balance 30.0 + :invoice/expense-accounts [{:db/id "invoice-expense-account" + :invoice-expense-account/account "account-id" + :invoice-expense-account/amount 30.0}]}]})] (let [paid-invoice (-> (sut/print-checks {:id (admin-token)} {:invoice_payments [{:invoice_id invoice-id :amount 30.0}] :client_id client-id @@ -206,25 +206,25 @@ :id)))))))) (testing "Should allow 'printing' debit checks" - (let [{{:strs [invoice-id client-id bank-id]} :tempids} @(d/transact conn [{:client/code "client" - :db/id "client-id" - :client/bank-accounts [{:bank-account/code "bank" - :db/id "bank-id"}]} - {:db/id "vendor-id" - :vendor/name "V" - :vendor/default-account "account-id"} - {:db/id "account-id" - :account/name "My account" - :account/numeric-code 21000} - {:db/id "invoice-id" - :invoice/client "client-id" - :invoice/date #inst "2022-01-01" - :invoice/vendor "vendor-id" - :invoice/total 50.0 - :invoice/outstanding-balance 50.0 - :invoice/expense-accounts [{:db/id "invoice-expense-account" - :invoice-expense-account/account "account-id" - :invoice-expense-account/amount 50.0}]}])] + (let [{{:strs [invoice-id client-id bank-id]} :tempids} (d/transact conn {:tx-data [{:client/code "client" + :db/id "client-id" + :client/bank-accounts [{:bank-account/code "bank" + :db/id "bank-id"}]} + {:db/id "vendor-id" + :vendor/name "V" + :vendor/default-account "account-id"} + {:db/id "account-id" + :account/name "My account" + :account/numeric-code 21000} + {:db/id "invoice-id" + :invoice/client "client-id" + :invoice/date #inst "2022-01-01" + :invoice/vendor "vendor-id" + :invoice/total 50.0 + :invoice/outstanding-balance 50.0 + :invoice/expense-accounts [{:db/id "invoice-expense-account" + :invoice-expense-account/account "account-id" + :invoice-expense-account/amount 50.0}]}]})] (let [paid-invoice (-> (sut/print-checks {:id (admin-token)} {:invoice_payments [{:invoice_id invoice-id :amount 50.0}] :client_id client-id @@ -253,28 +253,28 @@ :id))))))))) (testing "Should allow printing checks" - (let [{{:strs [invoice-id client-id bank-id]} :tempids} @(d/transact conn [{:client/code "client" - :db/id "client-id" - :client/bank-accounts [{:bank-account/code "bank" - :bank-account/type :bank-account-type/check + (let [{{:strs [invoice-id client-id bank-id]} :tempids} (d/transact conn {:tx-data [{:client/code "client" + :db/id "client-id" + :client/bank-accounts [{:bank-account/code "bank" + :bank-account/type :bank-account-type/check - :bank-account/check-number 10000 - :db/id "bank-id"}]} - {:db/id "vendor-id" - :vendor/name "V" - :vendor/default-account "account-id"} - {:db/id "account-id" - :account/name "My account" - :account/numeric-code 21000} - {:db/id "invoice-id" - :invoice/client "client-id" - :invoice/date #inst "2022-01-01" - :invoice/vendor "vendor-id" - :invoice/total 150.0 - :invoice/outstanding-balance 150.0 - :invoice/expense-accounts [{:db/id "invoice-expense-account" - :invoice-expense-account/account "account-id" - :invoice-expense-account/amount 150.0}]}])] + :bank-account/check-number 10000 + :db/id "bank-id"}]} + {:db/id "vendor-id" + :vendor/name "V" + :vendor/default-account "account-id"} + {:db/id "account-id" + :account/name "My account" + :account/numeric-code 21000} + {:db/id "invoice-id" + :invoice/client "client-id" + :invoice/date #inst "2022-01-01" + :invoice/vendor "vendor-id" + :invoice/total 150.0 + :invoice/outstanding-balance 150.0 + :invoice/expense-accounts [{:db/id "invoice-expense-account" + :invoice-expense-account/account "account-id" + :invoice-expense-account/amount 150.0}]}]})] (let [result (-> (sut/print-checks {:id (admin-token)} {:invoice_payments [{:invoice_id invoice-id :amount 150.0}] :client_id client-id