Skip to content

[Zones réglementaires] Mise à jour du row hash pour enlever entity_name #2714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
claire2212 merged 4 commits into from
Jan 27, 2026
Merged

[Zones réglementaires] Mise à jour du row hash pour enlever entity_name #2714

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfea182
[RegulatoryAreas] update row hash
claire2212 Jan 27, 2026
ee11a40
[Test] fix test flow for regulations
claire2212 Jan 27, 2026
71c269a
[Data] fix migration
claire2212 Jan 27, 2026
ac13163
[Data] fix regulation flow for data.gouv
claire2212 Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions backend/src/main/resources/db/migration/internal/V0.207__update_regulations_row_hash.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
UPDATE public.regulations_cacem SET row_hash = md5(
COALESCE(geom::text, '') ||
COALESCE(url::text, '') ||
COALESCE(layer_name::text, '') ||
COALESCE(facade::text, '') ||
COALESCE(ref_reg::text, '') ||
COALESCE(editeur::text, '') ||
COALESCE(source::text, '') ||
COALESCE(obs::text, '') ||
COALESCE(thematique::text, '') ||
COALESCE(validite::text, '')||
COALESCE(tempo::text, '')||
COALESCE(type::text, '') ||
COALESCE(date::text, '') ||
COALESCE(date_fin::text, '') ||
COALESCE(edition::text, '') ||
COALESCE(plan::text, '') ||
COALESCE(poly_name::text, '') ||
COALESCE(resume::text, '')
);
3 changes: 0 additions & 3 deletions pipeline/src/flows/regulations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def update_regulatory_areas(new_regulatory_areas: pd.DataFrame):
"""CREATE TEMP TABLE tmp_regulations_cacem(
id serial,
geom public.geometry(MultiPolygon,4326),
entity_name character varying,
url character varying,
layer_name character varying,
facade character varying,
Expand All @@ -110,7 +109,6 @@ def update_regulatory_areas(new_regulatory_areas: pd.DataFrame):
columns_to_load = [
"id",
"geom",
"entity_name",
"url",
"layer_name",
"facade",
Expand Down Expand Up @@ -147,7 +145,6 @@ def update_regulatory_areas(new_regulatory_areas: pd.DataFrame):
text(
"""UPDATE regulations_cacem reg
SET geom = tmp.geom,
entity_name = tmp.entity_name,
url = tmp.url,
layer_name = tmp.layer_name,
facade = tmp.facade,
Expand Down
1 change: 0 additions & 1 deletion pipeline/src/queries/cross/cacem/regulations.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
SELECT
id,
st_multi(ST_SimplifyPreserveTopology(ST_CurveToLine(geom), 0.00001)) geom,
ent_name AS entity_name,
url,
layer_name,
facade,
Expand Down
4 changes: 2 additions & 2 deletions pipeline/tests/test_data/cacem_database/V666.504__regulatory_areas_themes_and_tags.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ CREATE TABLE prod.tags_regulatory_areas (
PRIMARY KEY (tags_id, regulatory_areas_id)
);

