Should make reloading AND aot work again

project.clj

@@ -119,7 +119,7 @@
 
   :profiles {
              :dev
-             {
+             {:main user
               :resource-paths ["resources" "target"]
               :dependencies [#_[binaryage/devteols "1.0.2"]
                              [postgresql/postgresql "9.3-1102.jdbc41"]
@@ -144,7 +144,7 @@
                              [com.bhauman/rebel-readline-cljs "0.1.4" :exclusions [org.clojure/clojurescript]]
                              [javax.servlet/servlet-api "2.5"]]
               :plugins      [[lein-pdo "0.1.1"]]
-              :jvm-opts ["-Dconfig=config/dev.edn" "-Xms4G" "-Xmx20G" "-XX:-OmitStackTraceInFastThrow" ]}
+              :jvm-opts ["-Dconfig=config/dev.edn" "-Xms4G" "-Xmx20G" "-XX:-OmitStackTraceInFastThrow"]}
 
              :uberjar
              {

src/clj/auto_ap/graphql/utils.clj

@@ -18,11 +18,11 @@
 
 (defn kebab [x]
   (if (qualified-keyword? x)
-    (keyword (snake->kebab (namespace x)) (snake->kebab (name x)) )
+    (keyword (snake->kebab (namespace x)) (snake->kebab (name x)))
     (keyword (snake->kebab (name x)))))
 
 (defn kebab->snake [s]
-  (str/replace (str/replace s #"-" "_") #"\?$" "" ))
+  (str/replace (str/replace s #"-" "_") #"\?$" ""))
 
 (defn snake [x]
   (keyword (kebab->snake (name x))))
@@ -164,8 +164,7 @@
                     (reduce
                      (fn [resolvers [resolver-key resolver-fn]]
                        (assoc resolvers
-                               resolver-key (trace-query resolver-key resolver-fn))
+                              resolver-key (trace-query resolver-key resolver-fn)))
-                        )
                      {}
                      m)))
 

src/clj/auto_ap/jobs/bulk_journal_import.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.bulk-journal-import
-  (:gen-class)
   (:require
    [amazonica.aws.s3 :as s3]
    [auto-ap.graphql.ledger :refer [import-ledger]]

src/clj/auto_ap/jobs/close_auto_invoices.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.close-auto-invoices
-  (:gen-class)
   (:require
    [auto-ap.datomic :refer [conn]]
    [auto-ap.jobs.core :refer [execute]]

src/clj/auto_ap/jobs/current_balance_cache.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.current-balance-cache
-  (:gen-class)
   (:require
    [auto-ap.graphql.clients :as clients]
    [auto-ap.jobs.core :refer [execute]]))

src/clj/auto_ap/jobs/ezcater_upsert.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.ezcater-upsert
-  (:gen-class)
   (:require
    [auto-ap.jobs.core :refer [execute]]
    [auto-ap.ezcater.core :as ezcater]))

src/clj/auto_ap/jobs/intuit.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.intuit
-  (:gen-class)
   (:require
    [auto-ap.import.intuit :as intuit]
    [auto-ap.jobs.core :refer [execute]]))

src/clj/auto_ap/jobs/ledger_reconcile.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.ledger-reconcile
-  (:gen-class)
   (:require
    [auto-ap.jobs.core :refer [execute]]
    [auto-ap.ledger :as ledger]))

src/clj/auto_ap/jobs/load_historical_sales.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.load-historical-sales
-  (:gen-class)
   (:require
    [auto-ap.datomic :refer [conn]]
    [auto-ap.jobs.core :refer [execute]]

src/clj/auto_ap/jobs/plaid.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.plaid
-  (:gen-class)
   (:require
    [auto-ap.import.plaid :as plaid]
    [auto-ap.jobs.core :refer [execute]]))

src/clj/auto_ap/jobs/register_invoice_import.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.register-invoice-import
-  (:gen-class)
   (:require
    [amazonica.aws.s3 :as s3]
    [auto-ap.datomic :refer [audit-transact conn pull-attr]]

src/clj/auto_ap/jobs/square.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.square
-  (:gen-class)
   (:require
    [auto-ap.jobs.core :refer [execute]]
    [auto-ap.square.core3 :as square3]))

src/clj/auto_ap/jobs/vendor_usages.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.vendor-usages
-  (:gen-class)
   (:require
    [auto-ap.datomic :refer [conn]]
    [auto-ap.jobs.core :refer [execute]]

src/clj/auto_ap/jobs/yodlee2.clj

@@ -1,5 +1,4 @@
 (ns auto-ap.jobs.yodlee2
-  (:gen-class)
   (:require
    [auto-ap.import.yodlee2 :as yodlee2]
    [auto-ap.jobs.core :refer [execute]]

src/clj/auto_ap/main.clj

@@ -1,107 +0,0 @@
-(ns auto-ap.main
-  (:gen-class)
-  (:require
-   [auto-ap.handler :refer [app]]
-   [auto-ap.server :as server]
-   [auto-ap.jobs.restore-from-backup :as job-restore-from-backup]
-   [auto-ap.jobs.bulk-journal-import :as job-bulk-journal-import]
-   [auto-ap.jobs.close-auto-invoices :as job-close-auto-invoices]
-   [auto-ap.jobs.current-balance-cache :as job-current-balance-cache]
-   [auto-ap.jobs.ezcater-upsert :as job-ezcater-upsert]
-   [auto-ap.jobs.import-uploaded-invoices :as job-import-uploaded-invoices]
-   [auto-ap.jobs.intuit :as job-intuit]
-   [auto-ap.jobs.ntg :as job-ntg]
-   #_[auto-ap.backup :as backup]
-   [auto-ap.jobs.ledger-reconcile :as job-reconcile-ledger]
-   [auto-ap.jobs.load-historical-sales :as job-load-historical-sales]
-   [auto-ap.jobs.plaid :as job-plaid]
-   [auto-ap.jobs.register-invoice-import :as job-register-invoice-import]
-   [auto-ap.jobs.square :as job-square]
-   [auto-ap.jobs.sysco :as job-sysco]
-   [auto-ap.jobs.vendor-usages :as job-vendor-usages]
-   [auto-ap.jobs.yodlee2 :as job-yodlee2]
-   [auto-ap.logging :as alog]
-   [com.unbounce.dogstatsd.core :as statsd]
-   [config.core :refer [env]]
-   [mount.core :as mount]
-   [nrepl.server :refer [start-server]]
-   [ring.adapter.jetty :refer [run-jetty]]
-   [yang.scheduler :as scheduler]
-   [auto-ap.jobs.insight-outcome-recommendation :as insight-outcome-recommendation])
-  (:import
-   (org.eclipse.jetty.server.handler StatisticsHandler)
-   (org.eclipse.jetty.server.handler.gzip GzipHandler)))
-
-(defn add-shutdown-hook! [^Runnable f]
-  (.addShutdownHook (Runtime/getRuntime)
-                    (Thread. f)))
-
-(defn shutdown-mount []
-  (mount/stop))
-
-(defn -main [& _]
-  (let [job (System/getenv "INTEGREAT_JOB")]
-    (println "JOB is" job)
-    (cond (= job "square-import-job")
-          (job-square/-main)
-
-          (= job "reconcile-ledger")
-          (job-reconcile-ledger/-main)
-
-          (= job "current-balance-cache")
-          (job-current-balance-cache/-main)
-
-          (= job "yodlee2")
-          (job-yodlee2/-main)
-
-          (= job "yodlee2-accounts")
-          (job-yodlee2/accounts-only)
-
-          (= job "plaid")
-          (job-plaid/-main)
-
-          (= job "intuit")
-          (job-intuit/-main)
-
-          (= job "vendor-usages")
-          (job-vendor-usages/-main)
-
-          (= job "import-uploaded-invoices")
-          (job-import-uploaded-invoices/-main)
-
-          (= job "sysco")
-          (job-sysco/-main)
-
-          (= job "close-auto-invoices")
-          (job-close-auto-invoices/-main)
-
-          (= job "ezcater-upsert")
-          (job-ezcater-upsert/-main)
-
-          (= job "register-invoice-import")
-          (job-register-invoice-import/-main)
-
-          (= job "load-historical-sales")
-          (job-load-historical-sales/-main)
-
-          (= job "bulk-journal-import")
-          (job-bulk-journal-import/-main)
-
-          (= job "restore-from-backup")
-          (job-restore-from-backup/-main)
-
-          (= job "insight-outcome-recommendation")
-          (insight-outcome-recommendation/-main)
-
-           ;; (= job "export-backup")
-           ;; (backup/-main)
-
-          (= job "ntg")
-          (job-ntg/-main)
-
-          :else
-          (do
-            (add-shutdown-hook! shutdown-mount)
-            (start-server :port 9000 :bind "0.0.0.0" #_#_:handler (cider-nrepl-handler))
-            (mount/start)
-            #_(alter-var-root #'nrepl.middleware.print/*print-fn* (constantly clojure.pprint/pprint))))))

src/clj/auto_ap/server.clj

@@ -31,6 +31,9 @@
    (org.eclipse.jetty.server.handler StatisticsHandler)
    (org.eclipse.jetty.server.handler.gzip GzipHandler)))
 
+(println "LOADING SERVER")
+
+
 (defn add-shutdown-hook! [^Runnable f]
   (.addShutdownHook (Runtime/getRuntime)
                     (Thread. f)))

src/clj/auto_ap/ssr/account.clj

@@ -40,7 +40,7 @@
     (assert-can-see-client id client-id))
   (let [num (some-> (re-find #"([0-9]+)" q)
                     second
-                    (not-empty )
+                    (not-empty)
                     Integer/parseInt)
 
         valid-allowances (cond-> #{:allowance/allowed

src/clj/auto_ap/ssr/admin/clients.clj

@@ -40,6 +40,7 @@
             [manifold.deferred :as de])
   (:import [java.util UUID]))
 
+
 ;; TODO make more reusable malli schemas, use unions if it would be helpful
 ;; TODO copy save logic from graphql version
 ;; TODO cash drawer shift
@@ -1416,8 +1417,7 @@
              (first step-key)))))
   (form-schema [_] form-schema-2)
   (submit [_ {:keys [multi-form-state request-method identity] :as request}]
-    (let [
+    (let [snapshot (mc/decode
-          snapshot (mc/decode
                     form-schema-2
                     (:snapshot multi-form-state)
                     mt/strip-extra-keys-transformer)

src/clj/user.clj

@@ -1,36 +1,30 @@
   (ns user
-  (:require
+  (:require [amazonica.aws.s3 :as s3]
-   [amazonica.aws.s3 :as s3]
-   [clojure.tools.namespace.repl :refer [set-refresh-dirs refresh]]
             [auto-ap.datomic :refer [conn pull-attr random-tempid]]
-   [auto-ap.ledger :as l]
+            [auto-ap.solr :as solr]
-   [clj-http.core :as http]
-   [clj-http.client :as client]
-   [figwheel.main.api]
-   [hawk.core]
-   [auto-ap.server]
             [auto-ap.time :as atime]
             [auto-ap.utils :refer [by]]
             [clj-time.coerce :as c]
             [clj-time.core :as t]
-   [clj-time.periodic :as per]
             [clojure.core.async :as async]
+            [auto-ap.handler :refer [app]]
+            [ring.adapter.jetty :refer [run-jetty]]
             [clojure.data.csv :as csv]
             [clojure.java.io :as io]
             [clojure.pprint]
             [clojure.string :as str]
-   [config.core :refer [env]]
+            [clojure.tools.namespace.repl :refer [refresh set-refresh-dirs]]
-   [datomic.api :as dc]
-   [mount.core :as mount]
-   [nrepl.middleware.print]
             [com.brunobonacci.mulog :as mu]
             [com.brunobonacci.mulog.buffer :as rb]
+            [config.core :refer [env]]
+            [datomic.api :as dc]
             [datomic.api :as d]
-   [puget.printer :as puget]
+            [figwheel.main.api]
-   [clojure.data.json :as json]
+            [hawk.core]
-   [auto-ap.solr :as solr])
+            [mount.core :as mount]
-  (:import
+            [nrepl.middleware.print])
-   (org.apache.commons.io.input BOMInputStream)))
+  (:import (org.apache.commons.io.input BOMInputStream)
+           [org.eclipse.jetty.server.handler.gzip GzipHandler]))
 
 
 (defn println-event [item]
@@ -307,11 +301,6 @@
        accounts)))
    vec))
 
-#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
-(defn go []
-  (require '[mount.core :as mount])
-  (require '[auto-ap.server])
-  (mount/start-without #'auto-ap.server/jetty))
 
 #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
 (defn entity-history [i]
@@ -367,12 +356,48 @@
   (hawk.core/watch! [{:paths ["src/"]
                       :handler auto-reset-handler}]))
 
+
+
+(defn gzip-handler []
+  (doto (GzipHandler.)
+    (.setIncludedMimeTypes (into-array ["text/css"
+                                        "text/plain"
+                                        "text/javascript"
+                                        "text/csv"
+                                        "text/html"
+                                        "text/html;charset=utf-8"
+                                        "application/javascript"
+                                        "application/csv"
+                                        "application/edn"
+                                        "application/json"
+                                        "image/svg+xml"]))
+    (.setMinGzipSize 1024)))
+
+(defn configure-jetty [server]
+  (let [ gzip-handler (gzip-handler)
+        default-handler (.getHandler server)]
+
+    (.setHandler gzip-handler default-handler)
+    (.setHandler server gzip-handler))
+  (.setStopAtShutdown server true))
+
+(mount/defstate port :start (Integer/parseInt (or (env :port) "3000")))
+
+(mount/defstate jetty
+  :start (run-jetty app {:port port
+                         :join? false
+                         :configurator configure-jetty
+                         :response-header-size 16384
+                         :request-header-size 16384})
+  :stop (.stop jetty))
 (defn start-http  []
-  (mount.core/start (mount.core/only #{#'auto-ap.server/port #'auto-ap.server/jetty})))
+  (mount.core/start (mount.core/only #{#'user/port #'user/jetty})))
 
 
 (defn start-dev []
   (set-refresh-dirs "src")
+  #_(clojure.tools.namespace.repl/disable-reload!  (find-ns  'auto-ap.server))
+  (clojure.tools.namespace.repl/disable-reload!  (find-ns  'auto-ap.time))
   (start-db)
   (start-http)
   (auto-reset))
@@ -386,8 +411,6 @@
   (mount.core/stop (mount.core/only #{#'auto-ap.datomic/conn}))
   (start-db))
 
-
-
 #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
 (defn spit-csv [columns data]
   (csv/write-csv *out*

src/clj/user.fiddle

@@ -1,4 +1,6 @@
-(defn setup-randy-queries  []
+(init-repl)
+(comment
+  (defn setup-randy-queries  []
     (import '[java.util UUID])
     (def my-id "a4345849-00a7-424e-b393-06257d3c1820")
 
@@ -24,7 +26,7 @@
      "One-off for randy"))
 
 
-(dc/q
+  (dc/q
    '[:find ?cd ?bal (count ?l)
      :where [?b :bank-account/locations ?bal]
      [?c :client/bank-accounts ?b]
@@ -33,28 +35,28 @@
    (dc/db conn))
 
 
-(init-repl)
+  (init-repl)
 
-(seq (dc/q
+  (seq (dc/q
         '[:find ?a ?n ?n2
           :where [?a :account/name ?n]
           [?a :account/numeric-code ?n2]
           (not [?a :account/code])]
         (dc/db conn)))
 
-(dc/q
+  (dc/q
    '[:find (pull ?a [* {:account/applicability [:db/ident] :account/default-allowance [*]}])
      :where [?a :account/numeric-code 34090]]
    (dc/db conn))
 
 
-(dc/q
+  (dc/q
    '[:find ?a
      :where [?a :account/numeric-code ?nc]
      (not [?a :account/default-allowance])]
    (dc/since (dc/db conn) #inst "2023-02-01"))
 
-@(dc/transact conn
+  @(dc/transact conn
                 (->>
                  (dc/q
                   '[:find ?a
@@ -66,19 +68,19 @@
                          :account/default-allowance :allowance/allowed}))))
 
 
-(dc/q '[:find (pull ?l [*])
+  (dc/q '[:find (pull ?l [*])
           :in $ ?a
           :where [?a :invoice/client]
           [?l :journal-entry/original-entity ?a]]
         (dc/db conn)
         17592316421929)
 
-(dc/pull (dc/db conn) '[*] 17592316421929)
+  (dc/pull (dc/db conn) '[*] 17592316421929)
 
-(entity-history 17592316421929)
+  (entity-history 17592316421929)
 
 
-(dc/q '[:find (pull ?l [*])
+  (dc/q '[:find (pull ?l [*])
           :in $ ?a
           :where [?a :invoice/client]
           [?l :journal-entry/original-entity ?a]]
@@ -87,7 +89,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 $ $$ $$$
@@ -103,19 +105,17 @@
                        (dc/history (dc/db conn)))
                  (map (fn [[jl]]
                         [:db/retractEntity jl]))
-               seq)
+                 seq))
-              
-              )
 
 
-(entity-history 13194269907490)
+  (entity-history 13194269907490)
 
-(user/tx-detail 13194269907766)
+  (user/tx-detail 13194269907766)
 
-(dc/tx-range  (dc/log conn)
+  (dc/tx-range  (dc/log conn)
                 13194269907490
                 13194269907490)
-(dc/q '[:find ?l
+  (dc/q '[:find ?l
           :in $ $$ $$$
           :where [$$ ?l :journal-entry/amount]
           (not [$ ?l :journal-entry/external-id])
@@ -127,3 +127,26 @@
         (dc/db conn)
         (dc/since (dc/db conn) #inst "2024-02-04")
         (dc/history (dc/db conn)))
+  
+(dc/transact conn (->> (dc/q '[:find ?v
+                               :in $
+                               :where [?v :vendor/plaid-merchant]
+                               (not [?v :vendor/name])
+                               [?t :transaction/vendor ?v]
+                               [?t :transaction/date ?d]]
+                             (dc/db conn))
+                       (mapv (fn [[i]]
+                               [:db/retractEntity i]))))
+
+
+@(dc/transact conn (->> (dc/q '[:find ?c
+                               :where [?c :client/name ?n]
+                               [(clojure.string/upper-case ?n) ?n2]
+                               [(clojure.string/includes? ?n2 "NICK")]]
+                             (dc/db conn))
+                       (map (fn [[c]]
+                              {:db/id c :client/groups ["NTG"]}))))
+  
+  
+  
+  )