From d5c9f9141155c298c0eda64afe60bebe3737056a Mon Sep 17 00:00:00 2001
From: Ricardo Garcia Silva <ricardo.garcia.silva@geobeyond.it>
Date: Tue, 23 Jul 2024 06:03:02 +0100
Subject: [PATCH] Fixed incorrect calls to renamed db function (#175)

* Fixed incorrect calls to renamed db function

* Fixed linting issues

---------

Co-authored-by: Ricardo Garcia Silva <ricardo@kartoza.com>
---
 arpav_ppcv/webapp/api_v2/routers/coverages.py | 12 ++++-----
 arpav_ppcv/webapp/api_v2/schemas/coverages.py |  4 +++
 tests/test_webapp_v2_routers_coverages.py     | 26 +++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 tests/test_webapp_v2_routers_coverages.py

diff --git a/arpav_ppcv/webapp/api_v2/routers/coverages.py b/arpav_ppcv/webapp/api_v2/routers/coverages.py
index 21bbda5e..18af4e05 100644
--- a/arpav_ppcv/webapp/api_v2/routers/coverages.py
+++ b/arpav_ppcv/webapp/api_v2/routers/coverages.py
@@ -172,8 +172,8 @@ def get_coverage_configuration(
     db_coverage_configuration = db.get_coverage_configuration(
         db_session, coverage_configuration_id
     )
-    allowed_coverage_identifiers = db.list_allowed_coverage_identifiers(
-        db_session, coverage_configuration_id=db_coverage_configuration.id
+    allowed_coverage_identifiers = db.generate_coverage_identifiers(
+        db_session, coverage_configuration=db_coverage_configuration
     )
     return coverage_schemas.CoverageConfigurationReadDetail.from_db_instance(
         db_coverage_configuration, allowed_coverage_identifiers, request
@@ -407,8 +407,8 @@ def get_climate_barometer_time_series(
             db_session, coverage_identifier
         )
     ) is not None:
-        allowed_cov_ids = db.list_allowed_coverage_identifiers(
-            db_session, coverage_configuration_id=db_cov_conf.id
+        allowed_cov_ids = db.generate_coverage_identifiers(
+            db_session, coverage_configuration=db_cov_conf
         )
         if coverage_identifier in allowed_cov_ids:
             coverage = CoverageInternal(
@@ -480,8 +480,8 @@ def get_time_series(
             db_session, coverage_identifier
         )
     ) is not None:
-        allowed_cov_ids = db.list_allowed_coverage_identifiers(
-            db_session, coverage_configuration_id=db_cov_conf.id
+        allowed_cov_ids = db.generate_coverage_identifiers(
+            db_session, coverage_configuration=db_cov_conf
         )
         if coverage_identifier in allowed_cov_ids:
             coverage = CoverageInternal(
diff --git a/arpav_ppcv/webapp/api_v2/schemas/coverages.py b/arpav_ppcv/webapp/api_v2/schemas/coverages.py
index 33536129..8b523661 100644
--- a/arpav_ppcv/webapp/api_v2/schemas/coverages.py
+++ b/arpav_ppcv/webapp/api_v2/schemas/coverages.py
@@ -138,9 +138,11 @@ def from_db_instance(
                     configuration_parameter_name=pv.configuration_parameter_value.configuration_parameter.name,
                     configuration_parameter_display_name_english=(
                         pv.configuration_parameter_value.configuration_parameter.display_name_english
+                        or pv.configuration_parameter_value.configuration_parameter.name
                     ),
                     configuration_parameter_display_name_italian=(
                         pv.configuration_parameter_value.configuration_parameter.display_name_italian
+                        or pv.configuration_parameter_value.configuration_parameter.name
                     ),
                     configuration_parameter_value=pv.configuration_parameter_value.name,
                 )
@@ -195,9 +197,11 @@ def from_db_instance(
                     configuration_parameter_name=pv.configuration_parameter_value.configuration_parameter.name,
                     configuration_parameter_display_name_english=(
                         pv.configuration_parameter_value.configuration_parameter.display_name_english
+                        or pv.configuration_parameter_value.configuration_parameter.name
                     ),
                     configuration_parameter_display_name_italian=(
                         pv.configuration_parameter_value.configuration_parameter.display_name_italian
+                        or pv.configuration_parameter_value.configuration_parameter.name
                     ),
                     configuration_parameter_value=pv.configuration_parameter_value.name,
                 )
diff --git a/tests/test_webapp_v2_routers_coverages.py b/tests/test_webapp_v2_routers_coverages.py
new file mode 100644
index 00000000..346c5c90
--- /dev/null
+++ b/tests/test_webapp_v2_routers_coverages.py
@@ -0,0 +1,26 @@
+import httpx
+
+from arpav_ppcv.schemas import coverages
+
+
+def test_coverage_configurations_list(
+    test_client_v2_app: httpx.Client,
+    sample_coverage_configurations: list[coverages.CoverageConfiguration],
+):
+    list_response = test_client_v2_app.get(
+        test_client_v2_app.app.url_path_for("list_coverage_configurations"),
+        headers={"accept": "application/json"},
+    )
+    assert list_response.status_code == 200
+    assert len(list_response.json()["items"]) == 10
+
+
+def test_coverage_identifiers_list(
+    test_client_v2_app: httpx.Client,
+    sample_coverage_configurations: list[coverages.CoverageConfiguration],
+):
+    list_response = test_client_v2_app.get(
+        test_client_v2_app.app.url_path_for("list_coverage_identifiers"),
+        headers={"accept": "application/json"},
+    )
+    assert list_response.status_code == 200