From 9e400d59852e60e542c173e9d3cfc9362914eacf Mon Sep 17 00:00:00 2001 From: Vincent Date: Fri, 15 Nov 2024 12:18:05 +0100 Subject: [PATCH] Fix suspicion of under-declaration alert type --- datascience/src/pipeline/entities/alerts.py | 2 +- .../flows/suspicions_of_under_declaration_alerts.py | 10 +++++----- .../test_suspicions_of_under_declaration_alerts.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/datascience/src/pipeline/entities/alerts.py b/datascience/src/pipeline/entities/alerts.py index 4a9ed54e36..0d3ed9aaf2 100644 --- a/datascience/src/pipeline/entities/alerts.py +++ b/datascience/src/pipeline/entities/alerts.py @@ -8,5 +8,5 @@ class AlertType(Enum): MISSING_DEP_ALERT = "MISSING_DEP_ALERT" MISSING_FAR_ALERT = "MISSING_FAR_ALERT" MISSING_FAR_48_HOURS_ALERT = "MISSING_FAR_48_HOURS_ALERT" - SUSPICION_OF_UNDER_DECLARATION = "SUSPICION_OF_UNDER_DECLARATION" + SUSPICION_OF_UNDER_DECLARATION_ALERT = "SUSPICION_OF_UNDER_DECLARATION_ALERT" RTC_FISHING_ALERT = "RTC_FISHING_ALERT" diff --git a/datascience/src/pipeline/flows/suspicions_of_under_declaration_alerts.py b/datascience/src/pipeline/flows/suspicions_of_under_declaration_alerts.py index 3173a698d1..0231ce7e6a 100644 --- a/datascience/src/pipeline/flows/suspicions_of_under_declaration_alerts.py +++ b/datascience/src/pipeline/flows/suspicions_of_under_declaration_alerts.py @@ -32,21 +32,21 @@ def extract_suspicions_of_under_declaration(): alerts = make_alerts( vessels_with_suspicions_of_under_declaration, - AlertType.SUSPICION_OF_UNDER_DECLARATION.value, - AlertType.SUSPICION_OF_UNDER_DECLARATION.value, + AlertType.SUSPICION_OF_UNDER_DECLARATION_ALERT.value, + AlertType.SUSPICION_OF_UNDER_DECLARATION_ALERT.value, ) silenced_alerts = extract_silenced_alerts( - AlertType.SUSPICION_OF_UNDER_DECLARATION.value + AlertType.SUSPICION_OF_UNDER_DECLARATION_ALERT.value ) active_reportings = extract_active_reportings( - AlertType.SUSPICION_OF_UNDER_DECLARATION.value + AlertType.SUSPICION_OF_UNDER_DECLARATION_ALERT.value ) filtered_alerts = filter_alerts(alerts, silenced_alerts, active_reportings) # Load load_alerts( filtered_alerts, - alert_config_name=AlertType.SUSPICION_OF_UNDER_DECLARATION.value, + alert_config_name=AlertType.SUSPICION_OF_UNDER_DECLARATION_ALERT.value, ) flow.file_name = Path(__file__).name diff --git a/datascience/tests/test_pipeline/test_flows/test_suspicions_of_under_declaration_alerts.py b/datascience/tests/test_pipeline/test_flows/test_suspicions_of_under_declaration_alerts.py index 7dde0edf85..403a9df238 100644 --- a/datascience/tests/test_pipeline/test_flows/test_suspicions_of_under_declaration_alerts.py +++ b/datascience/tests/test_pipeline/test_flows/test_suspicions_of_under_declaration_alerts.py @@ -88,7 +88,7 @@ def test_extract_suspicions_of_under_declaration( def test_flow(reset_test_data_suspicions_of_under_declaration_alerts): - query = "SELECT * FROM pending_alerts WHERE alert_config_name = 'SUSPICION_OF_UNDER_DECLARATION'" + query = "SELECT * FROM pending_alerts WHERE alert_config_name = 'SUSPICION_OF_UNDER_DECLARATION_ALERT'" initial_pending_alerts = read_query(query, db="monitorfish_remote") @@ -113,12 +113,12 @@ def test_flow(reset_test_data_suspicions_of_under_declaration_alerts): "trip_number": None, "value": { "dml": "DML 29", - "type": "SUSPICION_OF_UNDER_DECLARATION", + "type": "SUSPICION_OF_UNDER_DECLARATION_ALERT", "seaFront": "SA", "riskFactor": 2.58, }, "vessel_identifier": "INTERNAL_REFERENCE_NUMBER", - "alert_config_name": "SUSPICION_OF_UNDER_DECLARATION", + "alert_config_name": "SUSPICION_OF_UNDER_DECLARATION_ALERT", "vessel_id": 1.0, "latitude": 49.606, "longitude": -0.736,