diff --git a/project.clj b/project.clj index 723284a3..7787e733 100644 --- a/project.clj +++ b/project.clj @@ -147,7 +147,8 @@ :jvm-opts ["-Dconfig=config/dev.edn" "-Xms4G" "-Xmx20G" "-XX:-OmitStackTraceInFastThrow" ]} :uberjar - {:java-cmd "/usr/lib/jvm/java-11-openjdk/bin/java" + { + ;;:java-cmd "/usr/lib/jvm/java-11-openjdk/bin/java" :prep-tasks ["fig:min" ] :aot [auto-ap.server auto-ap.time clj-time.core clj-time.coerce clj-time.format clojure.tools.logging.impl ] :dependencies [[com.bhauman/figwheel-main "0.2.18" :exclusions [org.clojure/clojurescript diff --git a/src/clj/auto_ap/jobs/bulk_journal_import.clj b/src/clj/auto_ap/jobs/bulk_journal_import.clj index ddd9f377..600bdf72 100644 --- a/src/clj/auto_ap/jobs/bulk_journal_import.clj +++ b/src/clj/auto_ap/jobs/bulk_journal_import.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.bulk-journal-import - #_(:gen-class) + (:gen-class) (:require [amazonica.aws.s3 :as s3] [auto-ap.graphql.ledger :refer [import-ledger]] diff --git a/src/clj/auto_ap/jobs/close_auto_invoices.clj b/src/clj/auto_ap/jobs/close_auto_invoices.clj index e81c2e2f..13ec8e95 100644 --- a/src/clj/auto_ap/jobs/close_auto_invoices.clj +++ b/src/clj/auto_ap/jobs/close_auto_invoices.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.close-auto-invoices - #_(:gen-class) + (:gen-class) (:require [auto-ap.datomic :refer [conn]] [auto-ap.jobs.core :refer [execute]] diff --git a/src/clj/auto_ap/jobs/current_balance_cache.clj b/src/clj/auto_ap/jobs/current_balance_cache.clj index 22636d82..8f9d447a 100644 --- a/src/clj/auto_ap/jobs/current_balance_cache.clj +++ b/src/clj/auto_ap/jobs/current_balance_cache.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.current-balance-cache - #_(:gen-class) + (:gen-class) (:require [auto-ap.graphql.clients :as clients] [auto-ap.jobs.core :refer [execute]])) diff --git a/src/clj/auto_ap/jobs/ezcater_upsert.clj b/src/clj/auto_ap/jobs/ezcater_upsert.clj index 1a4deb35..f28c3a34 100644 --- a/src/clj/auto_ap/jobs/ezcater_upsert.clj +++ b/src/clj/auto_ap/jobs/ezcater_upsert.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.ezcater-upsert - #_(:gen-class) + (:gen-class) (:require [auto-ap.jobs.core :refer [execute]] [auto-ap.ezcater.core :as ezcater])) diff --git a/src/clj/auto_ap/jobs/intuit.clj b/src/clj/auto_ap/jobs/intuit.clj index 0947a6be..787e1dfa 100644 --- a/src/clj/auto_ap/jobs/intuit.clj +++ b/src/clj/auto_ap/jobs/intuit.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.intuit - #_(:gen-class) + (:gen-class) (:require [auto-ap.import.intuit :as intuit] [auto-ap.jobs.core :refer [execute]])) diff --git a/src/clj/auto_ap/jobs/ledger_reconcile.clj b/src/clj/auto_ap/jobs/ledger_reconcile.clj index 81a0a363..76dcc2b7 100644 --- a/src/clj/auto_ap/jobs/ledger_reconcile.clj +++ b/src/clj/auto_ap/jobs/ledger_reconcile.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.ledger-reconcile - #_(:gen-class) + (:gen-class) (:require [auto-ap.jobs.core :refer [execute]] [auto-ap.ledger :as ledger])) diff --git a/src/clj/auto_ap/jobs/load_historical_sales.clj b/src/clj/auto_ap/jobs/load_historical_sales.clj index 6b035169..230a063c 100644 --- a/src/clj/auto_ap/jobs/load_historical_sales.clj +++ b/src/clj/auto_ap/jobs/load_historical_sales.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.load-historical-sales - #_(:gen-class) + (:gen-class) (:require [auto-ap.datomic :refer [conn]] [auto-ap.jobs.core :refer [execute]] diff --git a/src/clj/auto_ap/jobs/plaid.clj b/src/clj/auto_ap/jobs/plaid.clj index 99029233..ae552e59 100644 --- a/src/clj/auto_ap/jobs/plaid.clj +++ b/src/clj/auto_ap/jobs/plaid.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.plaid - #_(:gen-class) + (:gen-class) (:require [auto-ap.import.plaid :as plaid] [auto-ap.jobs.core :refer [execute]])) diff --git a/src/clj/auto_ap/jobs/register_invoice_import.clj b/src/clj/auto_ap/jobs/register_invoice_import.clj index 8979bf96..48862d59 100644 --- a/src/clj/auto_ap/jobs/register_invoice_import.clj +++ b/src/clj/auto_ap/jobs/register_invoice_import.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.register-invoice-import - #_(:gen-class) + (:gen-class) (:require [amazonica.aws.s3 :as s3] [auto-ap.datomic :refer [audit-transact conn pull-attr]] diff --git a/src/clj/auto_ap/jobs/square.clj b/src/clj/auto_ap/jobs/square.clj index 49f1d57f..db22c9b5 100644 --- a/src/clj/auto_ap/jobs/square.clj +++ b/src/clj/auto_ap/jobs/square.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.square - #_(:gen-class) + (:gen-class) (:require [auto-ap.jobs.core :refer [execute]] [auto-ap.square.core3 :as square3])) diff --git a/src/clj/auto_ap/jobs/vendor_usages.clj b/src/clj/auto_ap/jobs/vendor_usages.clj index 93e7eb9c..1dfe76da 100644 --- a/src/clj/auto_ap/jobs/vendor_usages.clj +++ b/src/clj/auto_ap/jobs/vendor_usages.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.vendor-usages - #_(:gen-class) + (:gen-class) (:require [auto-ap.datomic :refer [conn]] [auto-ap.jobs.core :refer [execute]] diff --git a/src/clj/auto_ap/jobs/yodlee2.clj b/src/clj/auto_ap/jobs/yodlee2.clj index 7c6a9f1e..aec0e65b 100644 --- a/src/clj/auto_ap/jobs/yodlee2.clj +++ b/src/clj/auto_ap/jobs/yodlee2.clj @@ -1,5 +1,5 @@ (ns auto-ap.jobs.yodlee2 - #_(:gen-class) + (:gen-class) (:require [auto-ap.import.yodlee2 :as yodlee2] [auto-ap.jobs.core :refer [execute]] diff --git a/src/clj/auto_ap/server.clj b/src/clj/auto_ap/server.clj index 8f19b565..0f53c817 100644 --- a/src/clj/auto_ap/server.clj +++ b/src/clj/auto_ap/server.clj @@ -1,5 +1,5 @@ (ns auto-ap.server - #_(:gen-class) + (:gen-class) (:require [auto-ap.handler :refer [app]] [auto-ap.jobs.restore-from-backup :as job-restore-from-backup] diff --git a/src/clj/user.fiddle b/src/clj/user.fiddle index 3d53fccf..aabb653b 100644 --- a/src/clj/user.fiddle +++ b/src/clj/user.fiddle @@ -63,9 +63,7 @@ (dc/since (dc/db conn) #inst "2023-02-01")) (map (fn [[a]] {:db/id a - :account/default-allowance :allowance/allowed}))) - - ) + :account/default-allowance :allowance/allowed})))) (dc/q '[:find (pull ?l [*]) @@ -89,7 +87,7 @@ ;; Find journal entries that have been divorced from the original entity -@(dc/transact auto-ap.datomic/conn +@(dc/transact auto-ap.datomic/conn (->> (dc/q '[:find ?l :in $ $$ $$$ @@ -105,7 +103,9 @@ (dc/history (dc/db conn))) (map (fn [[jl]] [:db/retractEntity jl])) - seq)) + seq) + + ) (entity-history 13194269907490) @@ -115,3 +115,15 @@ (dc/tx-range (dc/log conn) 13194269907490 13194269907490) +(dc/q '[:find ?l + :in $ $$ $$$ + :where [$$ ?l :journal-entry/amount] + (not [$ ?l :journal-entry/external-id]) + [$ ?l :journal-entry/source "invoice"] + (not [$ ?l :journal-entry/original-entity]) + [$ ?l :journal-entry/client ?c] + [$ ?c :client/code ?cd] + [$$$ ?l :journal-entry/original-entity _ ?tx false]] + (dc/db conn) + (dc/since (dc/db conn) #inst "2024-02-04") + (dc/history (dc/db conn))) diff --git a/src/cljs/auto_ap/views/main.cljs b/src/cljs/auto_ap/views/main.cljs index 8faaf7b3..5ff99762 100644 --- a/src/cljs/auto_ap/views/main.cljs +++ b/src/cljs/auto_ap/views/main.cljs @@ -91,10 +91,6 @@ (when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :ledger-page}) (balance-sheet-page))) -(defmethod page :admin-vendors [_] - (when (p/can? @(re-frame/subscribe [::subs/user]) {:subject :admin-page}) - (admin-vendors-page))) - (defmethod page :index [_] (home-page))