Merge pull request #1019 from RS-PYTHON/fix/unnecessary-next-page-in-cadip-search

fix-unnecessary-next-page-in-cadip-search

Author: alinbutu

services/common/rs_server_common/stac_api_common.py

@@ -584,8 +584,8 @@ def read_query(query_arg: str | None):
             dict_data = self.process_files(dict_data)
 
         # Handle pagination links.
-        if len(dict_data["features"]) > 0:
-            # Don't create next page if the current one does not have features
+        if len(dict_data["features"]) == self.limit:
+            # Create next page if the current one reaches limit
             dict_data["next"] = f"page={self.page + 1}"
         if self.page > 1:
             dict_data["prev"] = f"page={self.page - 1}"

tests/conftest.py

@@ -554,6 +554,15 @@ def cadip_session_pickup_response():
         return json.loads(file.read())
 
 
+@pytest.fixture(name="cadip_session_response_10_items")
+@lru_cache(maxsize=1)
+def cadip_session_pickup_response_10_items():
+    """Fixture used to mock the response from CADIP data pickup-point."""
+    cadip_response_json = RESOURCES_FOLDER / "endpoints" / "cadip_session_pickup_response_10_items.json"
+    with open(cadip_response_json, encoding="utf-8") as file:
+        return json.loads(file.read())
+
+
 @pytest.fixture(name="cadip_file_response")
 @lru_cache(maxsize=1)
 def cadip_file_pickup_response():
@@ -579,3 +588,12 @@ def adgs_pickup_response():
     adgs_response_json = RESOURCES_FOLDER / "endpoints" / "adgs_pickup_response.json"
     with open(adgs_response_json, encoding="utf-8") as file:
         return json.loads(file.read())
+
+
+@pytest.fixture(name="adgs_response_10_items")
+@lru_cache(maxsize=1)
+def adgs_pickup_response_10_items():
+    """Fixture used to mock the response from ADGS data pickup-point."""
+    adgs_response_json = RESOURCES_FOLDER / "endpoints" / "adgs_pickup_response_10_items.json"
+    with open(adgs_response_json, encoding="utf-8") as file:
+        return json.loads(file.read())