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

Improves IOL. Adds saved queries. Adds expected deposits in app.

Browse Source
This commit is contained in:
Bryce Covert
2021-06-04 10:50:27 -07:00
parent 311b07543c
commit 922c449bb0
15 changed files with 256 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,68 +51,82 @@
(into (list) (apply d/q (clojure.edn/read-string query-string)
(into [(d/db conn)] (clojure.edn/read-string (get query-params "args" "[]")))))))))
(def query-routes
(def json-routes
(context "/queries" []
(POST "/" {:keys [query-params identity] :as request}
(assert-admin identity)
(let [uuid (str (UUID/randomUUID))
body (body-string request)]
(s3/put-object :bucket-name (:data-bucket env)
:key (str "queries/" uuid)
:input-stream (io/make-input-stream (.getBytes body) {})
:metadata {:content-type "application/text"
:user-metadata {:note (query-params "note")}})
{:body {:query body
:id uuid
:results-url (str "/api/queries/" uuid "/results")
:csv-results-url (str "/api/queries/" uuid "/results/csv")
:json-results-url (str "/api/queries/" uuid "/results/json")}})
)
(PUT "/:query-id" {:keys [query-params identity params] :as request}
(assert-admin identity)
(log/info "Note" (query-params "note"))
(let [body (body-string request)]
(s3/put-object :bucket-name (:data-bucket env)
:key (str "queries/" (:query-id params))
:input-stream (io/make-input-stream (.getBytes body) {})
:metadata {:content-type "application/text"
:user-metadata {:note (query-params "note")}})
{:body {:query body
:id (:query-id params)
:csv-results-url (str "/api/queries/" (:query-id params) "/results/csv")
:json-results-url (str "/api/queries/" (:query-id params) "/results/json")}}))
(GET "/:query-id" {:keys [query-params 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 [query-params identity params]}
(assert-admin identity)
(let [{:keys [query-id]} params
obj (s3/list-objects :bucket-name (:data-bucket env)
:prefix (str "queries/"))]
(log/info obj)
{:body {}}))
(GET "/:query-id/results/json" {:keys [query-params identity params]}
{:body (execute-query query-params params)})
))
(def raw-routes
(context "/queries" []
(GET "/:query-id/raw" {:keys [query-params 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}))))
(def csv-routes
(context "/queries" []
(GET "/:query-id/results/csv" {:keys [query-params identity params]}
{:body (execute-query query-params params)})))
(defroutes query2-routes
(routes
(wrap-json-response (POST "/queries" {:keys [query-params identity] :as request}
(assert-admin identity)
(let [uuid (str (UUID/randomUUID))
body (body-string request)]
(s3/put-object :bucket-name (:data-bucket env)
:key (str "queries/" uuid)
:input-stream (io/make-input-stream (.getBytes body) {})
:metadata {:content-type "application/text"
:user-metadata {:note (query-params "note")}})
{:body {:query body
:id uuid
:results-url (str "/api/queries/" uuid "/results")
:csv-results-url (str "/api/queries/" uuid "/results/csv")
:json-results-url (str "/api/queries/" uuid "/results/json")}})
))
(wrap-json-response (PUT "/queries/:query-id" {:keys [query-params identity params] :as request}
(assert-admin identity)
(log/info "Note" (query-params "note"))
(let [body (body-string request)]
(s3/put-object :bucket-name (:data-bucket env)
:key (str "queries/" (:query-id params))
:input-stream (io/make-input-stream (.getBytes body) {})
:metadata {:content-type "application/text"
:user-metadata {:note (query-params "note")}})
{:body {:query body
:id (:query-id params)
:csv-results-url (str "/api/queries/" (:query-id params) "/results/csv")
:json-results-url (str "/api/queries/" (:query-id params) "/results/json")}})))
(wrap-json-response (GET "/queries/:query-id" {:keys [query-params 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 "/queries/:query-id/raw" {:keys [query-params 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}))
(wrap-json-response (GET "/queries/" {:keys [query-params identity params]}
(assert-admin identity)
(let [{:keys [query-id]} params
obj (s3/list-objects :bucket-name (:data-bucket env)
:prefix (str "queries/"))]
(log/info obj)
{:body {}})))
(wrap-json-response (GET "/queries/:query-id/results/json" {:keys [query-params identity params]}
{:body (execute-query query-params params)}))
(wrap-csv-response (GET "/queries/:query-id/results/csv" {:keys [query-params identity params]}
{:body (execute-query query-params params)}))
))
(wrap-routes json-routes
wrap-json-response)
(wrap-routes csv-routes wrap-csv-response)))