Merge branch 'develop' into gtc-3168/datamart-results-table

solomon-negusse · web-flow · commit d79b6e8ae9d2 · 2025-03-07T17:03:36.000+03:00
diff --git a/app/routes/datamart/land.py b/app/routes/datamart/land.py
@@ -42,7 +42,7 @@
 
 
 @router.get(
-    "/tree-cover-loss-by-driver",
+    "/tree_cover_loss_by_driver",
     response_class=ORJSONResponse,
     response_model=DataMartResourceLinkResponse,
     tags=["Land"],
@@ -62,19 +62,19 @@ async def tree_cover_loss_by_driver_search(
     dataset_version = DEFAULT_LAND_DATASET_VERSIONS | query_dataset_version
 
     resource_id = _get_resource_id(
-        "tree-cover-loss-by-driver", geostore_id, canopy_cover, dataset_version
+        "tree_cover_loss_by_driver", geostore_id, canopy_cover, dataset_version
     )
 
     # check if it exists
     await _get_resource(resource_id)
     link = DataMartResourceLink(
-        link=f"{API_URL}/v0/land/tree-cover-loss-by-driver/{resource_id}"
+        link=f"{API_URL}/v0/land/tree_cover_loss_by_driver/{resource_id}"
     )
     return DataMartResourceLinkResponse(data=link)
 
 
 @router.get(
-    "/tree-cover-loss-by-driver/{resource_id}",
+    "/tree_cover_loss_by_driver/{resource_id}",
     response_class=ORJSONResponse,
     response_model=TreeCoverLossByDriverResponse,
     tags=["Land"],
@@ -100,7 +100,7 @@ async def tree_cover_loss_by_driver_get(
 
 
 @router.post(
-    "/tree-cover-loss-by-driver",
+    "/tree_cover_loss_by_driver",
     response_class=ORJSONResponse,
     response_model=DataMartResourceLinkResponse,
     tags=["Land"],
@@ -130,7 +130,7 @@ async def tree_cover_loss_by_driver_post(
     # return 202 accepted
     dataset_version = DEFAULT_LAND_DATASET_VERSIONS | data.dataset_version
     resource_id = _get_resource_id(
-        "tree-cover-loss-by-driver",
+        "tree_cover_loss_by_driver",
         data.geostore_id,
         data.canopy_cover,
         dataset_version,
@@ -147,7 +147,7 @@ async def tree_cover_loss_by_driver_post(
     )
 
     link = DataMartResourceLink(
-        link=f"{API_URL}/v0/land/tree-cover-loss-by-driver/{resource_id}"
+        link=f"{API_URL}/v0/land/tree_cover_loss_by_driver/{resource_id}"
     )
     return DataMartResourceLinkResponse(data=link)
 
diff --git a/app/tasks/datamart/land.py b/app/tasks/datamart/land.py
@@ -41,7 +41,7 @@ async def compute_tree_cover_loss_by_driver(
 
         results = await _query_dataset_json(
             "umd_tree_cover_loss",
-            DEFAULT_LAND_DATASET_VERSIONS["umd_tree_cover_loss"],
+            dataset_version["umd_tree_cover_loss"],
             query,
             geostore,
             dataset_version,
diff --git a/tests_v2/unit/app/routes/datamart/test_land.py b/tests_v2/unit/app/routes/datamart/test_land.py
@@ -32,13 +32,13 @@ async def test_get_tree_cover_loss_by_drivers_not_found(
         params = {"x-api-key": api_key, "geostore_id": geostore, "canopy_cover": 30}
 
         response = await async_client.get(
-            "/v0/land/tree-cover-loss-by-driver", headers=headers, params=params
+            "/v0/land/tree_cover_loss_by_driver", headers=headers, params=params
         )
 
         assert response.status_code == 404
 
         resource_id = _get_resource_id(
-            "tree-cover-loss-by-driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
+            "tree_cover_loss_by_driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
         )
         mock_get_resources.assert_awaited_with(resource_id)
 
@@ -58,16 +58,16 @@ async def test_get_tree_cover_loss_by_drivers_found(
         headers = {"origin": origin}
         params = {"x-api-key": api_key, "geostore_id": geostore, "canopy_cover": 30}
         resource_id = _get_resource_id(
-            "tree-cover-loss-by-driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
+            "tree_cover_loss_by_driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
         )
 
         response = await async_client.get(
-            "/v0/land/tree-cover-loss-by-driver", headers=headers, params=params
+            "/v0/land/tree_cover_loss_by_driver", headers=headers, params=params
         )
 
         assert response.status_code == 200
         assert (
-            f"/v0/land/tree-cover-loss-by-driver/{resource_id}"
+            f"/v0/land/tree_cover_loss_by_driver/{resource_id}"
             in response.json()["data"]["link"]
         )
         mock_get_resources.assert_awaited_with(resource_id)
@@ -93,7 +93,7 @@ async def test_get_tree_cover_loss_by_drivers_with_overrides(
         headers = {"origin": origin}
         params = {"x-api-key": api_key, "geostore_id": geostore, "canopy_cover": 30}
         resource_id = _get_resource_id(
-            "tree-cover-loss-by-driver",
+            "tree_cover_loss_by_driver",
             geostore,
             30,
             {
@@ -104,14 +104,14 @@ async def test_get_tree_cover_loss_by_drivers_with_overrides(
         )
 
         response = await async_client.get(
-            "/v0/land/tree-cover-loss-by-driver?x-api-key={api_key}&geostore_id={geostore_id}&canopy_cover=30&dataset=umd_tree_cover_loss&version=v1.8&dataset=umd_tree_cover_density_2000&version=v1.6",
+            f"/v0/land/tree_cover_loss_by_driver?geostore_id={geostore}&canopy_cover=30&dataset=umd_tree_cover_loss&version=v1.8&dataset=umd_tree_cover_density_2000&version=v1.6",
             headers=headers,
             params=params,
         )
 
         assert response.status_code == 200
         mock_get_resource_id.assert_called_with(
-            "tree-cover-loss-by-driver",
+            "tree_cover_loss_by_driver",
             uuid.UUID(geostore),
             30,
             {
@@ -121,7 +121,7 @@ async def test_get_tree_cover_loss_by_drivers_with_overrides(
             },
         )
         assert (
-            f"/v0/land/tree-cover-loss-by-driver/{resource_id}"
+            f"/v0/land/tree_cover_loss_by_driver/{resource_id}"
             in response.json()["data"]["link"]
         )
         mock_get_resources.assert_awaited_with(resource_id)
@@ -137,7 +137,11 @@ async def test_post_tree_cover_loss_by_drivers(
     origin = payload["domains"][0]
 
     headers = {"origin": origin, "x-api-key": api_key}
-    payload = {"geostore_id": geostore, "canopy_cover": 30}
+    payload = {
+        "geostore_id": geostore,
+        "canopy_cover": 30,
+        "dataset_version": {"umd_tree_cover_loss": "v1.8"},
+    }
     with (
         patch(
             "app.routes.datamart.land._save_pending_resource"
@@ -147,13 +151,14 @@ async def test_post_tree_cover_loss_by_drivers(
         ) as mock_compute_result,
     ):
         response = await async_client.post(
-            "/v0/land/tree-cover-loss-by-driver", headers=headers, json=payload
+            "/v0/land/tree_cover_loss_by_driver", headers=headers, json=payload
         )
+
         assert response.status_code == 202
 
         body = response.json()
         assert body["status"] == "success"
-        assert "/v0/land/tree-cover-loss-by-driver/" in body["data"]["link"]
+        assert "/v0/land/tree_cover_loss_by_driver/" in body["data"]["link"]
 
         resource_id = body["data"]["link"].split("/")[-1]
         try:
@@ -166,7 +171,10 @@ async def test_post_tree_cover_loss_by_drivers(
             resource_id, "/v0/land/tree-cover-loss-by-driver", api_key
         )
         mock_compute_result.assert_awaited_with(
-            resource_id, uuid.UUID(geostore), 30, DEFAULT_LAND_DATASET_VERSIONS
+            resource_id,
+            uuid.UUID(geostore),
+            30,
+            DEFAULT_LAND_DATASET_VERSIONS | {"umd_tree_cover_loss": "v1.8"},
         )
 
 
@@ -185,10 +193,10 @@ async def test_get_tree_cover_loss_by_drivers_after_create_with_retry(
         "app.routes.datamart.land._get_resource", return_value={"status": "pending"}
     ):
         resource_id = _get_resource_id(
-            "tree-cover-loss-by-driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
+            "tree_cover_loss_by_driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
         )
         response = await async_client.get(
-            f"/v0/land/tree-cover-loss-by-driver/{resource_id}", headers=headers
+            f"/v0/land/tree_cover_loss_by_driver/{resource_id}", headers=headers
         )
 
         assert response.status_code == 200
@@ -210,10 +218,10 @@ async def test_get_tree_cover_loss_by_drivers_after_create_saved(
 
     with patch("app.routes.datamart.land._get_resource", return_value=TreeCoverLossByDriver(**MOCK_RESOURCE)):
         resource_id = _get_resource_id(
-            "tree-cover-loss-by-driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
+            "tree_cover_loss_by_driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
         )
         response = await async_client.get(
-            f"/v0/land/tree-cover-loss-by-driver/{resource_id}", headers=headers
+            f"/v0/land/tree_cover_loss_by_driver/{resource_id}", headers=headers
         )
 
         assert response.status_code == 200
@@ -232,20 +240,23 @@ async def test_compute_tree_cover_loss_by_driver(geostore):
         patch("app.crud.datamart.update_result") as mock_write_result,
     ):
         resource_id = _get_resource_id(
-            "tree-cover-loss-by-driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
+            "tree_cover_loss_by_driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
         )
         geostore_common = await get_geostore(geostore, GeostoreOrigin.rw)
 
         await compute_tree_cover_loss_by_driver(
-            resource_id, geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
+            resource_id,
+            geostore,
+            30,
+            DEFAULT_LAND_DATASET_VERSIONS | {"umd_tree_cover_loss": "v1.8"},
         )
 
         mock_query_dataset_json.assert_awaited_once_with(
             "umd_tree_cover_loss",
-            "v1.11",
+            "v1.8",
             "SELECT SUM(area__ha) FROM data WHERE umd_tree_cover_density_2000__threshold >= 30 GROUP BY tsc_tree_cover_loss_drivers__driver",
             geostore_common,
-            DEFAULT_LAND_DATASET_VERSIONS,
+            DEFAULT_LAND_DATASET_VERSIONS | {"umd_tree_cover_loss": "v1.8"},
         )
 
         MOCK_RESOURCE["metadata"]["geostore_id"] = geostore
@@ -264,7 +275,7 @@ async def test_compute_tree_cover_loss_by_driver_error(geostore):
         patch("app.crud.datamart.update_result") as mock_write_error,
     ):
         resource_id = _get_resource_id(
-            "tree-cover-loss-by-driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
+            "tree_cover_loss_by_driver", geostore, 30, DEFAULT_LAND_DATASET_VERSIONS
         )
         geostore_common = await get_geostore(geostore, GeostoreOrigin.rw)
 
@@ -332,7 +343,7 @@ async def test_compute_tree_cover_loss_by_driver_error(geostore):
         "geostore_id": "",
         "canopy_cover": 30,
         "sources": [
-            {"dataset": "umd_tree_cover_loss", "version": "v1.11"},
+            {"dataset": "umd_tree_cover_loss", "version": "v1.8"},
             {"dataset": "tsc_tree_cover_loss_drivers", "version": "v2023"},
             {"dataset": "umd_tree_cover_density_2000", "version": "v1.8"},
         ],
diff --git a/tests_v2/unit/app/routes/datasets/test_query.py b/tests_v2/unit/app/routes/datasets/test_query.py
