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

(cloud) tweaks for datomic cloud.

Browse Source
This commit is contained in:
Bryce Covert
2023-04-03 15:37:47 -07:00
parent 5293b7f3e6
commit a211a36c91
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/clj/auto_ap/graphql.clj
View File

@@ -620,13 +620,6 @@
(->graphql users))) (->graphql users)))
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
(defn categorize [x]
(cond (<= x 0) :due
(<= x 30 ) :due-30
(<= x 60 ) :due-60
:else :due-later))
(defn get-expense-account-stats [_ {:keys [client_id] } _] (defn get-expense-account-stats [_ {:keys [client_id] } _]
(let [result (cond-> {:query {:find ['?account '?account-name '(sum ?amount)] (let [result (cond-> {:query {:find ['?account '?account-name '(sum ?amount)]
@@ -663,7 +656,15 @@
'[?i :invoice/due ?date] '[?i :invoice/due ?date]
'[(.toInstant ^java.util.Date ?date) ?d2] '[(.toInstant ^java.util.Date ?date) ?d2]
'[(.between java.time.temporal.ChronoUnit/DAYS (java.time.Instant/now) ?d2 ) ?d3] '[(.between java.time.temporal.ChronoUnit/DAYS (java.time.Instant/now) ?d2 ) ?d3]
'[(auto-ap.graphql/categorize ?d3) ?name]]}}) '(or-join [?d3 ?name]
(and [(<= ?c 0)]
[(ground :due) ?name])
(and [(<= ?c 30)]
[(ground :due-30) ?name])
(and [(<= ?c 60)]
[(ground :due-30) ?name])
(and [(> ?c 60)]
[(ground :due-later) ?name]))]}})
true (dc/q)) true (dc/q))
result (group-by first result)] result (group-by first result)]

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

@@ -45,12 +45,12 @@
(or (pull-attr (dc/db conn) :saved-query/guid [:saved-query/lookup-key lookup-key]) (or (pull-attr (dc/db conn) :saved-query/guid [:saved-query/lookup-key lookup-key])
guid) guid)
guid)] guid)]
(dc/transact conn [`(upsert-entity ~{:db/id (or id (random-tempid)) (dc/transact conn {:tx-data [`(upsert-entity ~{:db/id (or id (random-tempid))
:saved-query/guid guid :saved-query/guid guid
:saved-query/description note :saved-query/description note
:saved-query/key (str "queries/" guid) :saved-query/key (str "queries/" guid)
:saved-query/client client :saved-query/client client
:saved-query/lookup-key lookup-key})]) :saved-query/lookup-key lookup-key})]})
(s3/put-object :bucket-name (:data-bucket env) (s3/put-object :bucket-name (:data-bucket env)
:key (str "queries/" guid) :key (str "queries/" guid)
:input-stream (io/make-input-stream (.getBytes body) {}) :input-stream (io/make-input-stream (.getBytes body) {})