STAC API: fix ids POST mode handling

Author: tomkralidis

pycsw/ogc/api/records.py

@@ -547,9 +547,11 @@ def items(self, headers_, json_post_data, args, collection='metadata:main'):
         query_parser = None
         sortby = None
         limit = None
+        ids = []
         bbox = []
         facets_requested = False
         collections = []
+        cql_ops_list = []
 
         if collection not in self.get_all_collections():
             msg = 'Invalid collection'
@@ -644,7 +646,6 @@ def items(self, headers_, json_post_data, args, collection='metadata:main'):
             query_parser = parse_ecql
 
         elif json_post_data is not None:
-
             if 'limit' in json_post_data:
                 limit = json_post_data.pop('limit')
             if 'sortby' in json_post_data:
@@ -653,23 +654,36 @@ def items(self, headers_, json_post_data, args, collection='metadata:main'):
                 collections = json_post_data.pop('collections')
             if 'bbox' in json_post_data:
                 bbox = json_post_data.pop('bbox')
+            if 'ids' in json_post_data:
+                ids = json_post_data.pop('ids')
             if not json_post_data:
                 LOGGER.debug('No CQL specified, only query parameters')
                 json_post_data = {}
+
             if not json_post_data and collections and collections != ['metadata:main']:
-                json_post_data = {'op': 'eq', 'args': [{'property': 'parentidentifier'}, collections[0]]}
-                if bbox:
-                    json_post_data = {
-                        'op': 'and',
-                        'args': [{
-                           'op': 's_intersects',
-                           'args': [
-                               {'property': 'geometry2'},
-                               {'bbox': [bbox]}
-                           ]},
-                           json_post_data
-                        ]
-                    }
+                cql_ops_list.append({'op': 'eq', 'args': [{'property': 'parentidentifier'}, collections[0]]})
+            if bbox:
+                cql_ops_list.append({
+                   'op': 's_intersects',
+                   'args': [
+                       {'property': 'geometry'},
+                       {'bbox': [bbox]}
+                   ]}
+                )
+
+            if ids:
+                cql_ops_list.append({
+                    'op': 'in',
+                    'args': [{'property': 'identifier'}, ids]
+                })
+
+            if len(cql_ops_list) > 1:
+                json_post_data = {
+                    'op': 'and',
+                    'args': cql_ops_list
+                }
+            elif len(cql_ops_list) == 1:
+                json_post_data = cql_ops_list[0]
 
             cql_query = json_post_data
             LOGGER.debug('Detected CQL JSON; ignoring all other query predicates')

tests/functionaltests/suites/stac_api/test_stac_api_functional.py

@@ -239,6 +239,17 @@ def test_items(config):
     assert content['numberReturned'] == 1
     assert content['numberMatched'] == 30
 
+    # test ids
+    ids = [
+        'S2B_MSIL2A_20190910T095029_N0213_R079_T33UXQ_20190910T124513.SAFE',
+        'S2B_MSIL2A_20190910T095029_N0213_R079_T33UXP_20190910T124513.SAFE'
+    ]
+    content = json.loads(api.items({}, {'ids': ids}, {})[2])
+
+    assert content['numberReturned'] == 2
+    assert content['numberMatched'] == 2
+
+
 def test_item(config):
     api = STACAPI(config)
     item = 'S2B_MSIL2A_20190910T095029_N0500_R079_T33TXN_20230430T083712.SAFE'