Merge pull request #270 from asfadmin/master

Patch Release V7.0.3
asfadmin · Feb 1, 2024 · 94c4629 · 94c4629
2 parents 04f82e0 + 42d253b
commit 94c4629
Show file tree

Hide file tree

Showing 5 changed files with 452 additions and 202 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,15 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -
 
 -->
+------
+## [v7.0.3](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.2...v7.0.3)
+### Fixed
+- Fixes typo for constant variable name `constants.PRODUCT_TYPE.CSLC_STATIC`
+- Normalizes concept-id lists for `OPERA-S1` dataset product types
+
+### Changed
+- Completely removes `CSLC-STATIC` Calval and `RTC-STATIC` Calval collections from concept-id lists
+
 ------
 ## [v7.0.2](https://github.com/asfadmin/Discovery-asf_search/compare/v7.0.1...v7.0.2)
 ### Added

diff --git a/asf_search/CMR/datasets.py b/asf_search/CMR/datasets.py
@@ -331,6 +331,8 @@
 
 collections_per_platform = {
     "SENTINEL-1A": [
+        "C2803501758-ASF",
+        "C2803501097-ASF",
         "C1214470488-ASF",
         "C1214470533-ASF",
         "C1214470576-ASF",
@@ -376,12 +378,13 @@
         "C1260726384-ASF",
         "C1258354200-ASF",
         "C1259982010-ASF",
+        "C2795135668-ASF",
         "C1260721945-ASF",
         "C1257995185-ASF",
         "C1259976861-ASF",
-        "C1260726378-ASF",
         "C1258354201-ASF",
         "C1259981910-ASF",
+        "C2795135174-ASF",
         "C1260721853-ASF",
         "C1257995186-ASF",
         "C1259974840-ASF",
@@ -417,6 +420,8 @@
         "C1240784657-ASFDEV",
     ],
     "SENTINEL-1B": [
+        "C2803501758-ASF",
+        "C2803501097-ASF",
         "C1327985661-ASF",
         "C1327985645-ASF",
         "C1595422627-ASF",
@@ -462,12 +467,13 @@
         "C1260726384-ASF",
         "C1258354200-ASF",
         "C1259982010-ASF",
+        "C2795135668-ASF",
         "C1260721945-ASF",
         "C1257995185-ASF",
         "C1259976861-ASF",
-        "C1260726378-ASF",
         "C1258354201-ASF",
         "C1259981910-ASF",
+        "C2795135174-ASF",
         "C1260721853-ASF",
         "C1257995186-ASF",
         "C1259974840-ASF",
@@ -850,17 +856,13 @@
     "CSLC": [
         "C2777443834-ASF",
         "C1260721945-ASF",
-        "C1259976861-ASF",
-        "C2777443834-ASF",
-        "C1260721945-ASF",
+        "C2803501758-ASF",
         "C1259976861-ASF",
     ],
     "RTC": [
         "C2777436413-ASF",
         "C1260721853-ASF",
-        "C1259974840-ASF",
-        "C2777436413-ASF",
-        "C1260721853-ASF",
+        "C2803501097-ASF",
         "C1259974840-ASF",
     ],
     "GRD_FD": ["C1214471197-ASF", "C1212200781-ASF"],
@@ -869,9 +871,6 @@
         "C2709161906-ASF",
         "C1257024016-ASF",
         "C1257175154-ASFDEV",
-        "C2709161906-ASF",
-        "C1257024016-ASF",
-        "C1257175154-ASFDEV",
     ],
     "GUNW_AMP": [
         "C1596065640-ASF",
@@ -897,12 +896,13 @@
         "C1595765183-ASF",
         "C1225776659-ASF",
     ],
-    "CSLC-STATIC": ["C1259982010-ASF", "C1259982010-ASF"],
+    "CSLC-STATIC": [
+        "C1259982010-ASF", 
+        "C2795135668-ASF"
+    ],
     "RTC-STATIC": [
-        "C1260726378-ASF",
-        "C1259981910-ASF",
-        "C1260726378-ASF",
         "C1259981910-ASF",
+        "C2795135174-ASF"
     ],
     "GRD": [
         "C1661710583-ASF",

diff --git a/asf_search/constants/PRODUCT_TYPE.py b/asf_search/constants/PRODUCT_TYPE.py
@@ -99,4 +99,4 @@
 RTC = 'RTC'
 CSLC = 'CSLC'
 RTC_STATIC = 'RTC-STATIC'
-CSLS_STATIC = 'CSLC-STATIC'
+CSLC_STATIC = 'CSLC-STATIC'
diff --git a/tests/Search/test_search.py b/tests/Search/test_search.py
@@ -109,14 +109,17 @@ def run_test_dataset_search(datasets: List):
 def run_test_build_subqueries(params: ASFSearchOptions, expected: List):
     # mainly for getting platform aliases
     preprocess_opts(params)
-
     actual = build_subqueries(params)
     for a, b in zip(actual, expected):
         for key, actual_val in a:
             expected_val = getattr(b, key)
             if isinstance(actual_val, list):
                 if len(actual_val) > 0: # ASFSearchOptions leaves empty lists as None
-                    assert len(set(expected_val).difference(set(actual_val))) == 0
+                    expected_set = set(expected_val)
+                    actual_set = set(actual_val)
+
+                    difference = expected_set.symmetric_difference(actual_set)
+                    assert len(difference) == 0, f"Found {len(difference)} missing entries for subquery generated keyword: \"{key}\"\n{list(difference)}"
             else:
                 assert actual_val == expected_val