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

making clj-kondo happy

Browse Source
This commit is contained in:
Bryce Covert
2022-04-07 09:41:40 -07:00
parent d39c9b1f5b
commit 5d6bc3243c
3 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@
:refer
[context defroutes GET POST PUT routes wrap-routes]]
[config.core :refer [env]]
[clojure.edn :as edn]
[datomic.api :as d]
[ring.middleware.json :refer [wrap-json-response]]
[ring.util.request :refer [body-string]]
@@ -24,10 +25,7 @@
(csv/write-csv 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]
(let [{:keys [query-id]} params]
@@ -37,8 +35,8 @@
(let [query-string (str (slurp (:object-content (s3/get-object :bucket-name (:data-bucket env)
:key (str "queries/" (:query-id params))))))]
(log/info "Executing query " query-string)
(into (list) (apply d/q (clojure.edn/read-string query-string)
(into [(d/db conn)] (clojure.edn/read-string (get query-params "args" "[]")))))))))
(into (list) (apply d/q (edn/read-string query-string)
(into [(d/db conn)] (edn/read-string (get query-params "args" "[]")))))))))
(defn put-query [guid body note & [lookup-key client]]
@@ -73,7 +71,7 @@
(assert-admin identity)
(log/info "Note" (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)
(let [{:keys [query-id]} params
obj (s3/get-object :bucket-name (:data-bucket env)
@@ -87,10 +85,9 @@
:json-results-url (str "/api/queries/" query-id "/results/json")}}))
(GET "/" {:keys [query-params identity params]}
(GET "/" {:keys [identity]}
(assert-admin identity)
(let [{:keys [query-id]} params
obj (s3/list-objects :bucket-name (:data-bucket env)
(let [obj (s3/list-objects :bucket-name (:data-bucket env)
:prefix (str "queries/"))]
(log/info obj)
{:body (->> (:object-summaries obj)
@@ -98,14 +95,14 @@
{:last-modified (.toString (:last-modified o))
: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))}}]
{:body (execute-query query-params params)}))))
(def raw-routes
(context "/queries" []
(GET "/:query-id/raw" {:keys [query-params identity params]}
(GET "/:query-id/raw" {:keys [identity params]}
(assert-admin identity)
(let [{:keys [query-id]} params
obj (s3/get-object :bucket-name (:data-bucket env)
@@ -116,7 +113,7 @@
(def csv-routes
(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))}}]
{:body (execute-query query-params params)}))))
(defroutes query2-routes