From 78a476f4b1a1f0e93b3ea8fa9473c5319843b40e Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 5 Apr 2023 14:49:09 -0700 Subject: [PATCH] (cloud) should make sales queries work again --- config/prod-cloud.edn | 2 +- resources/datomic/ion-config.edn | 8 ++++---- scratch-sessions/link_sales_queries.clj | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/prod-cloud.edn b/config/prod-cloud.edn index a1bfb18c..318d5c6d 100644 --- a/config/prod-cloud.edn +++ b/config/prod-cloud.edn @@ -11,7 +11,7 @@ :requests-queue-url "https://sqs.us-east-1.amazonaws.com/679918342773/integreat-background-request-prod-cloud" :invoice-email "invoices@mail.app.integreatconsult.com" :import-failure-destination-email "ben@integreatconsult.com" - :data-bucket "data.prod.app.integreatconsult.com" + :data-bucket "data.staging.app.integreatconsult.com" :yodlee-cobrand-name "qstartus12" :yodlee-cobrand-login "qstartus12" :yodlee-cobrand-password "MPD@mg78hd" diff --git a/resources/datomic/ion-config.edn b/resources/datomic/ion-config.edn index 6977d884..fba2a238 100644 --- a/resources/datomic/ion-config.edn +++ b/resources/datomic/ion-config.edn @@ -11,8 +11,8 @@ iol-ion.query/dollars-0? iol-ion.query/local-now - clj-time.coerce/to-date-time - clj-time.coerce/to-date - clj-time.core/minus - clj-time.core/days] + iol-ion.query/localize + iol-ion.query/recent-date + iol-ion.query/excel-date + ] :app-name "iol-cloud"} diff --git a/scratch-sessions/link_sales_queries.clj b/scratch-sessions/link_sales_queries.clj index 69c7a5b8..a9703d2c 100644 --- a/scratch-sessions/link_sales_queries.clj +++ b/scratch-sessions/link_sales_queries.clj @@ -1,6 +1,6 @@ (ns link-sales-queries - (:require [datomic.api :as d] + (:require [datomic.client.api :as dc] [auto-ap.datomic :refer [conn]] [auto-ap.routes.queries :refer [get-query]])) @@ -301,10 +301,10 @@ (def unattached-queries - (map first (d/q '[:find ?g + (map first (dc/q '[:find ?g :in $ [?g ...] :where (not [_ :saved-query/guid ?g])] - (d/db conn) + (dc/db conn) recently-used-query-ids))) @@ -353,9 +353,9 @@ :lookup-key lookup-key :query query :note note - :extant (:db/id (d/pull (d/db conn) '[:db/id] [:saved-query/lookup-key lookup-key])) - :extant-guid (:saved-query/guid (d/pull (d/db conn) '[:saved-query/guid] [:saved-query/lookup-key lookup-key])) - :extant-guid-used? (recently-used-query-ids (:saved-query/guid (d/pull (d/db conn) '[:saved-query/guid] [:saved-query/lookup-key lookup-key])))}))) + :extant (:db/id (dc/pull (dc/db conn) '[:db/id] [:saved-query/lookup-key lookup-key])) + :extant-guid (:saved-query/guid (dc/pull (dc/db conn) '[:saved-query/guid] [:saved-query/lookup-key lookup-key])) + :extant-guid-used? (recently-used-query-ids (:saved-query/guid (dc/pull (dc/db conn) '[:saved-query/guid] [:saved-query/lookup-key lookup-key])))}))) #_(filter (comp #{"NGEB"} :client-code))