Allow missing layers in arcgis lambda again, now we have tested lambd…

…a exception handling
GispoCoding · Nov 29, 2023 · 0e2c530 · 0e2c530
1 parent 79ee393
commit 0e2c530
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 32 deletions.
diff --git a/backend/lambda_functions/arcgis_loader/arcgis_loader.py b/backend/lambda_functions/arcgis_loader/arcgis_loader.py
@@ -172,13 +172,12 @@ def get_features(self) -> FeatureCollection:  # type: ignore[override]
                         for layer in layer_list
                         if layer["name"] == layer_name
                     ]
-                    # TODO: commented to cause exception in case of missing layers
-                    # if not layer_ids:
-                    #     LOGGER.warn(
-                    #         f"Layer {layer_name} not found in source. Skipping "
-                    #         "this layer."
-                    #     )
-                    #     continue
+                    if not layer_ids:
+                        LOGGER.warn(
+                            f"Layer {layer_name} not found in source. Skipping "
+                            "this layer."
+                        )
+                        continue
                     layer_id = layer_ids[0]
                     LOGGER.debug(f"Querying layer {layer_name}...")
                     r = requests.get(

diff --git a/backend/lambda_functions/base_loader/base_loader.py b/backend/lambda_functions/base_loader/base_loader.py
@@ -3,9 +3,6 @@
 import json
 import logging
 import os
-
-# import sys
-# import traceback
 from typing import Any, Dict, List, Optional, Type, TypedDict, Union
 
 import boto3

diff --git a/backend/test/test_services.py b/backend/test/test_services.py
@@ -184,25 +184,24 @@ def test_populate_wfs(populate_wfs_layers, main_db_params):
         conn.close()
 
 
-# TODO: disabled for testing
-# def test_populate_arcgis(populate_closest_data_to_arcgis_layers, main_db_params):
-#     conn = psycopg2.connect(**main_db_params)
-#     try:
-#         with conn.cursor() as cur:
-#             print(ArcGisLoader.TABLE_NAMES)
-#             for metadata_table, data_tables in ArcGisLoader.TABLE_NAMES.items():
-#                 for table_name in data_tables.values():
-#                     print(table_name)
-#                     cur.execute(f"SELECT count(*) FROM kooste.{table_name}")
-#                     count = cur.fetchone()[0]
-
-#                     # Temporarily disable layer size check, as long as
-#                     # SYKE arcrest API is unreliable
-#                     # assert count > 0
-
-#                     # Whenever arcgis parameters are slightly wrong, it just
-#                     # returns *all* the data. Way to design an API with such
-#                     # a baseload. Check that we don't get all 40 000 geometries
-#                     assert count < 1000
-#     finally:
-#         conn.close()
+def test_populate_arcgis(populate_closest_data_to_arcgis_layers, main_db_params):
+    conn = psycopg2.connect(**main_db_params)
+    try:
+        with conn.cursor() as cur:
+            print(ArcGisLoader.TABLE_NAMES)
+            for metadata_table, data_tables in ArcGisLoader.TABLE_NAMES.items():
+                for table_name in data_tables.values():
+                    print(table_name)
+                    cur.execute(f"SELECT count(*) FROM kooste.{table_name}")
+                    count = cur.fetchone()[0]
+
+                    # Temporarily disable layer size check, as long as
+                    # SYKE arcrest API is unreliable
+                    # assert count > 0
+
+                    # Whenever arcgis parameters are slightly wrong, it just
+                    # returns *all* the data. Way to design an API with such
+                    # a baseload. Check that we don't get all 40 000 geometries
+                    assert count < 1000
+    finally:
+        conn.close()