Implemented more tests

Author: Padeanu

src/PRIP/config/Catalog/GETFileResponse.json

@@ -113,7 +113,7 @@
                 {
                     "Name": "coordinates",
                     "ValueType": "String",
-                    "Value": "-59.3169 2.6367,-63.105 -14.0539,-60.8506 -14.4245,-57.13092.3269,-59.3169 2.6367'"
+                    "Value": "-59.3169 2.6367,-63.105 -14.0539,-60.8506 -14.4245,-57.13092.3269,-59.3169 2.6367"
                 },
                 {
                     "Name": "orbitDirection",

src/PRIP/poetry.lock

@@ -47,6 +47,8 @@ def ready_live_status():
 # @token_required to be activated later
 @additional_options
 def query_products():
+    if "$filter" not in request.args:
+        return Response(status=HTTPStatus.OK, response=prepare_response_odata_v4(data), headers=request.args)
     odata_filter = request.args["$filter"]
     geo_products = []
     all_id_sets = []
@@ -56,20 +58,21 @@ def query_products():
         odata_filter = remove_intersects(request.args['$filter'])
         ids = {p['Id'] for p in geo_products}
         all_id_sets.append(ids)
-    # use lexer to parse request, split it into field: {op, value}
-    processed_filters = parse_odata_filter(odata_filter)
-    # XAND?
-    for filter_key, conditions in processed_filters.items():
-        for cond in (conditions if isinstance(conditions, list) else [conditions]):
-            products = process_products(
-                filter_key,
-                cond['op'],
-                cond['value']
-            )
-
-        # store only id of the result
-        ids = {p['Id'] for p in products}
-        all_id_sets.append(ids)
+    if odata_filter:
+        # use lexer to parse request, split it into field: {op, value}
+        processed_filters = parse_odata_filter(odata_filter)
+        # XAND?
+        for filter_key, conditions in processed_filters.items():
+            for cond in (conditions if isinstance(conditions, list) else [conditions]):
+                products = process_products(
+                    filter_key,
+                    cond['op'],
+                    cond['value']
+                )
+
+            # store only id of the result
+            ids = {p['Id'] for p in products}
+            all_id_sets.append(ids)
     # create set intersection, XAND, exclusive and beetween requests
     if not all_id_sets:
         common_ids = set()

src/PRIP/prip_station_mock.py

@@ -1,5 +1,5 @@
 [project]
-name = "rs-python"
+name = "rs-prip"
 authors = []
 dynamic = ["version"]
 
@@ -14,7 +14,8 @@ dependencies = [
     "dotenv == 0.9.9",
     "odata-query (>=0.10.0,<0.11.0)",
     "pytest (>=8.4.1,<9.0.0)",
-    "shapely (>=2.1.1,<3.0.0)"
+    "shapely (>=2.1.1,<3.0.0)",
+    "werkzeug (<3.0.0)"
     ]
 
 
@@ -33,3 +34,6 @@ dotenv = "^0.9.9"
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.pytest.ini_options]
+pythonpath = "."

src/PRIP/pyproject.toml

@@ -13,6 +13,7 @@ def prepare_response_odata_v4(resp_body: list | map) -> Any:
     :return: A JSON string representing the OData v4 response.
     :rtype: str
     """
+
     unpacked = list(resp_body) if not isinstance(resp_body, list) else resp_body
     try:
         data = json.dumps(dict(value=unpacked)) # if len(unpacked) > 1 else json.dumps(unpacked[0])

src/common/pagination.py

@@ -11,7 +11,6 @@
 from src.ADGS.adgs_station_mock import create_adgs_app
 from src.CADIP.cadip_station_mock import create_cadip_app
 from src.LTA.lta_station_mock import create_lta_app
-from src.PRIP.prip_station_mock import create_prip_app
 from src.common.common_routes import EMPTY_AUTH_CONFIG
 
 @pytest.fixture(name="empty_token_dict")
@@ -94,22 +93,6 @@ def adgs_client():
     # Deactivate the application context
     ctx.pop() 
 
-@pytest.fixture
-def prip_client():
-    """Docstring to be added."""
-    app = create_prip_app()
-    
-    # We create and activate an application context to keep the application running 
-    # during all requests of the current pytest
-    ctx = app.app_context()  
-    ctx.push() 
-    app.testing = True
-    with app.test_client() as client:
-        yield client
-    # Deactivate the application context
-    ctx.pop() 
-
-
 @pytest.fixture
 def lta_client():
     """LTA app comm."""