Préavis – Ajouter la boîte de façade aux destinataires des emails de …

…préavis (#3678) ## Linked issues - Resolve #3596
MTES-MCT · Sep 24, 2024 · 639a8b5 · 639a8b5
2 parents 6f39a69 + 085eb28
commit 639a8b5
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 16 deletions.
diff --git a/...src/main/resources/db/migration/internal/V0.279__Update_facade_areas_subdivided_table.sql b/...src/main/resources/db/migration/internal/V0.279__Update_facade_areas_subdivided_table.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public.facade_areas_subdivided
+    ADD COLUMN email_address text;
diff --git a/datascience/src/pipeline/entities/pnos.py b/datascience/src/pipeline/entities/pnos.py
@@ -46,6 +46,7 @@ class PnoToRender:
     catch_onboard: List[dict]
     port_locode: str
     port_name: str
+    facade: str
     predicted_arrival_datetime_utc: datetime
     predicted_landing_datetime_utc: datetime
     trip_gears: List[dict]
@@ -113,6 +114,7 @@ class PreRenderedPno:
     catch_onboard: pd.DataFrame
     port_locode: str
     port_name: str
+    facade: str
     predicted_arrival_datetime_utc: datetime
     predicted_landing_datetime_utc: datetime
     trip_gears: List[FishingGear]
@@ -204,6 +206,7 @@ class RenderedPno:
     is_being_sent: bool
     trip_segments: list
     port_locode: str
+    facade: str
     source: PnoSource
     html_for_pdf: Optional[str] = None
     pdf_document: Optional[bytes] = None

diff --git a/datascience/src/pipeline/flows/distribute_pnos.py b/datascience/src/pipeline/flows/distribute_pnos.py
@@ -112,6 +112,15 @@ def extract_pnos_to_generate(
     return (pnos, generation_needed)
 
 
+@task(checkpoint=False)
+def extract_facade_email_addresses() -> dict:
+    df = extract(
+        db_name="monitorfish_remote",
+        query_filepath="monitorfish/facade_email_addresses.sql",
+    )
+    return df.set_index("facade").email_address.to_dict()
+
+
 @task(checkpoint=False)
 def to_pnos_to_render(pnos: pd.DataFrame) -> List[PnoToRender]:
     records = pnos.to_dict(orient="records")
@@ -247,6 +256,7 @@ def format_sr_list(sr_list: list) -> str:
         catch_onboard=sum_by_species,
         port_locode=pno.port_locode,
         port_name=pno.port_name,
+        facade=pno.facade,
         predicted_arrival_datetime_utc=pno.predicted_arrival_datetime_utc,
         predicted_landing_datetime_utc=pno.predicted_landing_datetime_utc,
         trip_gears=trip_gears,
@@ -474,6 +484,7 @@ def format_nullable_datetime(d: datetime, format: str = date_format):
         is_being_sent=pno.is_being_sent,
         trip_segments=pno.trip_segments,
         port_locode=pno.port_locode,
+        facade=pno.facade,
         source=pno.source,
         html_for_pdf=html_for_pdf,
         pdf_document=pdf,
@@ -536,6 +547,7 @@ def attribute_addressees(
     units_targeting_vessels: pd.DataFrame,
     units_ports_and_segments_subscriptions: pd.DataFrame,
     control_units_contacts: pd.DataFrame,
+    facade_email_addresses: dict,
 ) -> RenderedPno:
     """
     Returns a copy of the input `RenderedPno`'s with its `control_unit_ids`,
@@ -560,6 +572,9 @@ def attribute_addressees(
           `unit_subscribed_segments`
         control_units_contacts (pd.DataFrame): DataFrame with columns
           `control_unit_id`, `emails` and `phone_numbers`
+        facade_email_addresses (dict): dictionnary with facade names as keys and FMC
+          facade email addresses as values. The email address of the corresponding
+          facade will be added to addressees in PNO emails.
 
     Returns:
         RenderedPno: copy of the input `pno_to_distribute` with addressees added
@@ -622,6 +637,10 @@ def attribute_addressees(
             )
         )
     )
+    if emails:
+        facade_email_address = facade_email_addresses.get(pno_to_distribute.facade)
+        if facade_email_address:
+            emails.append(facade_email_address)
 
     phone_numbers = sorted(
         set(
@@ -995,11 +1014,14 @@ def make_manual_prior_notifications_statement(
 
             with case(distribution_needed, True):
                 # Distribute PNOs
+                facade_email_addresses = extract_facade_email_addresses()
+
                 pnos_with_addressees = attribute_addressees.map(
                     pnos_to_distribute,
                     unmapped(units_targeting_vessels),
                     unmapped(units_ports_and_segments_subscriptions),
                     control_units_contacts=unmapped(control_units_contacts),
+                    facade_email_addresses=unmapped(facade_email_addresses),
                 )
 
                 email = create_email.map(

diff --git a/datascience/src/pipeline/queries/cross/facade_areas.sql b/datascience/src/pipeline/queries/cross/facade_areas.sql
@@ -1,4 +1,5 @@
 SELECT 
     facade_cnsp AS facade,
+    email_address,
     ST_SubDivide(geometry) AS geometry
 FROM prod.facade_areas
diff --git a/datascience/src/pipeline/queries/cross/local_execution/expand_facade_geometries.sql b/datascience/src/pipeline/queries/cross/local_execution/expand_facade_geometries.sql
@@ -21,6 +21,7 @@ facades_polygons_without_holes AS (
     SELECT
         id,
         prod.facade_areas_unextended.facade,
+        prod.facade_areas_unextended.email_address,
         ST_Difference(ST_MakePolygon(ST_ExteriorRing((ST_Dump(geom)).geom)), other_facades_geom) AS geom
     FROM prod.facade_areas_unextended
     JOIN other_unexpanded_facades
@@ -32,9 +33,10 @@ facades_multipolygons AS (
     SELECT 
         id,
         facade,
+        email_address,
         ST_Multi(ST_Union(geom)) AS geom
     FROM facades_polygons_without_holes
-    GROUP BY id, facade
+    GROUP BY id, facade, email_address
 ),
 
 all_facades AS (
@@ -45,6 +47,7 @@ all_facades AS (
 expanded_facades AS (
     SELECT
         facade,
+        email_address,
         ST_Difference(
             ST_Buffer(geom, 0.1),
             ST_Difference(
@@ -69,6 +72,7 @@ expanded_facades_without_overlap AS (
     SELECT
         ef.facade AS facade_cnsp,
         CASE WHEN ef.facade = 'Corse' THEN 'MED' ELSE ef.facade END AS facade_cacem,
+        email_address,
         ST_Difference(
             ef.expanded_geometry,
             other_expanded_facades_geom

diff --git a/datascience/src/pipeline/queries/monitorfish/facade_email_addresses.sql b/datascience/src/pipeline/queries/monitorfish/facade_email_addresses.sql
@@ -0,0 +1,5 @@
+SELECT DISTINCT ON (facade)
+    facade,
+    email_address
+FROM facade_areas_subdivided
+ORDER BY facade
diff --git a/datascience/src/pipeline/queries/monitorfish/pnos_to_generate.sql b/datascience/src/pipeline/queries/monitorfish/pnos_to_generate.sql
@@ -41,6 +41,7 @@ acknowledged_deleted_messages AS (
     r.value->'catchOnboard' AS catch_onboard,
     r.value->>'port' AS port_locode,
     p.port_name,
+    p.facade,
     (r.value->>'predictedArrivalDatetimeUtc')::TIMESTAMPTZ AT TIME ZONE 'UTC' AS predicted_arrival_datetime_utc,
     (r.value->>'predictedLandingDatetimeUtc')::TIMESTAMPTZ AT TIME ZONE 'UTC' AS predicted_landing_datetime_utc,
     r.trip_gears,
@@ -109,6 +110,7 @@ UNION ALL
     r.value->'catchOnboard' AS catch_onboard,
     r.value->>'port' AS port_locode,
     p.port_name,
+    p.facade,
     (r.value->>'predictedArrivalDatetimeUtc')::TIMESTAMPTZ AT TIME ZONE 'UTC' AS predicted_arrival_datetime_utc,
     (r.value->>'predictedLandingDatetimeUtc')::TIMESTAMPTZ AT TIME ZONE 'UTC' AS predicted_landing_datetime_utc,
     (CASE WHEN jsonb_typeof(r.trip_gears) = 'array' THEN r.trip_gears ELSE '[]'::jsonb END) AS trip_gears,

diff --git a/datascience/tests/test_data/remote_database/V666.29__Reset_test_ports.sql b/datascience/tests/test_data/remote_database/V666.29__Reset_test_ports.sql
@@ -2,13 +2,13 @@ DELETE FROM public.ports;
 
 INSERT INTO public.ports (
     country_code_iso2, region,     locode,                    port_name, is_active, facade) VALUES 
-    (            'FR',   '56',     'FAKE', 'Fake Port initially active',      true,   NULL),
+    (            'FR',   '56',     'FAKE', 'Fake Port initially active',      true, 'NAMO'),
     (            'FR',   '56', 'PNO_PORT',         'Fake Port with PNO',     false,   NULL),
-    (            'FR',   '56', 'LAN_PORT',         'Fake Port with LAN',     false,   NULL),
-    (            'FR',  '999',    'FRCQF', 'Somewhere over the rainbow',     false,   NULL),
-    (            'FR',  '999',    'FRBES',    'Somewhere over the hill',     false,   NULL),
+    (            'FR',   '56', 'LAN_PORT',         'Fake Port with LAN',     false, 'NAMO'),
+    (            'FR',  '999',    'FRCQF', 'Somewhere over the rainbow',     false, 'NAMO'),
+    (            'FR',  '999',    'FRBES',    'Somewhere over the hill',     false,   'SA'),
     (            'FR',  '999',    'FRDPE',  'Somewhere over the clouds',     false,   NULL),
-    (            'FR',  '999',    'FRDKK',   'Somewhere over the swell',     false,   NULL),
-    (            'FR',  '999',    'FRLEH',   'Somewhere over the ocean',     false,   NULL),
-    (            'FR',  '999',    'FRZJZ',     'Somewhere over the top',     false,   NULL),
+    (            'FR',  '999',    'FRDKK',   'Somewhere over the swell',     false, 'NAMO'),
+    (            'FR',  '999',    'FRLEH',   'Somewhere over the ocean',     false,   'SA'),
+    (            'FR',  '999',    'FRZJZ',     'Somewhere over the top',     false,   'SA'),
     (            'FR',  '999',    'GBPHD',           'Port with facade',     false, 'MEMN');
diff --git a/datascience/tests/test_data/remote_database/V666.9__Reset_test_facade_areas_subdivided.sql b/datascience/tests/test_data/remote_database/V666.9__Reset_test_facade_areas_subdivided.sql
@@ -1,7 +1,7 @@
 DELETE FROM facade_areas_subdivided;
 
 INSERT INTO facade_areas_subdivided (
-    facade, geometry
+    facade, email_address,                                                                                          geometry
 ) VALUES
-('NAMO', ST_Polygon('LINESTRING(10.0 45.0, -10.0 45.0, -10.0 0.0, 10.0 0.0, 10.0 45.0)'::geometry, 4326)),
-('SA',   ST_Polygon('LINESTRING(10.0 45.0, -10.0 45.0, -10.0 50.0, 10.0 50.0, 10.0 45.0)'::geometry, 4326));
+(   'NAMO',  'namo@email',   ST_Polygon('LINESTRING(10.0 45.0, -10.0 45.0, -10.0 0.0, 10.0 0.0, 10.0 45.0)'::geometry, 4326)),
+(     'SA',    'sa@email', ST_Polygon('LINESTRING(10.0 45.0, -10.0 45.0, -10.0 50.0, 10.0 50.0, 10.0 45.0)'::geometry, 4326));