Lots of fixes for cloud.

This commit is contained in:
2023-03-28 09:40:45 -07:00
parent 3a126e0b23
commit 5df4033ac0
6 changed files with 20 additions and 19 deletions

View File

@@ -1,8 +1,7 @@
(ns auto-ap.routes.queries
(:require
[amazonica.aws.s3 :as s3]
[auto-ap.datomic :refer [conn pull-attr]]
[iol-ion.tx :refer [upsert-entity]]
[auto-ap.datomic :refer [conn pull-attr pull-id]]
[auto-ap.graphql.utils :refer [assert-admin]]
[clojure.data.csv :as csv]
[clojure.edn :as edn]
@@ -12,7 +11,7 @@
[com.unbounce.dogstatsd.core :as statsd]
[config.core :refer [env]]
[datomic.client.api :as dc]
[iol-ion.tx :refer [random-tempid upsert-entity]]
[ring.middleware.json :refer [wrap-json-response]]
[ring.util.request :refer [body-string]]
[unilog.context :as lc])
@@ -41,11 +40,13 @@
(defn put-query [guid body note & [lookup-key client]]
(let [guid (if lookup-key
(let [id (pull-id (dc/db conn) [:saved-query/lookup-key lookup-key])
guid (if lookup-key
(or (pull-attr (dc/db conn) :saved-query/guid [:saved-query/lookup-key lookup-key])
guid)
guid)]
(dc/transact conn [`(upsert-entity ~{:saved-query/guid guid
(dc/transact conn [`(upsert-entity ~{:db/id (or id (random-tempid))
:saved-query/guid guid
:saved-query/description note
:saved-query/key (str "queries/" guid)
:saved-query/client client