insert into prod."REG_ENV_V3" (id, geom, ent_name, url, layer_name, facade, ref_reg, edition, editeur, source, obs, thematique, date, validite, date_fin, tempo, type, resume, poly_name, plan) values (1, 'MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)))', 'entity_name1', 'url1', 'layer_name1', 'MED', 'ref_reg1', '2025-01-01', 'editrice1', 'source1', 'observation1', 'thematique1', '2010-06-01', '10 ans', '2024-01-01', 'temporaire', 'Décret', 'resume1', 'polyname1', 'plan1');
insert into prod."REG_ENV_V3" (id, geom, ent_name, url, layer_name, facade, ref_reg, edition, editeur, source, obs, thematique, date, validite, date_fin, tempo, type, resume, poly_name, plan) values (2, 'MULTIPOLYGON(((120 -20,135 -20,135 -10,120 -10,120 -20)))', 'entity_name2', 'url2', 'layer_name2', 'NAMO', 'ref_reg2', '2025-01-01', 'editeur2', 'source2', 'observation2', 'thematique2', '2005-07-01', '20 ans', '2025-01-01', 'permanent', 'Arrêté préfectoral', 'resume2', 'polyname2', 'plan2');
insert into prod."REG_ENV_V3" (id, geom, url, layer_name, facade, ref_reg, edition, editeur, source, obs, thematique, date, validite, date_fin, tempo, type, resume, poly_name, plan) values (1, 'MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)))', 'url1', 'layer_name1', 'MED', 'ref_reg1', '2025-01-01', 'editrice1', 'source1', 'observation1', 'thematique1', '2010-06-01', '10 ans', '2024-01-01', 'temporaire', 'Décret', 'resume1', 'polyname1', 'plan1');
insert into prod."REG_ENV_V3" (id, geom, url, layer_name, facade, ref_reg, edition, editeur, source, obs, thematique, date, validite, date_fin, tempo, type, resume, poly_name, plan) values (2, 'MULTIPOLYGON(((120 -20,135 -20,135 -10,120 -10,120 -20)))', 'url2', 'layer_name2', 'NAMO', 'ref_reg2', '2025-01-01', 'editeur2', 'source2', 'observation2', 'thematique2', '2005-07-01', '20 ans', '2025-01-01', 'permanent', 'Arrêté préfectoral', 'resume2', 'polyname2', 'plan2');
4 changes: 2 additions & 2 deletions pipeline/tests/test_data/remote_database/V666.28__Reset_test_regulatory_areas.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ DELETE FROM dashboard_datas;

DELETE FROM regulations_cacem;

