making clj-kondo happy
This commit is contained in:
@@ -10,7 +10,6 @@
|
|||||||
[datomic.api :as d]
|
[datomic.api :as d]
|
||||||
[mount.core :as mount]
|
[mount.core :as mount]
|
||||||
[unilog.context :as lc]
|
[unilog.context :as lc]
|
||||||
#_{:clj-kondo/ignore [:unused-namespace]}
|
|
||||||
[yang.scheduler :as scheduler]))
|
[yang.scheduler :as scheduler]))
|
||||||
|
|
||||||
(defn datums->impacted-entity [db [e changes]]
|
(defn datums->impacted-entity [db [e changes]]
|
||||||
@@ -44,7 +43,7 @@
|
|||||||
type))
|
type))
|
||||||
|
|
||||||
(defmethod entity-change->ledger :invoice
|
(defmethod entity-change->ledger :invoice
|
||||||
[db [type id]]
|
[db [_ id]]
|
||||||
(when id
|
(when id
|
||||||
(let [entity (d/pull db ['* {:invoice/vendor '[*]
|
(let [entity (d/pull db ['* {:invoice/vendor '[*]
|
||||||
:invoice/payment '[*]
|
:invoice/payment '[*]
|
||||||
@@ -83,7 +82,7 @@
|
|||||||
)})))))
|
)})))))
|
||||||
|
|
||||||
(defmethod entity-change->ledger :transaction
|
(defmethod entity-change->ledger :transaction
|
||||||
[db [type id]]
|
[db [_ id]]
|
||||||
(when id
|
(when id
|
||||||
(let [entity (d/pull db ['* {:transaction/vendor '[*]
|
(let [entity (d/pull db ['* {:transaction/vendor '[*]
|
||||||
:transaction/client '[*]
|
:transaction/client '[*]
|
||||||
@@ -91,7 +90,6 @@
|
|||||||
:transaction/bank-account '[* {:bank-account/type [:db/ident]}]
|
:transaction/bank-account '[* {:bank-account/type [:db/ident]}]
|
||||||
:transaction/accounts '[*
|
:transaction/accounts '[*
|
||||||
{:transaction-account/account [*]}] }] id)
|
{:transaction-account/account [*]}] }] id)
|
||||||
bank-account-type (-> entity :transaction/bank-account :bank-account/type :db/ident)
|
|
||||||
decreasing? (< (:transaction/amount entity) 0.0)
|
decreasing? (< (:transaction/amount entity) 0.0)
|
||||||
credit-from-bank? decreasing?
|
credit-from-bank? decreasing?
|
||||||
debit-from-bank? (not decreasing?)]
|
debit-from-bank? (not decreasing?)]
|
||||||
@@ -150,20 +148,14 @@
|
|||||||
:account :account/ccp}]}))
|
:account :account/ccp}]}))
|
||||||
|
|
||||||
(defmethod entity-change->ledger :invoice-expense-account
|
(defmethod entity-change->ledger :invoice-expense-account
|
||||||
[db [entity changes]]
|
[_ _]
|
||||||
nil
|
nil
|
||||||
)
|
)
|
||||||
|
|
||||||
(defmethod entity-change->ledger nil
|
(defmethod entity-change->ledger nil
|
||||||
[db [entity changes]]
|
[_ _]
|
||||||
nil)
|
nil)
|
||||||
|
|
||||||
(defn ledger-entries->transaction [entries]
|
|
||||||
(into [[:replace-general-ledger (:journal-entry/original-entity (first entries))]]
|
|
||||||
entries))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(mount/defstate tx-report-queue
|
(mount/defstate tx-report-queue
|
||||||
:start (d/tx-report-queue conn)
|
:start (d/tx-report-queue conn)
|
||||||
:stop (d/remove-tx-report-queue conn))
|
:stop (d/remove-tx-report-queue conn))
|
||||||
@@ -234,13 +226,9 @@
|
|||||||
(map first)
|
(map first)
|
||||||
(mapv #(entity-change->ledger (d/db conn) [:invoice %])))
|
(mapv #(entity-change->ledger (d/db conn) [:invoice %])))
|
||||||
repairs (vec (concat txes-missing-ledger-entries invoices-missing-ledger-entries))]
|
repairs (vec (concat txes-missing-ledger-entries invoices-missing-ledger-entries))]
|
||||||
|
|
||||||
|
|
||||||
(when (seq repairs)
|
(when (seq repairs)
|
||||||
(log/info (take 3 repairs))
|
(log/info (take 3 repairs))
|
||||||
(log/warn "repairing " (count txes-missing-ledger-entries) " missing transactions, " (count invoices-missing-ledger-entries) " missing invoices that were missing ledger entries")
|
(log/warn "repairing " (count txes-missing-ledger-entries) " missing transactions, " (count invoices-missing-ledger-entries) " missing invoices that were missing ledger entries")
|
||||||
|
|
||||||
|
|
||||||
@(d/transact conn repairs))
|
@(d/transact conn repairs))
|
||||||
(log/info "Finished reconciling ledger"))
|
(log/info "Finished reconciling ledger"))
|
||||||
(catch Exception e
|
(catch Exception e
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
:refer
|
:refer
|
||||||
[context defroutes GET POST PUT routes wrap-routes]]
|
[context defroutes GET POST PUT routes wrap-routes]]
|
||||||
[config.core :refer [env]]
|
[config.core :refer [env]]
|
||||||
|
[clojure.edn :as edn]
|
||||||
[datomic.api :as d]
|
[datomic.api :as d]
|
||||||
[ring.middleware.json :refer [wrap-json-response]]
|
[ring.middleware.json :refer [wrap-json-response]]
|
||||||
[ring.util.request :refer [body-string]]
|
[ring.util.request :refer [body-string]]
|
||||||
@@ -24,10 +25,7 @@
|
|||||||
(csv/write-csv w %)
|
(csv/write-csv w %)
|
||||||
(.toString w))))))
|
(.toString w))))))
|
||||||
|
|
||||||
#_(GET "/raw" {:keys [query-params identity]}
|
|
||||||
(assert-admin identity)
|
|
||||||
(log/info "Executing raw query " (get query-params "query" ))
|
|
||||||
(into (list) (apply d/q (clojure.edn/read-string (get query-params "query" )) (into [(d/db conn)] (clojure.edn/read-string (get query-params "args" "[]"))))))
|
|
||||||
|
|
||||||
(defn execute-query [query-params params]
|
(defn execute-query [query-params params]
|
||||||
(let [{:keys [query-id]} params]
|
(let [{:keys [query-id]} params]
|
||||||
@@ -37,8 +35,8 @@
|
|||||||
(let [query-string (str (slurp (:object-content (s3/get-object :bucket-name (:data-bucket env)
|
(let [query-string (str (slurp (:object-content (s3/get-object :bucket-name (:data-bucket env)
|
||||||
:key (str "queries/" (:query-id params))))))]
|
:key (str "queries/" (:query-id params))))))]
|
||||||
(log/info "Executing query " query-string)
|
(log/info "Executing query " query-string)
|
||||||
(into (list) (apply d/q (clojure.edn/read-string query-string)
|
(into (list) (apply d/q (edn/read-string query-string)
|
||||||
(into [(d/db conn)] (clojure.edn/read-string (get query-params "args" "[]")))))))))
|
(into [(d/db conn)] (edn/read-string (get query-params "args" "[]")))))))))
|
||||||
|
|
||||||
|
|
||||||
(defn put-query [guid body note & [lookup-key client]]
|
(defn put-query [guid body note & [lookup-key client]]
|
||||||
@@ -73,7 +71,7 @@
|
|||||||
(assert-admin identity)
|
(assert-admin identity)
|
||||||
(log/info "Note" (query-params "note"))
|
(log/info "Note" (query-params "note"))
|
||||||
(put-query (:query-id params) (body-string request) (query-params "note")))
|
(put-query (:query-id params) (body-string request) (query-params "note")))
|
||||||
(GET "/:query-id" {:keys [query-params identity params]}
|
(GET "/:query-id" {:keys [identity params]}
|
||||||
(assert-admin identity)
|
(assert-admin identity)
|
||||||
(let [{:keys [query-id]} params
|
(let [{:keys [query-id]} params
|
||||||
obj (s3/get-object :bucket-name (:data-bucket env)
|
obj (s3/get-object :bucket-name (:data-bucket env)
|
||||||
@@ -87,10 +85,9 @@
|
|||||||
:json-results-url (str "/api/queries/" query-id "/results/json")}}))
|
:json-results-url (str "/api/queries/" query-id "/results/json")}}))
|
||||||
|
|
||||||
|
|
||||||
(GET "/" {:keys [query-params identity params]}
|
(GET "/" {:keys [identity]}
|
||||||
(assert-admin identity)
|
(assert-admin identity)
|
||||||
(let [{:keys [query-id]} params
|
(let [obj (s3/list-objects :bucket-name (:data-bucket env)
|
||||||
obj (s3/list-objects :bucket-name (:data-bucket env)
|
|
||||||
:prefix (str "queries/"))]
|
:prefix (str "queries/"))]
|
||||||
(log/info obj)
|
(log/info obj)
|
||||||
{:body (->> (:object-summaries obj)
|
{:body (->> (:object-summaries obj)
|
||||||
@@ -98,14 +95,14 @@
|
|||||||
{:last-modified (.toString (:last-modified o))
|
{:last-modified (.toString (:last-modified o))
|
||||||
:key (str/replace (:key o) #"^queries\/" "")})))}))
|
:key (str/replace (:key o) #"^queries\/" "")})))}))
|
||||||
|
|
||||||
(GET "/:query-id/results/json" {:keys [query-params identity params]}
|
(GET "/:query-id/results/json" {:keys [query-params params]}
|
||||||
(statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
|
(statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
|
||||||
{:body (execute-query query-params params)}))))
|
{:body (execute-query query-params params)}))))
|
||||||
|
|
||||||
|
|
||||||
(def raw-routes
|
(def raw-routes
|
||||||
(context "/queries" []
|
(context "/queries" []
|
||||||
(GET "/:query-id/raw" {:keys [query-params identity params]}
|
(GET "/:query-id/raw" {:keys [identity params]}
|
||||||
(assert-admin identity)
|
(assert-admin identity)
|
||||||
(let [{:keys [query-id]} params
|
(let [{:keys [query-id]} params
|
||||||
obj (s3/get-object :bucket-name (:data-bucket env)
|
obj (s3/get-object :bucket-name (:data-bucket env)
|
||||||
@@ -116,7 +113,7 @@
|
|||||||
|
|
||||||
(def csv-routes
|
(def csv-routes
|
||||||
(context "/queries" []
|
(context "/queries" []
|
||||||
(GET "/:query-id/results/csv" {:keys [query-params identity params]}
|
(GET "/:query-id/results/csv" {:keys [query-params params]}
|
||||||
(statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
|
(statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
|
||||||
{:body (execute-query query-params params)}))))
|
{:body (execute-query query-params params)}))))
|
||||||
(defroutes query2-routes
|
(defroutes query2-routes
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
[auto-ap.utils :refer [by]]
|
[auto-ap.utils :refer [by]]
|
||||||
[auto-ap.time :as atime]
|
[auto-ap.time :as atime]
|
||||||
[clojure.core.async :as async]
|
[clojure.core.async :as async]
|
||||||
#_[auto-ap.ledger :as l]
|
|
||||||
[unilog.context :as lc]
|
[unilog.context :as lc]
|
||||||
[auto-ap.square.core :as square]
|
[auto-ap.square.core :as square]
|
||||||
[mount.core :as mount]
|
[mount.core :as mount]
|
||||||
@@ -17,8 +16,7 @@
|
|||||||
[clojure.string :as str]
|
[clojure.string :as str]
|
||||||
|
|
||||||
[amazonica.aws.s3 :as s3])
|
[amazonica.aws.s3 :as s3])
|
||||||
(:import [org.apache.commons.io.input BOMInputStream]
|
(:import [org.apache.commons.io.input BOMInputStream]))
|
||||||
java.util.UUID))
|
|
||||||
|
|
||||||
(defn mark-until-date [client end]
|
(defn mark-until-date [client end]
|
||||||
(let [conn (d/connect uri)]
|
(let [conn (d/connect uri)]
|
||||||
|
|||||||
Reference in New Issue
Block a user