Fix faulty tests

Author: Padeanu

src/PRIP/prip_station_mock.py

@@ -69,7 +69,9 @@ def query_products():
                     cond['op'],
                     cond['value']
                 )
-
+                if not products:
+                    # If a search doesn't return products, then the whole search result is empty
+                    return Response(status=HTTPStatus.OK, response=json.dumps({"value": []}))
             # store only id of the result
             ids = {p['Id'] for p in products}
             all_id_sets.append(ids)
@@ -91,14 +93,16 @@ def query_products():
 def process_products(field, op, value) -> Response:
     # handle special case:
     match field:
-        case "Name":
+        case "Name" | "Online":
             match op.lower():
                 case "contains":
                     results = [product for product in data if value in product[field]]
                 case "startswith":
                     results = [product for product in data if product[field].startswith(value)]
                 case "endswith":
                     results = [product for product in data if product[field].endswith(value)]
+                case "eq":
+                    results = [product for product in data if str(product[field]).lower() == str(value).lower()]
                 case _:
                     return []
             return results

src/PRIP/tests/test_prip_station_mock.py

@@ -14,13 +14,13 @@
     ("/Products?$filter=endswith(Name, 'INVALID')&$expand=Attributes", None),
     ("/Products?$filter=startswith(Name, 'S1A_IW') and endswith(Name, 'SAFE.zip')&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=contains(Name, 'IW_RAW__0NSH') and endswith(Name, 'SAFE.zip')&$expand=Attributes", PRIP_PRODUCT),
-    #("/Products?$filter=startswith(Name, 'INVALID') and endswith(Name, 'SAFE.zip')&$expand=Attributes", None),
+    ("/Products?$filter=startswith(Name, 'INVALID') and endswith(Name, 'SAFE.zip')&$expand=Attributes", None),
     ("/Products?$filter=startswith(Name, 'S1A_IW') and endswith(Name, 'INVALID')&$expand=Attributes", None),
     ("/Products?$filter=EvictionDate eq 9999-12-31T23:59:59.999Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=ModificationDate eq 2022-06-26T06:30:34.558Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=OriginDate eq 2022-06-26T06:14:55.468Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=PublicationDate eq 2022-06-26T06:30:34.558Z&$expand=Attributes", PRIP_PRODUCT),
-    #("/Products?$filter=Online eq true&$expand=Attributes", PRIP_PRODUCT),
+    ("/Products?$filter=Online eq true&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=ContentDate/Start eq 2022-06-26T05:05:33.863Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=ContentDate/End eq 2022-06-26T05:10:38.849Z&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=OData.CSC.Intersects(area=geography'SRID=4326;POLYGON((-60 0,-62 -10,-58 -10,-56 0,-60 0))')&$expand=Attributes", PRIP_PRODUCT),
@@ -67,7 +67,6 @@
     ("/Products?$filter=contains(Name, 'IW_RAW__0NSH') and endswith(Name, 'SAFE.zip')&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=startswith(Name, 'S1A_IW') and ContentDate/End eq 2022-06-26T05:10:38.849Z and orbitDirection eq 'ASCENDING'&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=cycleNumber eq 265 and productType eq 'IW_RAW__0N' and orbitDirection eq 'ASCENDING'&$expand=Attributes", PRIP_PRODUCT),
-    #("/Products?$filter=orbitNumber eq 43829 and relativeOrbitNumber eq 43829&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=instrumentShortName eq 'SAR' and platformShortName eq 'SENTINEL-1' and platformSerialIdentifier eq 'A'&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productClass' and att/OData.CSC.StringAttribute/Value eq 'N') and Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq 'IW_RAW__0N')&$expand=Attributes", PRIP_PRODUCT),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq 'INVALID')&$expand=Attributes", None),
@@ -81,7 +80,7 @@
     ("/Products?$filter=startswith(Name, 'S1A_IW') and Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'datatakeID' and att/OData.CSC.StringAttribute/Value eq '000000')&$expand=Attributes", None),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'coordinates' and att/OData.CSC.StringAttribute/Value eq 'INVALID')&$expand=Attributes", None),
     ("/Products?$filter=orbitNumber eq 99999 and cycleNumber eq 999&$expand=Attributes", None),
