Fix file path in generate pipeline message function

HERMES-SOC · Aug 14, 2023 · 4555c7d · 4555c7d
1 parent 4fda60b
commit 4555c7d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/sdc_aws_utils/slack.py b/sdc_aws_utils/slack.py
@@ -60,6 +60,9 @@ def generate_file_pipeline_message(file_path: str, alert_type: Optional[str] = N
     Function to generate file pipeline message
     """
 
+    if "/" in file_path:
+        file_path = file_path.split("/")[-1]
+
     if alert_type != "delete":
         # Get the file name
         alert = {
@@ -203,17 +206,20 @@ def get_message_ts(slack_client: WebClient, slack_channel: str, science_filename
         for message in messages:
             if "text" in message:
                 slack_science_filename = parse_slack_message(message["text"])
+
                 if not slack_science_filename:
                     continue
                 try:
+                    if "/" in slack_science_filename:
+                        slack_science_filename = slack_science_filename.split("/")[-1]
                     slack_science_file = parser(slack_science_filename)
                 except ValueError:
                     continue
                 science_file = parser(science_filename)
 
                 if have_same_keys_and_values(
                     [slack_science_file, science_file],
-                    ["time", "version", "mode", "test"],
+                    ["time", "mode", "test"],
                 ):
                     return message["ts"]
 
@@ -252,6 +258,11 @@ def send_pipeline_notification(slack_client: WebClient, slack_channel: str, path
                     slack_channel=slack_channel,
                     slack_message=slack_message,
                 )
+                ts = get_message_ts(
+                    slack_client=slack_client,
+                    slack_channel=slack_channel,
+                    science_filename=path,  # Pass the message_ts instead of slack_message
+                )
 
             slack_message = generate_file_pipeline_message(path, alert_type=alert_type)
 
@@ -265,4 +276,4 @@ def send_pipeline_notification(slack_client: WebClient, slack_channel: str, path
             )
 
     except Exception as e:
-        log.error(e)
+        log.error({"status": "ERROR", "message": e})
diff --git a/test_file_manifest.txt b/test_file_manifest.txt
@@ -0,0 +1 @@
+Manifest content
diff --git a/tests/test_slack.py b/tests/test_slack.py
@@ -118,18 +118,15 @@ def test_is_file_manifest_false():
 
 # Test generate_file_pipeline_message function
 def test_generate_file_pipeline_message_alert_type():
-    assert generate_file_pipeline_message("path/to/file.txt") == "Science File - ( _path/to/file.txt_ )"
+    assert generate_file_pipeline_message("path/to/file.txt") == "Science File - ( _file.txt_ )"
 
 
 def test_generate_file_pipeline_message_alert_type():
-    assert generate_file_pipeline_message("path/to/file.txt", "sorted") == "File Sorted - ( _path/to/file.txt_ )"
+    assert generate_file_pipeline_message("path/to/file.txt", "sorted") == "File Sorted - ( _file.txt_ )"
 
 
 def test_generate_file_pipeline_message_alert_type():
-    assert (
-        generate_file_pipeline_message("path/to/file.txt", "non-existing key")
-        == "Science File - ( _path/to/file.txt_ )"
-    )
+    assert generate_file_pipeline_message("path/to/file.txt", "non-existing key") == "Science File - ( _file.txt_ )"
 
 
 def test_generate_file_pipeline_message_alert_type_delete():
@@ -146,7 +143,7 @@ def test_generate_file_pipeline_message_manifest(mocked_manifest):
 
 
 def test_generate_file_pipeline_message_sorted():
-    assert generate_file_pipeline_message("path/to/file.txt", "sorted") == "File Sorted - ( _path/to/file.txt_ )"
+    assert generate_file_pipeline_message("path/to/file.txt", "sorted") == "File Sorted - ( _file.txt_ )"
 
 
 # Test have_same_keys_and_values function