insert into public.regulations_cacem (id, geom, entity_name, url, layer_name, facade, ref_reg, edition, editeur, source, observation, thematique, date, duree_validite, date_fin, temporalite, type, plan, poly_name, resume, row_hash) values (1, 'MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)))', 'entity_name1', 'url1', 'layer_name1', 'MED', 'ref_reg1', '2025-01-01', 'editrice1', 'source1', 'observation1', 'thematique1', '2010-06-01', '10 ans', '2024-01-01', 'temporaire', 'Décret', 'PIRC', 'poly_name1', 'resume1', '4ccc708e6a0c4f311dd7e537e282f7f6');
insert into public.regulations_cacem (id, geom, entity_name, url, layer_name, facade, ref_reg, edition, editeur, source, observation, thematique, date, duree_validite, date_fin, temporalite, type, plan, poly_name, resume, row_hash) values (2, 'MULTIPOLYGON(((120 -20,135 -20,135 -10,120 -10,120 -20)))', 'entity_name2', 'url2', 'layer_name2', 'NAMO', 'ref_reg2', '2025-01-01', 'editeur2', 'source2', 'observation2', 'thematique2', '2005-07-01', '20 ans', '2025-01-01', 'permanent', 'Arrêté préfectoral', 'PSCEM', 'poly_name2', 'resume2', '8c3842144dfaf46ead39bfa628dd9513');
insert into public.regulations_cacem (id, geom, url, layer_name, facade, ref_reg, edition, editeur, source, observation, thematique, date, duree_validite, date_fin, temporalite, type, plan, poly_name, resume, row_hash) values (1, 'MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)))', 'url1', 'layer_name1', 'MED', 'ref_reg1', '2025-01-01', 'editrice1', 'source1', 'observation1', 'thematique1', '2010-06-01', '10 ans', '2024-01-01', 'temporaire', 'Décret', 'PIRC', 'poly_name1', 'resume1', '4ccc708e6a0c4f311dd7e537e282f7f6');
insert into public.regulations_cacem (id, geom, url, layer_name, facade, ref_reg, edition, editeur, source, observation, thematique, date, duree_validite, date_fin, temporalite, type, plan, poly_name, resume, row_hash) values (2, 'MULTIPOLYGON(((120 -20,135 -20,135 -10,120 -10,120 -20)))', 'url2', 'layer_name2', 'NAMO', 'ref_reg2', '2025-01-01', 'editeur2', 'source2', 'observation2', 'thematique2', '2005-07-01', '20 ans', '2025-01-01', 'permanent', 'Arrêté préfectoral', 'PSCEM', 'poly_name2', 'resume2', '8c3842144dfaf46ead39bfa628dd9513');
13 changes: 3 additions & 10 deletions pipeline/tests/test_flows/test_regulations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def new_tags() -> pd.DataFrame:
def generate_regulatory_area_data(
ids,
geom,
entity_names,
layer_names,
facades,
ref_regs,
Expand All @@ -90,7 +89,6 @@ def generate_regulatory_area_data(
{
"id": ids,
"geom": geom,
"entity_name": entity_names,
"layer_name": layer_names,
"facade": facades,
"ref_reg": ref_regs,
Expand Down Expand Up @@ -148,7 +146,6 @@ def new_regulatory_areas() -> pd.DataFrame:
"CD5455446407A715E737969F3BFEAD7CEDEB655464036ED5A29A137F4BF97F69352CC3446"
"40F57994631533F2BFE2B98CD545544640",
],
entity_names=["Zone 1_new", "Zone 2", "Zone 3", "Zone 4"],
layer_names=["Layer 1", "Layer 2_new", "Layer 3", "Layer 4"],
facades=["NAMO", "NAMO", "MED_new", "MED"],
ref_regs=["arrêté 1", "arrêté 2", "arrêté 3", "arrêté 4_new"],
Expand Down Expand Up @@ -207,10 +204,6 @@ def regulatory_areas_to_update() -> pd.DataFrame:
None,
None,
],
entity_names=[
"Zone 5",
"Zone 6",
],
layer_names=[
"Layer 5",
"Layer 6",
Expand Down Expand Up @@ -261,7 +254,7 @@ def test_load_new_regulatory_areas(reset_test_data, new_regulatory_areas):
old_regulations = read_query(
"monitorenv_remote",
"""SELECT
id, geom, entity_name, layer_name, facade,
id, geom, layer_name, facade,
ref_reg, url, row_hash, edition, editeur,
source, observation, thematique, date,
duree_validite, temporalite, type, plan,
Expand All @@ -276,7 +269,7 @@ def test_load_new_regulatory_areas(reset_test_data, new_regulatory_areas):
loaded_regulations = read_query(
"monitorenv_remote",
"""SELECT
id, geom, entity_name, layer_name, facade,
id, geom, layer_name, facade,
ref_reg, url, row_hash, edition, editeur,
source, observation, thematique, date,
duree_validite, temporalite, type, plan,
Expand All @@ -292,7 +285,7 @@ def test_update_new_regulations(reset_test_data, regulatory_areas_to_update):
updated_regulations = read_query(
"monitorenv_remote",
"""SELECT
id, geom, entity_name, layer_name, facade,
id, geom, layer_name, facade,
ref_reg, url, row_hash, edition, editeur,
source, observation, thematique, date,
duree_validite, temporalite, type, plan,
Expand Down
12 changes: 0 additions & 12 deletions pipeline/tests/test_flows/test_regulations_open_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ def regulations_open_data():
1,
2,
],
"ent_name": [
"entity_name1",
"entity_name2",
],
"url": ["url1", "url2"],
"layer_name": [
"layer_name1",
Expand Down Expand Up @@ -108,10 +104,6 @@ def regulations_for_csv():
1,
2,
],
"ent_name": [
"entity_name1",
"entity_name2",
],
"url": ["url1", "url2"],
"layer_name": [
"layer_name1",
Expand Down Expand Up @@ -185,10 +177,6 @@ def regulations_for_geopackage():
1,
2,
],
"ent_name": [
"entity_name1",
"entity_name2",
],
"url": ["url1", "url2"],
"layer_name": [
"layer_name1",
Expand Down
Loading