notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Simplifying exports.

Browse Source
This commit is contained in:
Bryce Covert
2022-01-05 11:25:22 -08:00
parent e3f6faefaa
commit fa2bffe167
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/clj/auto_ap/routes/exports.clj
View File

@@ -57,8 +57,8 @@
(context "/" [] (context "/" []
(GET "/invoices/export" {:keys [query-params identity] :as request} (GET "/invoices/export" {:keys [query-params identity] :as request}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.invoice.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.invoice.time") {:tags #{(client-tag query-params)}}] "export:invoice"}}]
(let [query [[:all_invoices (let [query [[:all_invoices
{:client-code (query-params "client-code") {:client-code (query-params "client-code")
:original-id (query-params "original")} :original-id (query-params "original")}
@@ -75,8 +75,8 @@
) )
(GET "/payments/export" {:keys [query-params identity]} (GET "/payments/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.payment.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.payment.time") {:tags #{(client-tag query-params)}}] "export:payment"}}]
(let [query [[:all_payments (let [query [[:all_payments
{:client-code (query-params "client-code") {:client-code (query-params "client-code")
:original-id (query-params "original")} :original-id (query-params "original")}
@@ -92,8 +92,8 @@
(GET "/sales/export" {:keys [query-params identity :as params]} (GET "/sales/export" {:keys [query-params identity :as params]}
(assert-admin identity) (assert-admin identity)
(println params) (println params)
(statsd/increment (str "export.sales.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.sales.time") {:tags #{(client-tag query-params)}}] "export:sales"}}]
(let [query [[:all_sales_orders (let [query [[:all_sales_orders
(cond-> {:client-code (query-params "client-code")} (cond-> {:client-code (query-params "client-code")}
(query-params "after") (assoc :date-range {:start (query-params "after") (query-params "after") (assoc :date-range {:start (query-params "after")
@@ -145,8 +145,8 @@
(GET "/expected-deposit/export" {:keys [query-params identity]} (GET "/expected-deposit/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.expected_deposit.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.expected_deposit.time") {:tags #{(client-tag query-params)}}] "export:deposit"}}]
(let [query [[:all_expected_deposits (let [query [[:all_expected_deposits
(cond-> {:client-code (query-params "client-code")} (cond-> {:client-code (query-params "client-code")}
(query-params "after") (assoc :date-range {:start (query-params "after") (query-params "after") (assoc :date-range {:start (query-params "after")
@@ -171,14 +171,13 @@
(GET "/vendors/export" {:keys [query-params identity]} (GET "/vendors/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.vendor.count" )) (statsd/time! [(str "export.time") {:tags #{"export:vendors"}}]
(statsd/time! [(str "export.vendor.time") {}]
(map <-graphql (d-vendors/get-graphql {})))) (map <-graphql (d-vendors/get-graphql {}))))
(GET "/ledger/export" {:keys [query-params identity]} (GET "/ledger/export" {:keys [query-params identity]}
(log/info "exporting for " (query-params "client-code")) (log/info "exporting for " (query-params "client-code"))
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.ledger.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.ledger.time") {:tags #{(client-tag query-params)}}] "export:ledger"}}]
(transduce (comp (transduce (comp
(map #(update % :journal-entry/date to-date)) (map #(update % :journal-entry/date to-date))
(map <-graphql)) (map <-graphql))
@@ -189,8 +188,8 @@
(GET "/accounts/export" {:keys [query-params identity]} (GET "/accounts/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.accounts.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.accounts.time") {:tags #{(client-tag query-params)}}] "export:accounts"}}]
(let [client-id (d-clients/code->id (query-params "client-code")) (let [client-id (d-clients/code->id (query-params "client-code"))
query [[:accounts query [[:accounts
[:id :numeric_code :type :applicability :location :name [:client_overrides [:name [:client [:id :code :name]]]]]]] [:id :numeric_code :type :applicability :location :name [:client_overrides [:name [:client [:id :code :name]]]]]]]
@@ -218,8 +217,8 @@
(GET "/transactions/export" {:keys [query-params identity]} (GET "/transactions/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.transactions.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.transactions.time") {:tags #{(client-tag query-params)}}] "export:transactions"}}]
(let [[transactions] (d-transactions/get-graphql {:client-code (query-params "client-code") (let [[transactions] (d-transactions/get-graphql {:client-code (query-params "client-code")
#_#_:original-id (Integer/parseInt (query-params "original")) #_#_:original-id (Integer/parseInt (query-params "original"))
:count Integer/MAX_VALUE})] :count Integer/MAX_VALUE})]
@@ -236,8 +235,8 @@
(GET "/transactions/export2" {:keys [query-params identity]} (GET "/transactions/export2" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.transactions2.count") {:tags #{(client-tag query-params)}}) (statsd/time! [(str "export.time") {:tags #{(client-tag query-params)
(statsd/time! [(str "export.transactions2.time") {:tags #{(client-tag query-params)}}] "export:transactions2"}}]
(let [db (d/db conn)] (let [db (d/db conn)]
(->> (->>
(d/query {:query {:find ['?e] (d/query {:query {:find ['?e]
@@ -265,9 +264,7 @@
(GET "/raw" {:keys [query-params identity]} (GET "/raw" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(log/info "Executing raw query " (get query-params "query" )) (log/info "Executing raw query " (get query-params "query" ))
(statsd/time! [(str "export.time") {:tags #{"export:raw"}}]
(statsd/increment (str "export.raw." (get query-params "query" ) ".count"))
(statsd/time! [(str "export.raw." (get query-params "query" ) ".time") {}]
(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" "[]"))))))))) (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" "[]")))))))))
(defroutes export-routes (defroutes export-routes
(routes (routes

2
src/clj/auto_ap/routes/queries.clj
View File

@@ -89,7 +89,6 @@
: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 identity params]}
(statsd/increment (str "export.query.count") {:tags #{(str "query:" (:query-id 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)}))))
@@ -108,7 +107,6 @@
(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 identity params]}
(statsd/increment (str "export.query.count") {:tags #{(str "query:" (:query-id 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