Add Geo Distance to near Search Results

Signed-off-by: Jonas Wagner <jwagner@knoppiks.de>

Author: knoppiks

.github/scripts/search-location-near.sh

@@ -21,8 +21,15 @@ END
 location "Leipzig" "51.3397" "12.3731" | create "$base/Location" >/dev/null
 location "Jakarta" "-6.2" "106.8167" | create "$base/Location" >/dev/null
 
-search() {
-  curl -s -H "Content-Type: application/fhir+json" "$base/Location?near=$1&summary=count" | jq -r .total
-}
+response="$(curl -s -H "Content-Type: application/fhir+json" "$base/Location?near=43.77925|11.24626|900|km")"
+
+test "Location 900km from Florence finds Leipzig" "$(echo "$response" | jq -r .total)" "1"
 
-test "Location 900km from Florence finds Leipzig" "$(search "43.77925|11.24626|900|km")" "1"
+match_extension="$(echo "$response" | jq '.entry[0] | .search.extension[0]')"
+if echo "$match_extension" | jq -er '.valueDistance.unit == "m"' >/dev/null \
+  && echo "$match_extension" | jq -er '.url == "http://hl7.org/fhir/StructureDefinition/location-distance"' >/dev/null; then
+  echo "✅ the search result contains a location-distance extension"
+else
+  echo "🆘 the search does not contain a location-distance extension"
+  exit 1
+fi

modules/db-protocols/src/blaze/db/impl/protocols.clj

@@ -139,9 +139,13 @@
     [search-param batch-db compartment tid compiled-value]
     [search-param batch-db compartment tid compiled-value start-id]
     "Returns a reducible collection.")
-  (-matcher [_ batch-db modifier values])
+  (-matcher [_ batch-db modifier compiled-values])
   (-single-version-id-matcher [_ batch-db tid modifier compiled-values])
-  (-second-pass-filter [search-param batch-db values])
+  (-postprocess-matches
+    [search-param batch-db values compiled-values]
+    "Returns a transducer that will be applied on every matching resource-handle
+     at the end of the query execution. Can also be used to finally remove
+     unwanted matches.")
   (-compartment-ids [_ resolver resource])
   (-index-values [_ resolver resource])
   (-index-value-compiler [_]))

modules/db/java/blaze/db/impl/index/ResourceHandle.java

@@ -7,7 +7,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-public final class ResourceHandle implements ILookup, IKeywordLookup {
+public final class ResourceHandle implements ILookup, IKeywordLookup, IObj {
 
     public static final Comparator<ResourceHandle> ID_CMP = Comparator.comparing(rh -> rh.id);
 
@@ -85,14 +85,16 @@ public static Keyword op(long state) {
     private final long t;
     private final Hash hash;
     private final long state;
+    private final IPersistentMap meta;
 
-    public ResourceHandle(Keyword fhirType, int tid, String id, long t, Hash hash, long state) {
+    public ResourceHandle(Keyword fhirType, int tid, String id, long t, Hash hash, long state, IPersistentMap meta) {
         this.fhirType = requireNonNull(fhirType);
         this.tid = tid;
         this.id = requireNonNull(id);
         this.t = t;
         this.hash = requireNonNull(hash);
         this.state = state;
+        this.meta = meta;
     }
 
     @Override
@@ -124,6 +126,16 @@ public ILookupThunk getLookupThunk(Keyword key) {
         return null;
     }
 
+    @Override
+    public IObj withMeta(IPersistentMap meta) {
+        return new ResourceHandle(fhirType, tid, id, t, hash, state, meta);
+    }
+
+    @Override
+    public IPersistentMap meta() {
+        return meta;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

modules/db/src/blaze/db/impl/index.clj

@@ -125,11 +125,11 @@
      (let [ordered-index-handles #(ordered-index-handles* batch-db tid % start-id)]
        (intersection-index-handles (map ordered-index-handles clauses))))))
 
-(defn- second-pass-filter [batch-db clauses]
+(defn- postprocess-matches [batch-db clauses]
   (transduce
    (keep
-    (fn [[search-param _ values]]
-      (p/-second-pass-filter search-param batch-db values)))
+    (fn [[search-param _ values compiled-values]]
+      (p/-postprocess-matches search-param batch-db values compiled-values)))
    comp
    clauses))
 
@@ -203,7 +203,7 @@
 (defn- resource-handle-mapper*
   ([batch-db tid clauses]
    (comp (u/resource-handle-xf batch-db tid)
-         (second-pass-filter batch-db clauses)))
+         (postprocess-matches batch-db clauses)))
   ([batch-db tid clauses other-clauses]
    (comp (other-clauses-index-handle-filter batch-db tid other-clauses)
          (resource-handle-mapper* batch-db tid clauses))))

modules/db/src/blaze/db/impl/index/resource_handle.clj

@@ -47,7 +47,8 @@
        id
        t
        hash
-       state))))
+       state
+       nil))))
 
 (defn resource-handle?
   "Returns `true` if `x` is a resource handle."

modules/db/src/blaze/db/impl/search_param/chained.clj

@@ -157,7 +157,7 @@
         nil
         (single-version-id-targets batch-db tid single-version-id ref-c-hash ref-tid)))))
 
-  (-second-pass-filter [_ _ _]))
+  (-postprocess-matches [_ _ _ _]))
 
 (defn chained-search-param
   "Creates a new chaining search param from the following arguments:

modules/db/src/blaze/db/impl/search_param/composite/token_quantity.clj

@@ -82,7 +82,7 @@
     (spq/single-version-id-matcher batch-db tid c-hash prefix-length
                                    compiled-values))
 
-  (-second-pass-filter [_ _ _])
+  (-postprocess-matches [_ _ _ _])
 
   (-index-values [_ resolver resource]
     (when-ok [values (fhir-path/eval resolver main-expression resource)]

modules/db/src/blaze/db/impl/search_param/composite/token_token.clj

@@ -61,7 +61,7 @@
   (-matcher [_ batch-db _ compiled-values]
     (r-sp-v/value-prefix-filter (:snapshot batch-db) c-hash compiled-values))
 
-  (-second-pass-filter [_ _ _])
+  (-postprocess-matches [_ _ _ _])
 
   (-index-values [_ resolver resource]
     (when-ok [values (fhir-path/eval resolver main-expression resource)]

modules/db/src/blaze/db/impl/search_param/date.clj

@@ -445,7 +445,7 @@
   (-single-version-id-matcher [_ batch-db tid _ values]
     (single-version-id-matcher batch-db tid c-hash values))
 
-  (-second-pass-filter [_ _ _])
+  (-postprocess-matches [_ _ _ _])
 
   (-index-values [search-param resolver resource]
     (when-ok [values (fhir-path/eval resolver expression resource)]

modules/db/src/blaze/db/impl/search_param/has.clj

@@ -150,7 +150,7 @@
           (p/-matcher search-param batch-db modifier compiled-values)
           (map svi/from-resource-handle)))
 
-  (-second-pass-filter [_ _ _])
+  (-postprocess-matches [_ _ _ _])
 
   (-index-values [_ _ _]
     []))