CMR-7235 opendap append with umm-g (#1251)

* CMR-7235 fixed logic where umm-g opendap url could be dropped

* CMR-7235 updated tests for fixed behavior

Author: Jay Barra

ingest-app/src/cmr/ingest/services/granule_bulk_update/opendap/umm_g.clj

@@ -55,10 +55,9 @@
 
         _ (opendap-util/validate-append-no-conflicts opendap-urls url-map)
 
-        other-urls (remove is-opendap? related-urls)
         cloud-url (urls->updated-url :cloud opendap-urls url-map)
         on-prem-url (urls->updated-url :on-prem opendap-urls url-map)
-        updated-urls (conj other-urls cloud-url on-prem-url)]
+        updated-urls (conj related-urls cloud-url on-prem-url)]
     (remove nil? updated-urls)))
 
 (defn update-opendap-url

ingest-app/test/cmr/ingest/services/granule_bulk_update/opendap/umm_g_test.clj

@@ -158,29 +158,59 @@
       "non-matching RelatedUrls in metadata, on-prem url update"
       "http://example.com/foo"
       {:RelatedUrls [doc-related-url]}
-      {:RelatedUrls [{:URL "http://example.com/foo"
+      {:RelatedUrls [doc-related-url
+                     {:URL "http://example.com/foo"
                       :Type "USE SERVICE API"
-                      :Subtype "OPENDAP DATA"}
-                     doc-related-url]}
+                      :Subtype "OPENDAP DATA"}]}
 
       "non-matching RelatedUrls in metadata, cloud url update"
       "https://opendap.earthdata.nasa.gov/foo"
       {:RelatedUrls [doc-related-url]}
-      {:RelatedUrls [{:URL "https://opendap.earthdata.nasa.gov/foo"
+      {:RelatedUrls [doc-related-url
+                     {:URL "https://opendap.earthdata.nasa.gov/foo"
                       :Type "USE SERVICE API"
-                      :Subtype "OPENDAP DATA"}
-                     doc-related-url]}
+                      :Subtype "OPENDAP DATA"}]}
 
       "non-matching RelatedUrls in metadata, cloud url and on-prem url update"
       "http://example.com/foo, https://opendap.earthdata.nasa.gov/foo"
       {:RelatedUrls [doc-related-url]}
-      {:RelatedUrls [{:URL "http://example.com/foo"
-                      :Type "USE SERVICE API"
-                      :Subtype "OPENDAP DATA"}
+      {:RelatedUrls [doc-related-url
                      {:URL "https://opendap.earthdata.nasa.gov/foo"
                       :Type "USE SERVICE API"
                       :Subtype "OPENDAP DATA"}
-                     doc-related-url]}))
+                     {:URL "http://example.com/foo"
+                      :Type "USE SERVICE API"
+                      :Subtype "OPENDAP DATA"}]}
+
+      "existing cloud, appending on-prem"
+      "https://example.com/addr"
+      {:RelatedUrls
+       [{:URL "https://opendap.uat.earthdata.nasa.gov/to_be_updated"
+         :Type "GET DATA"
+         :Subtype "OPENDAP DATA"
+         :Description "cloud OPeNDAP Documentation"}]}
+      {:RelatedUrls
+       [{:URL "https://opendap.uat.earthdata.nasa.gov/to_be_updated"
+         :Type "GET DATA"
+         :Subtype "OPENDAP DATA"
+         :Description "cloud OPeNDAP Documentation"}
+        {:URL "https://example.com/addr"
+         :Type "USE SERVICE API"
+         :Subtype "OPENDAP DATA"}]}
+
+      "existing on-prem, appending cloud"
+      "https://opendap.uat.earthdata.nasa.gov/new"
+      {:RelatedUrls
+       [{:URL "https://example.com/addr"
+         :Type "GET DATA"
+         :Subtype "OPENDAP DATA"}]}
+      {:RelatedUrls
+       [{:URL "https://example.com/addr"
+         :Type "GET DATA"
+         :Subtype "OPENDAP DATA"}
+        {:URL "https://opendap.uat.earthdata.nasa.gov/new"
+         :Type "USE SERVICE API"
+         :Subtype "OPENDAP DATA"}]}))
 
   (testing "throws when appropriate"
     (are3 [url-value source]