-    #("/Products?$filter=originDate eq 2000-01-01T00:00:00.000Z&$expand=Attributes", None),
+    ("/Products?$filter=OriginDate eq 2000-01-01T00:00:00.000Z&$expand=Attributes", None),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'sliceProductFlag' and att/OData.CSC.StringAttribute/Value eq 'INVALID')&$expand=Attributes", None),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'instrumentConfigurationID' and att/OData.CSC.StringAttribute/Value eq '999')&$expand=Attributes", None),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'startTimeFromAscendingNode' and att/OData.CSC.StringAttribute/Value eq '9999999')&$expand=Attributes", None),
@@ -90,12 +89,10 @@
     ("/Products?$filter=startswith(Name, 'S1A_IW') and endswith(Name, 'INVALID')&$expand=Attributes", None),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq 'INVALID') and processingDate eq 2000-01-01T00:00:00.000Z&$expand=Attributes", None),
     ("/Products?$filter=OData.CSC.Intersects(area=geography'SRID=4326;POLYGON((-80 40,-82 30,-78 30,-76 40,-80 40))')&$expand=Attributes", None),
-    #("/Products?$filter=contains(Name, 'INVALID') and endswith(Name, 'SAFE.zip')&$expand=Attributes", None),
+    ("/Products?$filter=contains(Name, 'INVALID') and endswith(Name, 'SAFE.zip')&$expand=Attributes", None),
     ("/Products?$filter=orbitNumber eq 123 and productType eq 'INVALID' and platformSerialIdentifier eq 'Z'&$expand=Attributes", None),
     ("/Products?$filter=Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'orbitDirection' and att/OData.CSC.StringAttribute/Value eq 'INVALID') and Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productConsolidation' and att/OData.CSC.StringAttribute/Value eq 'INVALID')&$expand=Attributes", None),
     ("/Products?$filter=ContentDate/Start eq 2000-01-01T00:00:00.000Z&$expand=Attributes", None),
-
-
 ])
 def test_query_products(prip_client, url, response):
     assert prip_client.get(url).status_code == HTTPStatus.OK # Should return all products

src/common/odata_lexer.py

@@ -1,6 +1,6 @@
 from odata_query.grammar import ODataLexer, ODataParser
 from odata_query.visitor import NodeVisitor
-from odata_query.ast import *
+from odata_query.ast import String, DateTime, Boolean, Compare, Identifier, Attribute, BoolOp, Call, CollectionLambda
 
 
 class FilterExtractor(NodeVisitor):
@@ -21,7 +21,7 @@ def _get_attr_path(self, node):
         """
         Recursively constructs the full attribute path from AST nodes.
 
-        For example, given nodes representing ContentDate and Start, it returns 'ContentDate/Start'.
+        ContentDate['Start'] -> 'ContentDate/Start'.
 
         Args:
             node (Attribute | Identifier): The AST node representing an attribute or identifier.
@@ -53,7 +53,8 @@ def visit_Compare(self, node: Compare):
         """
         attr_path = self._get_attr_path(node.left)
         # Only handle comparisons where right side is a string or datetime literal
-        if isinstance(node.right, (String, DateTime)):
+
+        if isinstance(node.right, (String, DateTime, Boolean)):
             cond = {
                 "op": type(node.comparator).__name__,
                 "value": node.right.val
@@ -119,7 +120,7 @@ def visit_CollectionLambda(self, node: CollectionLambda):
         Visits collection lambda expressions (e.g. any() in OData).
 
         Specifically extracts key-value pairs from lambdas that compare 'Name' and 'Value' properties,
-        such as:
+
         any(att: att/Name eq 'productType' and att/Value eq 'MSI_L1C_TL')
 
         Args:
@@ -154,7 +155,6 @@ def extract_key_and_value(expr):
                 }
 
         else:
-            # For other lambda expressions, recurse into the expression
             self.visit(node.lambda_.expression)