Move History DB into Util

src/blaze/handler/fhir/history/util.clj

@@ -7,6 +7,7 @@
     [clojure.spec.alpha :as s]
     [datomic.api :as d]
     [datomic-spec.core :as ds]
+    [manifold.deferred :as md]
     [reitit.core :as reitit])
   (:import
     [java.time Instant]
@@ -115,6 +116,16 @@
       (assoc :resource (pull/pull-resource* db type resource)))))
 
 
+(s/fdef db
+  :args (s/cat :conn ::ds/conn :t (s/nilable nat-int?))
+  :ret md/deferred?)
+
+(defn db [conn t]
+  (if t
+    (-> (d/sync conn t) (md/chain #(d/as-of % t)))
+    (d/db conn)))
+
+
 (s/fdef tx-db
   :args (s/cat :db ::ds/db :since-t (s/nilable nat-int?) :page-t (s/nilable nat-int?))
   :ret ::ds/db)

src/blaze/handler/fhir/history_instance.clj

@@ -78,16 +78,10 @@
        :fhir/issue "not-found"})))
 
 
-(defn- db [conn t]
-  (if t
-    (-> (d/sync conn t) (md/chain #(d/as-of % t)))
-    (d/db conn)))
-
-
 (defn- handler-intern [conn]
   (fn [{::reitit/keys [router match] :keys [query-params]
         {:keys [type id]} :path-params}]
-    (-> (db conn (fhir-util/t query-params))
+    (-> (history-util/db conn (fhir-util/t query-params))
         (md/chain' #(handle router match query-params % type id)))))
 
 

src/blaze/handler/fhir/history_system.clj

@@ -93,15 +93,9 @@
     (build-response router match query-params db since-t transactions)))
 
 
-(defn- db [conn t]
-  (if t
-    (-> (d/sync conn t) (md/chain #(d/as-of % t)))
-    (d/db conn)))
-
-
 (defn- handler-intern [conn]
   (fn [{::reitit/keys [router match] :keys [query-params]}]
-    (-> (db conn (fhir-util/t query-params))
+    (-> (history-util/db conn (fhir-util/t query-params))
         (md/chain' #(handle router match query-params %)))))
 
 

src/blaze/handler/fhir/history_type.clj

@@ -95,16 +95,10 @@
     (build-response router match query-params db since-t type transactions)))
 
 
-(defn- db [conn t]
-  (if t
-    (-> (d/sync conn t) (md/chain #(d/as-of % t)))
-    (d/db conn)))
-
-
 (defn- handler-intern [conn]
   (fn [{::reitit/keys [router match] :keys [query-params]
         {:keys [type]} :path-params}]
-    (-> (db conn (fhir-util/t query-params))
+    (-> (history-util/db conn (fhir-util/t query-params))
         (md/chain' #(handle router match query-params % type)))))
 
 

test/blaze/handler/fhir/history/test_util.clj

@@ -72,6 +72,18 @@
      #{`util/since-t}}))
 
 
+(defn stub-db [conn t-spec db]
+  (st/instrument
+    [`util/db]
+    {:spec
+     {`util/db
+      (s/fspec
+        :args (s/cat :conn #{conn} :t t-spec)
+        :ret #{db})}
+     :stub
+     #{`util/db}}))
+
+
 (defn stub-tx-db [db since-t-spec page-t-spec tx-db]
   (st/instrument
     [`util/tx-db]

test/blaze/handler/fhir/history_instance_test.clj

@@ -35,12 +35,14 @@
 
 (deftest handler-test-0
   (testing "Returns Not Found on Non-Existing Resource"
-    (datomic-test-util/stub-db ::conn ::db)
+    (fhir-test-util/stub-t ::query-params nil?)
+    (history-test-util/stub-db ::conn nil? ::db)
     (datomic-test-util/stub-resource ::db #{"Patient"} #{"0"} nil?)
 
     (let [{:keys [status body]}
           @((handler ::conn)
-            {:path-params {:type "Patient" :id "0"}})]
+            {:query-params ::query-params
+             :path-params {:type "Patient" :id "0"}})]
 
       (is (= 404 status))
 
@@ -55,7 +57,7 @@
   (testing "Returns History with one Patient"
     (let [patient {:instance/version ::foo}]
       (fhir-test-util/stub-t ::query-params nil?)
-      (datomic-test-util/stub-db ::conn ::db)
+      (history-test-util/stub-db ::conn nil? ::db)
       (datomic-test-util/stub-resource ::db #{"Patient"} #{"0"} #{{:db/id 0}})
       (history-test-util/stub-page-t ::query-params nil?)
       (history-test-util/stub-since-t ::db ::query-params nil?)

test/blaze/handler/fhir/history_system_test.clj

@@ -36,7 +36,7 @@
 (deftest handler-test-0
   (testing "Returns empty History"
     (fhir-test-util/stub-t ::query-params nil?)
-    (datomic-test-util/stub-db ::conn ::db)
+    (history-test-util/stub-db ::conn nil? ::db)
     (history-test-util/stub-page-t ::query-params nil?)
     (history-test-util/stub-since-t ::db ::query-params nil?)
     (history-test-util/stub-tx-db ::db nil? nil? ::db)
@@ -68,7 +68,7 @@
   (testing "Returns History with one Patient"
     (let [tx {:db/id ::tx-eid}]
       (fhir-test-util/stub-t ::query-params nil?)
-      (datomic-test-util/stub-db ::conn ::db)
+      (history-test-util/stub-db ::conn nil? ::db)
       (history-test-util/stub-page-t ::query-params nil?)
       (history-test-util/stub-since-t ::db ::query-params nil?)
       (history-test-util/stub-tx-db ::db nil? nil? ::db)
@@ -115,7 +115,7 @@
   (testing "Returns History with two Patients in one Transaction"
     (let [tx {:db/id ::tx-eid}]
       (fhir-test-util/stub-t ::query-params nil?)
-      (datomic-test-util/stub-db ::conn ::db)
+      (history-test-util/stub-db ::conn nil? ::db)
       (history-test-util/stub-page-t ::query-params nil?)
       (history-test-util/stub-since-t ::db ::query-params nil?)
       (history-test-util/stub-tx-db ::db nil? nil? ::db)
@@ -167,7 +167,7 @@
     (let [tx-1 {:db/id ::tx-1-eid}
           tx-2 {:db/id ::tx-2-eid}]
       (fhir-test-util/stub-t ::query-params nil?)
-      (datomic-test-util/stub-db ::conn ::db)
+      (history-test-util/stub-db ::conn nil? ::db)
       (history-test-util/stub-page-t ::query-params nil?)
       (history-test-util/stub-since-t ::db ::query-params nil?)
       (history-test-util/stub-tx-db ::db nil? nil? ::db)
@@ -221,7 +221,7 @@
   (testing "Returns History with next Link"
     (let [tx {:db/id ::tx-eid}]
       (fhir-test-util/stub-t ::query-params nil?)
-      (datomic-test-util/stub-db ::conn ::db)
+      (history-test-util/stub-db ::conn nil? ::db)
       (history-test-util/stub-page-t ::query-params nil?)
       (history-test-util/stub-since-t ::db ::query-params nil?)
       (history-test-util/stub-tx-db ::db nil? nil? ::db)

test/blaze/handler/fhir/history_type_test.clj

@@ -37,7 +37,7 @@
   (testing "Returns History with one Patient"
     (let [tx {:db/id ::tx-eid}]
       (fhir-test-util/stub-t ::query-params nil?)
-      (datomic-test-util/stub-db ::conn ::db)
+      (history-test-util/stub-db ::conn nil? ::db)
       (history-test-util/stub-page-t ::query-params nil?)
       (history-test-util/stub-since-t ::db ::query-params nil?)
       (history-test-util/stub-tx-db ::db nil? nil? ::db)