[Data] fix regulation flow for data.gouv

Author: claire2212

pipeline/src/flows/regulations_open_data.py

@@ -34,7 +34,6 @@ def get_regulations_for_csv(regulations: gpd.GeoDataFrame) -> pd.DataFrame:
 
     columns = [
         "id",
-        "ent_name",
         "url",
         "layer_name",
         "facade",
@@ -63,7 +62,6 @@ def get_regulations_for_geopackage(
 
     columns = [
         "id",
-        "ent_name",
         "url",
         "layer_name",
         "facade",

pipeline/src/queries/cross/cacem/regulations.sql

@@ -20,7 +20,6 @@ SELECT
   resume,
   md5(
         COALESCE(geom::text, '') ||
-        COALESCE(ent_name::text, '') ||
         COALESCE(url::text, '') ||
         COALESCE(layer_name::text, '') ||
         COALESCE(facade::text, '') ||
@@ -42,7 +41,7 @@ SELECT
 FROM prod."REG_ENV_V3"
 WHERE 
   geom IS NOT NULL
-  AND ent_name IS NOT NULL
+  AND resume IS NOT NULL
   AND layer_name IS NOT NULL
   AND thematique IS NOT NULL
   AND id IN :ids

pipeline/src/queries/cross/cacem/regulations_hashes.sql

@@ -23,6 +23,6 @@ SELECT
 FROM prod."REG_ENV_V3"
 WHERE 
   geom IS NOT NULL
-  AND ent_name IS NOT NULL
+  AND resume IS NOT NULL
   AND layer_name IS NOT NULL
   AND thematique IS NOT NULL

pipeline/src/queries/cross/cacem/regulations_open_data.sql

@@ -1,6 +1,5 @@
 SELECT 
     id,
-    ent_name,
     url,
     layer_name,
     facade,

pipeline/src/queries/cross/cacem/tags_regulatory_areas.sql

@@ -4,6 +4,6 @@ SELECT
 FROM prod.tags_regulatory_areas
 INNER JOIN prod."REG_ENV_V3" regulatory_areas ON regulatory_areas_id = regulatory_areas.id
 WHERE regulatory_areas.geom IS NOT NULL
-  AND regulatory_areas.ent_name IS NOT NULL
+  AND regulatory_areas.resume IS NOT NULL
   AND regulatory_areas.layer_name IS NOT NULL
 ORDER BY tags_id

pipeline/src/queries/cross/cacem/themes_regulatory_areas.sql

@@ -4,6 +4,6 @@ SELECT
 FROM prod.themes_regulatory_areas
 INNER JOIN prod."REG_ENV_V3" regulatory_areas ON regulatory_areas_id = regulatory_areas.id
 WHERE regulatory_areas.geom IS NOT NULL
-  AND regulatory_areas.ent_name IS NOT NULL
+  AND regulatory_areas.resume IS NOT NULL
   AND regulatory_areas.layer_name IS NOT NULL
 ORDER BY themes_id

pipeline/tests/test_data/cacem_database/V666.504__regulatory_areas_themes_and_tags.sql

@@ -5,7 +5,6 @@ CREATE TABLE IF NOT EXISTS prod."REG_ENV_V3"
 (
     id             serial primary key,
     geom           geometry(MultiPolygon, 4326),
-    ent_name       varchar,
     url            varchar,
     layer_name     varchar,
     facade         varchar,