Revamps all of the IOL's routing, so that the new history page can share with the rest.
This commit is contained in:
@@ -1,22 +1,21 @@
|
||||
(ns auto-ap.routes.queries
|
||||
(:require [amazonica.aws.s3 :as s3]
|
||||
[auto-ap.datomic :refer [conn]]
|
||||
[auto-ap.graphql.utils :refer [assert-admin]]
|
||||
[clojure.data.csv :as csv]
|
||||
[clojure.java.io :as io]
|
||||
[clojure.string :as str]
|
||||
[clojure.tools.logging :as log]
|
||||
[com.unbounce.dogstatsd.core :as statsd]
|
||||
[compojure.core
|
||||
: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]]
|
||||
[unilog.context :as lc])
|
||||
(:import java.util.UUID))
|
||||
(:require
|
||||
[amazonica.aws.s3 :as s3]
|
||||
[auto-ap.datomic :refer [conn]]
|
||||
[auto-ap.graphql.utils :refer [assert-admin]]
|
||||
[clojure.data.csv :as csv]
|
||||
[clojure.edn :as edn]
|
||||
[clojure.java.io :as io]
|
||||
[clojure.string :as str]
|
||||
[clojure.tools.logging :as log]
|
||||
[com.unbounce.dogstatsd.core :as statsd]
|
||||
[config.core :refer [env]]
|
||||
[datomic.api :as d]
|
||||
[ring.middleware.json :refer [wrap-json-response]]
|
||||
[ring.util.request :refer [body-string]]
|
||||
[unilog.context :as lc])
|
||||
(:import
|
||||
(java.util UUID)))
|
||||
|
||||
(defn wrap-csv-response [handler]
|
||||
(fn [request]
|
||||
@@ -62,64 +61,77 @@
|
||||
:csv-results-url (str "/api/queries/" guid "/results/csv")
|
||||
:json-results-url (str "/api/queries/" guid "/results/json")}}))
|
||||
|
||||
(def json-routes
|
||||
(context "/queries" []
|
||||
(POST "/" {:keys [query-params identity] :as request}
|
||||
(assert-admin identity)
|
||||
(log/info "Note" (query-params "note"))
|
||||
(put-query (str (UUID/randomUUID)) (body-string request) (query-params "note")))
|
||||
(PUT "/:query-id" {:keys [query-params identity params] :as request}
|
||||
(assert-admin identity)
|
||||
(log/info "Note" (query-params "note"))
|
||||
(put-query (:query-id params) (body-string request) (query-params "note")))
|
||||
(GET "/:query-id" {:keys [identity params]}
|
||||
(assert-admin identity)
|
||||
(let [{:keys [query-id]} params
|
||||
obj (s3/get-object :bucket-name (:data-bucket env)
|
||||
:key (str "queries/" query-id))
|
||||
query-string (str (slurp (:object-content obj)))]
|
||||
(log/info obj)
|
||||
{:body {:query query-string
|
||||
:note (:note (:user-metadata (:object-metadata obj)))
|
||||
:id query-id
|
||||
:csv-results-url (str "/api/queries/" query-id "/results/csv")
|
||||
:json-results-url (str "/api/queries/" query-id "/results/json")}}))
|
||||
|
||||
|
||||
(GET "/" {:keys [identity]}
|
||||
(assert-admin identity)
|
||||
(let [obj (s3/list-objects :bucket-name (:data-bucket env)
|
||||
:prefix (str "queries/"))]
|
||||
(log/info obj)
|
||||
{:body (->> (:object-summaries obj)
|
||||
(map (fn [o]
|
||||
{:last-modified (.toString (:last-modified o))
|
||||
:key (str/replace (:key o) #"^queries\/" "")})))}))
|
||||
|
||||
(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 [identity params]}
|
||||
(assert-admin identity)
|
||||
(let [{:keys [query-id]} params
|
||||
obj (s3/get-object :bucket-name (:data-bucket env)
|
||||
:key (str "queries/" query-id))
|
||||
query-string (str (slurp (:object-content obj)))]
|
||||
(log/info obj)
|
||||
{:body query-string}))))
|
||||
(defn get-queries [{:keys [identity]}]
|
||||
(assert-admin identity)
|
||||
(let [obj (s3/list-objects :bucket-name (:data-bucket env)
|
||||
:prefix (str "queries/"))]
|
||||
(log/info obj)
|
||||
{:body (->> (:object-summaries obj)
|
||||
(map (fn [o]
|
||||
{:last-modified (.toString (:last-modified o))
|
||||
:key (str/replace (:key o) #"^queries\/" "")})))}))
|
||||
|
||||
(defn create-query [{:keys [query-params identity] :as request}]
|
||||
(assert-admin identity)
|
||||
(log/info "Note" (query-params "note"))
|
||||
(put-query (str (UUID/randomUUID)) (body-string request) (query-params "note")))
|
||||
|
||||
(defn get-query [{:keys [identity params]} ]
|
||||
(assert-admin identity)
|
||||
(let [{:keys [query-id]} params
|
||||
obj (s3/get-object :bucket-name (:data-bucket env)
|
||||
:key (str "queries/" query-id))
|
||||
query-string (str (slurp (:object-content obj)))]
|
||||
(log/info obj)
|
||||
{:body {:query query-string
|
||||
:note (:note (:user-metadata (:object-metadata obj)))
|
||||
:id query-id
|
||||
:csv-results-url (str "/api/queries/" query-id "/results/csv")
|
||||
:json-results-url (str "/api/queries/" query-id "/results/json")}}))
|
||||
|
||||
(defn update-query [{:keys [query-params identity params] :as request} ]
|
||||
(assert-admin identity)
|
||||
(log/info "Note" (query-params "note"))
|
||||
(put-query (:query-id params) (body-string request) (query-params "note")))
|
||||
|
||||
(defn results-json-query [{:keys [query-params params]}]
|
||||
(statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
|
||||
{:body (execute-query query-params params)}))
|
||||
|
||||
(defn raw-query [{:keys [identity params]}]
|
||||
(assert-admin identity)
|
||||
(let [{:keys [query-id]} params
|
||||
obj (s3/get-object :bucket-name (:data-bucket env)
|
||||
:key (str "queries/" query-id))
|
||||
query-string (str (slurp (:object-content obj)))]
|
||||
(log/info obj)
|
||||
{:body query-string}))
|
||||
|
||||
(defn results-csv-query [{:keys [query-params params]}]
|
||||
(statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
|
||||
{:body (execute-query query-params params)}))
|
||||
|
||||
(def routes2 {"api/" {#"queries/?" {[:query-id "/raw"] {:get :raw-query}
|
||||
[:query-id "/results/csv"] {:get :results-csv-query}
|
||||
[:query-id "/results/json"] {:get :results-json-query}
|
||||
[:query-id] {:get :get-query
|
||||
:put :update-query}
|
||||
:get :get-queries
|
||||
:post :create-query}}})
|
||||
|
||||
(def match->handler {:get-queries get-queries
|
||||
:create-query create-query
|
||||
:raw-query raw-query
|
||||
:get-query (-> get-query
|
||||
wrap-json-response)
|
||||
:update-query (-> update-query
|
||||
wrap-json-response)
|
||||
|
||||
:results-json-query (-> results-json-query
|
||||
wrap-json-response)
|
||||
:results-csv-query (-> results-csv-query
|
||||
wrap-csv-response)})
|
||||
|
||||
|
||||
(def csv-routes
|
||||
(context "/queries" []
|
||||
(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
|
||||
(routes
|
||||
raw-routes
|
||||
(wrap-routes json-routes
|
||||
wrap-json-response)
|
||||
(wrap-routes csv-routes wrap-csv-response)))
|
||||
|
||||
Reference in New Issue
Block a user