move timestamp coercions to ops ns

yetanalytics · Jan 19, 2024 · c64ecea · c64ecea
1 parent eec03ed
commit c64ecea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/main/lrsql/admin/interceptors/reaction.clj b/src/main/lrsql/admin/interceptors/reaction.clj
@@ -108,18 +108,11 @@
    {:name ::get-all-reactions
     :enter
     (fn get-all-reactions [ctx]
-      (let [{lrs :com.yetanalytics/lrs} ctx
-            result
-            (adp/-get-all-reactions lrs)]
+      (let [{lrs :com.yetanalytics/lrs} ctx]
         (assoc ctx
                :response
-               {:status 200 :body {:reactions
-                                   (map
-                                    (fn [reaction-record]
-                                      (-> reaction-record
-                                          (update :created u/time->str)
-                                          (update :modified u/time->str)))
-                                    result)}})))}))
+               {:status 200
+                :body   {:reactions (adp/-get-all-reactions lrs)}})))}))
 
 (def update-reaction
   "Update an existing reaction."

diff --git a/src/main/lrsql/ops/query/reaction.clj b/src/main/lrsql/ops/query/reaction.clj
@@ -29,8 +29,8 @@
       :title    title
       :ruleset  (ru/stringify-template ruleset)
       :active   active
-      :created  created
-      :modified modified
+      :created  (u/time->str created)
+      :modified (u/time->str modified)
       :error    error})
    (bp/-query-all-reactions bk tx)))
 

diff --git a/src/main/lrsql/spec/reaction.clj b/src/main/lrsql/spec/reaction.clj
@@ -128,13 +128,16 @@
 (s/def :lrsql.spec.reaction.query-all-reactions/error
   (s/nilable ::error))
 
+(s/def :lrsql.spec.reaction.query-all-reactions/created ::xs/timestamp)
+(s/def :lrsql.spec.reaction.query-all-reactions/modified ::xs/timestamp)
+
 (def query-all-reactions-ret-spec
   (s/every (s/keys :req-un [::id
                             ::title
                             ::ruleset
                             ::active
-                            ::created
-                            ::modified
+                            :lrsql.spec.reaction.query-all-reactions/created
+                            :lrsql.spec.reaction.query-all-reactions/modified
                             :lrsql.spec.reaction.query-all-reactions/error])))
 
 (def query-statement-reactions-ret-element-spec