CMR-7719: Added handling of collection/granule without spatial info in STAC format

Author: ygliuvt

search-app/src/cmr/search/results_handlers/stac_results_handler.clj

@@ -7,6 +7,7 @@
    [cmr.common-app.services.search.elastic-results-to-query-results :as er-to-qr]
    [cmr.common-app.services.search.elastic-search-index :as elastic-search-index]
    [cmr.common-app.services.search.results-model :as r]
+   [cmr.common.services.errors :as svc-errors]
    [cmr.common.util :as util]
    [cmr.search.models.query :as q]
    [cmr.search.results-handlers.orbit-swath-results-helper :as orbit-swath-helper]
@@ -206,6 +207,11 @@
 (defmethod stac-reference->json :collection
   [context concept-type reference]
   (let [{:keys [id dataset-id summary start-date end-date shapes]} reference
+        bbox (ssrh/shapes->stac-bbox shapes)
+        _ (when-not bbox
+            (svc-errors/throw-service-error
+             :bad-request
+             (format "Collection [%s] without spatial info is not supported in STAC" id)))
         metadata-link (url/concept-xml-url context id)
         result {:id id
                 :stac_version STAC_VERSION
@@ -233,7 +239,7 @@
                 ;; Even though there will only be one value for bbox and interval,
                 ;; we still put them into array of arrays based on STAC specification:
                 ;; https://github.com/radiantearth/stac-spec/blob/master/collection-spec/collection-spec.md#spatial-extent-object
-                :extent {:spatial {:bbox [(ssrh/shapes->stac-bbox shapes)]}
+                :extent {:spatial {:bbox [bbox]}
                          :temporal {:interval [[start-date end-date]]}}}]
     ;; remove entries with nil value
     (util/remove-nil-keys result)))
@@ -246,12 +252,17 @@
                          ;; cloud-cover requires the eo extension
                          ["https://stac-extensions.github.io/eo/v1.0.0/schema.json"]
                          [])
+        geometry (ssrh/shapes->stac-geometry shapes)
+        _ (when-not geometry
+            (svc-errors/throw-service-error
+             :bad-request
+             (format "Granule [%s] without spatial info is not supported in STAC" id)))
         result {:type "Feature"
                 :id id
                 :stac_version STAC_VERSION
                 :stac_extensions stac-extension
                 :collection collection-concept-id
-                :geometry (ssrh/shapes->stac-geometry shapes)
+                :geometry geometry
                 :bbox (ssrh/shapes->stac-bbox shapes)
                 :links [{:rel "self"
                          :href (url/concept-stac-url context id)}

search-app/src/cmr/search/results_handlers/stac_spatial_results_handler.clj

@@ -135,7 +135,7 @@
 (defn shapes->stac-bbox
   "Returns the STAC bbox representation of the given shapes"
   [shapes]
-  (when shapes
+  (when (seq shapes)
     (let [mbrs (map shape->mbr shapes)
           mbr (if (> (count shapes) 1)
                 (reduce m/union mbrs)

system-int-test/test/cmr/system_int_test/search/granule_search_format_test.clj

@@ -971,3 +971,67 @@
         "retrieval by suffix"
         {:url-extension "stac"}
         "The URL extension [stac] is not supported."))))
+
+(deftest search-no-spatial-concept-stac
+  (let [coll1 (d/ingest "PROV1" (dc/collection {:entry-title "Dataset1"
+                                                :beginning-date-time "1970-01-01T12:00:00Z"}))
+        coll-concept-id (:concept-id coll1)
+        gran-spatial (dg/spatial (m/mbr 10 30 20 0))
+        gran1 (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule1"
+                                                   :beginning-date-time "2010-01-01T12:00:00.000Z"
+                                                   :ending-date-time "2010-01-11T12:00:00.000Z"
+                                                   :cloud-cover 10.0}))
+        gran-concept-id (:concept-id gran1)
+        expected-gran-err-msg (format "Granule [%s] without spatial info is not supported in STAC"
+                                      gran-concept-id)]
+
+    (index/wait-until-indexed)
+
+    (testing "granule search in STAC returns error when there is granule without spatial info"
+      (let [response (search/find-concepts-stac
+                      :granule
+                      {:collection-concept-id coll-concept-id})
+            ext-response (search/find-concepts-stac
+                          :granule
+                          {:collection-concept-id coll-concept-id}
+                          {:url-extension "stac"})]
+        (is (= 400
+               (:status response)
+               (:status ext-response)))
+        (is (= [expected-gran-err-msg]
+               (:errors response)
+               (:errors ext-response)))))
+
+    (testing "granule retrieval in STAC returns error when granule has no spatial info"
+      (util/are3 [options]
+        (let [{:keys [status errors]} (search/get-search-failure-data
+                                       (search/retrieve-concept
+                                        gran-concept-id
+                                        nil
+                                        (merge options {:throw-exceptions true})))]
+          (is (= 400 status))
+          (is (= [expected-gran-err-msg] errors)))
+
+        "retrieval by accept header"
+        {:accept "application/json; profile=stac-catalogue"}
+
+        "retrieval by suffix"
+        {:url-extension "stac"}))
+
+    (testing "collection retrieval in STAC returns error when collection has no spatial info"
+      (util/are3 [options]
+        (let [expected-err-msg (format "Collection [%s] without spatial info is not supported in STAC"
+                                       coll-concept-id)
+              {:keys [status errors]} (search/get-search-failure-data
+                                       (search/retrieve-concept
+                                        coll-concept-id
+                                        nil
+                                        (merge options {:throw-exceptions true})))]
+          (is (= 400 status))
+          (is (= [expected-err-msg] errors)))
+
+        "retrieval by accept header"
+        {:accept "application/json; profile=stac-catalogue"}
+
+        "retrieval by suffix"
+        {:url-extension "stac"}))))