CR fixes

Author: arikalon1

src/robusta/integrations/slack/sender.py

@@ -409,14 +409,24 @@ def __create_holmes_callback(self, finding: Finding) -> CallbackBlock:
             }
         )
 
+    @staticmethod
+    def extract_mentions(title) -> (str, str):
+        mentions = MENTION_PATTERN.findall(title)
+
+        mention = ""
+        if mentions:
+            mention = " " + " ".join(mentions)
+            title = MENTION_PATTERN.sub("", title).strip()
+
+        return title, mention
+
+
     def __create_finding_header(
         self, finding: Finding, status: FindingStatus, platform_enabled: bool, include_investigate_link: bool
     ) -> MarkdownBlock:
         title = finding.title.removeprefix("[RESOLVED] ")
 
-        match = MENTION_PATTERN.search(title)
-        mention = f" {match.group(0)}" if match else ""
-        title = MENTION_PATTERN.sub("", title).strip()
+        title, mention = self.extract_mentions(title)
 
         sev = finding.severity
         if finding.source == FindingSource.PROMETHEUS:

tests/slack/test_slack_mentions.py

@@ -0,0 +1,20 @@
+from integrations.slack import SlackSender
+
+
+def test_title_without_mentions():
+    title = "Title with no mentions"
+    new_title, mention = SlackSender.extract_mentions(title)
+    assert new_title == title
+    assert mention == ""
+
+def test_title_with_single_mention():
+    title = "Title with single mention <@U024BE7LH>"
+    new_title, mention = SlackSender.extract_mentions(title)
+    assert new_title == "Title with single mention"
+    assert mention == " <@U024BE7LH>"
+
+def test_title_with_two_mentions():
+    title = "Title with <@U024BE7LG> two mentions <@U024BE7LH>"
+    new_title, mention = SlackSender.extract_mentions(title)
+    assert new_title == "Title with  two mentions"
+    assert mention == " <@U024BE7LG> <@U024BE7LH>"