Merge ~emmabrostrom/ols-jenkaas:pre-merge-bot-comment into ols-jenkaas:main

[Emma Brostrom]

Refactor pre-merge command to exclude certain bot comments

The command was only looking at the most recent bot comment, regardless
of if it had to do with pre-merge CI, which this update fixes. Additionally,
refactored the function a bit to enhance readability and ease of list
comprehension.

This update was due to an issue realized in this MP: https://code.launchpad.net/~gravi1984/golem/+git/golem/+merge/463784
The bot recognized a previous bot comment that did not have to do with pre-merge CI
as a pre-merge CI command to search for the commit hash. There was no commit hash to be found
(as expected), but pre-merge CI was ran again as a result.

This update makes sure that only bot comments related to pre-merge CI
are parsed for their commit hash.

Tested in ols-jenkaas VM

[Emma Brostrom (emmabrostrom)]

Particularly looking for feedback if anyone has an idea of what to do
with is_pre_merge_ci_comment_match() instead of having it be a staticmethod.
get_most_recent_commit_seen_by_bot() should be kept static, so not sure if
there is a better way to call a function within that.

[Maximiliano Bertacchini (maxiberta)]

> Particularly looking for feedback if anyone has an idea of what to do
> with is_pre_merge_ci_comment_match() instead of having it be a staticmethod.
> get_most_recent_commit_seen_by_bot() should be kept static, so not sure if
> there is a better way to call a function within that.

LGTM +1

review: Approve

diff --git a/olsjenkaas/commands.py b/olsjenkaas/commands.py
index 9db0a23..8cace19 100644
--- a/olsjenkaas/commands.py
+++ b/olsjenkaas/commands.py
@@ -816,22 +816,26 @@ class PreMergeGitProposals(Command):
         return most_recent_commit
 
     @staticmethod
+    def is_pre_merge_ci_comment_match(comment_body):
+        matches = re.findall(
+            r".*[pre-merge ci\w].*revision [0-9a-z]{40}",
+            comment_body,
+        )
+        return bool(matches)
+
+    @staticmethod
     def get_most_recent_commit_seen_by_bot(proposal):
         comment_collection = proposal.all_comments
         bot_author_link = "https://api.launchpad.net/devel/~otto-copilot"
         bot_comments = [
-            comment
+            comment.message_body
             for comment in comment_collection
             if comment.author_link == bot_author_link
+            and PreMergeGitProposals.is_pre_merge_ci_comment_match(comment.message_body)
         ]
         try:
             most_recent_bot_comment = bot_comments[-1]
-            # Find revision number in last bot comment
-            matches = re.findall(
-                r".*[pre-merge ci\w].*revision [0-9a-z]{40}",
-                most_recent_bot_comment.message_body,
-            )
-            commit_hash = str(matches[0]).split()[-1]
+            commit_hash = most_recent_bot_comment.split()[-1]
             return commit_hash
         # If no bot comment or revision number found
         except IndexError: