From 8821b950e0d3105e497ee8b9696d69e5fcdde85a Mon Sep 17 00:00:00 2001
From: Meni Yakove <myakove@gmail.com>
Date: Thu, 24 Apr 2025 12:26:59 +0300
Subject: [PATCH 1/7] Add approvers and reviewers to welcome comment

---
 webhook_server_container/libs/github_api.py | 120 +++++++++++++-------
 1 file changed, 77 insertions(+), 43 deletions(-)

diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index acd8638c..b66a80b4 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -150,45 +150,11 @@ def __init__(self, hook_data: dict[Any, Any], headers: Headers, logger: logging.
         self.clone_repo_dir: str = os.path.join("/tmp", f"{self.repository.name}")
         self.add_api_users_to_auto_verified_and_merged_users()
 
-        self.supported_user_labels_str: str = "".join([f" * {label}\n" for label in USER_LABELS_DICT.keys()])
         self.current_pull_request_supported_retest = self._current_pull_request_supported_retest
-        self.welcome_msg: str = f"""
-Report bugs in [Issues](https://github.com/myakove/github-webhook-server/issues)
-
-The following are automatically added:
- * Add reviewers from OWNER file (in the root of the repository) under reviewers section.
- * Set PR size label.
- * New issue is created for the PR. (Closed when PR is merged/closed)
- * Run [pre-commit](https://pre-commit.ci/) if `.pre-commit-config.yaml` exists in the repo.
-
-Available user actions:
- * To mark PR as WIP comment `/wip` to the PR, To remove it from the PR comment `/wip cancel` to the PR.
- * To block merging of PR comment `/hold`, To un-block merging of PR comment `/hold cancel`.
- * To mark PR as verified comment `/verified` to the PR, to un-verify comment `/verified cancel` to the PR.
-        verified label removed on each new commit push.
- * To cherry pick a merged PR comment `/cherry-pick <target branch to cherry-pick to>` in the PR.
-    * Multiple target branches can be cherry-picked, separated by spaces. (`/cherry-pick branch1 branch2`)
-    * Cherry-pick will be started when PR is merged
- * To build and push container image command `/build-and-push-container` in the PR (tag will be the PR number).
-    * You can add extra args to the Podman build command
-        * Example: `/build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>`
- * To add a label by comment use `/<label name>`, to remove, use `/<label name> cancel`
- * To assign reviewers based on OWNERS file use `/assign-reviewers`
- * To check if PR can be merged use `/check-can-merge`
- * to assign reviewer to PR use `/assign-reviewer @<reviewer>`
-
-<details>
-<summary>Supported /retest check runs</summary>
-
-{self.prepare_retest_wellcome_msg}
-</details>
-
-<details>
-<summary>Supported labels</summary>
-
-{self.supported_user_labels_str}
-</details>
-    """
+        self.issue_url_for_welcome_msg: str = (
+            "Report bugs in [Issues](https://github.com/myakove/github-webhook-server/issues)"
+        )
+        self.welcome_msg = self._prepare_welcome_comment()
 
     def process(self) -> None:
         if self.github_event == "ping":
@@ -228,7 +194,7 @@ def process(self) -> None:
                 self.process_push_webhook_data()
 
     @property
-    def prepare_retest_wellcome_msg(self) -> str:
+    def _prepare_retest_welcome_comment(self) -> str:
         retest_msg: str = ""
         if self.tox:
             retest_msg += f" * `/retest {TOX_STR}`: Retest tox\n"
@@ -792,7 +758,7 @@ def process_comment_webhook_data(self) -> None:
 
         body: str = self.hook_data["comment"]["body"]
 
-        if body == self.welcome_msg:
+        if self.issue_url_for_welcome_msg in body:
             self.logger.debug(
                 f"{self.log_prefix} Welcome message found in issue {self.pull_request.title}. Not processing"
             )
@@ -822,9 +788,11 @@ def process_pull_request_webhook_data(self) -> None:
         if hook_action in ("opened", "reopened"):
             pull_request_opened_futures: list[Future] = []
             with ThreadPoolExecutor() as executor:
-                pull_request_opened_futures.append(
-                    executor.submit(self.pull_request.create_issue_comment, **{"body": self.welcome_msg})
-                )
+                if hook_action == "opened":
+                    welcome_msg = self._prepare_welcome_comment()
+                    pull_request_opened_futures.append(
+                        executor.submit(self.pull_request.create_issue_comment, **{"body": welcome_msg})
+                    )
                 pull_request_opened_futures.append(executor.submit(self.create_issue_for_new_pull_request))
                 pull_request_opened_futures.append(executor.submit(self.set_wip_label_based_on_title))
                 pull_request_opened_futures.append(executor.submit(self.process_opened_or_synchronize_pull_request))
@@ -2201,3 +2169,69 @@ def _run_conventional_title_check(self) -> None:
             output["text"] = f"Pull request title must starts with allowed title: {': ,'.join(allowed_names)}"
 
             self.set_conventional_title_failure(output=output)
+
+    def _prepare_owners_welcome_comment(self) -> str:
+        body: str = """
+<details>
+<summary>Approvers and Reviewers</summary>
+
+"""
+        body_approvers: str = " * Approvers:\n"
+        body_reviewers: str = " * Reviewers:\n"
+
+        for _approver in self.all_approvers:
+            body_approvers += f"   * {_approver}\n"
+
+        for _reviewer in self.all_reviewers:
+            body_reviewers += f"   * {_reviewer}\n"
+
+        body += f"""
+{body_approvers}
+
+{body_reviewers}
+
+</details>
+"""
+
+        return body
+
+    def _prepare_welcome_comment(self) -> str:
+        self.logger.info(f"{self.log_prefix} Prepare welcome comment")
+        supported_user_labels_str: str = "".join([f" * {label}\n" for label in USER_LABELS_DICT.keys()])
+        return f"""
+{self.issue_url_for_welcome_msg}
+
+The following are automatically added:
+ * Add reviewers from OWNER file (in the root of the repository) under reviewers section.
+ * Set PR size label.
+ * New issue is created for the PR. (Closed when PR is merged/closed)
+ * Run [pre-commit](https://pre-commit.ci/) if `.pre-commit-config.yaml` exists in the repo.
+
+Available user actions:
+ * To mark PR as WIP comment `/wip` to the PR, To remove it from the PR comment `/wip cancel` to the PR.
+ * To block merging of PR comment `/hold`, To un-block merging of PR comment `/hold cancel`.
+ * To mark PR as verified comment `/verified` to the PR, to un-verify comment `/verified cancel` to the PR.
+        verified label removed on each new commit push.
+ * To cherry pick a merged PR comment `/cherry-pick <target branch to cherry-pick to>` in the PR.
+    * Multiple target branches can be cherry-picked, separated by spaces. (`/cherry-pick branch1 branch2`)
+    * Cherry-pick will be started when PR is merged
+ * To build and push container image command `/build-and-push-container` in the PR (tag will be the PR number).
+    * You can add extra args to the Podman build command
+        * Example: `/build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>`
+ * To add a label by comment use `/<label name>`, to remove, use `/<label name> cancel`
+ * To assign reviewers based on OWNERS file use `/assign-reviewers`
+ * To check if PR can be merged use `/check-can-merge`
+ * to assign reviewer to PR use `/assign-reviewer @<reviewer>`
+
+<details>
+<summary>Supported /retest check runs</summary>
+
+{self._prepare_retest_welcome_comment}
+</details>
+
+<details>
+<summary>Supported labels</summary>
+
+{supported_user_labels_str}
+</details>
+    """

From 57de93815087719df7bd734a894a070ef603ee09 Mon Sep 17 00:00:00 2001
From: Meni Yakove <myakove@gmail.com>
Date: Thu, 24 Apr 2025 12:32:56 +0300
Subject: [PATCH 2/7] Add approvers and reviewers to welcome comment

---
 webhook_server_container/libs/github_api.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index b66a80b4..8a59384f 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -2223,6 +2223,12 @@ def _prepare_welcome_comment(self) -> str:
  * To check if PR can be merged use `/check-can-merge`
  * to assign reviewer to PR use `/assign-reviewer @<reviewer>`
 
+PR will be approved when the following conditions are met:
+ * `/approve` from one of the approvers.
+ * Minimum number of required `/lgtm` (`{self.minimum_lgtm}`) is met.
+
+{self._prepare_owners_welcome_comment()}
+
 <details>
 <summary>Supported /retest check runs</summary>
 

From bdcbab75067804818a1ccd4e6c2946125014caeb Mon Sep 17 00:00:00 2001
From: Meni Yakove <myakove@gmail.com>
Date: Thu, 24 Apr 2025 12:37:04 +0300
Subject: [PATCH 3/7] remove unused call for create welcome comment in __init__

---
 webhook_server_container/libs/github_api.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index 8a59384f..11961dec 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -154,7 +154,6 @@ def __init__(self, hook_data: dict[Any, Any], headers: Headers, logger: logging.
         self.issue_url_for_welcome_msg: str = (
             "Report bugs in [Issues](https://github.com/myakove/github-webhook-server/issues)"
         )
-        self.welcome_msg = self._prepare_welcome_comment()
 
     def process(self) -> None:
         if self.github_event == "ping":

From 9bdb7303a8d8b5df41f53aa6b9f736bf7a3e900d Mon Sep 17 00:00:00 2001
From: Meni Yakove <myakove@gmail.com>
Date: Thu, 24 Apr 2025 12:45:45 +0300
Subject: [PATCH 4/7] Fix tests

---
 .../tests/test_prepare_retest_wellcome_msg.py | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 webhook_server_container/tests/test_prepare_retest_wellcome_msg.py

diff --git a/webhook_server_container/tests/test_prepare_retest_wellcome_msg.py b/webhook_server_container/tests/test_prepare_retest_wellcome_msg.py
deleted file mode 100644
index e3d1b0e1..00000000
--- a/webhook_server_container/tests/test_prepare_retest_wellcome_msg.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import pytest
-
-
-class TestPrepareRetestWellcomeMsg:
-    @pytest.mark.parametrize(
-        "tox, build_and_push_container, pypi, pre_commit, expected",
-        [
-            (False, False, False, False, " * This repository does not support retest actions"),
-            (True, False, False, False, " * `/retest tox`: Retest tox\n * `/retest all`: Retest all\n"),
-            (
-                False,
-                True,
-                False,
-                False,
-                " * `/retest build-container`: Retest build-container\n * `/retest all`: Retest all\n",
-            ),
-            (
-                False,
-                False,
-                True,
-                False,
-                " * `/retest python-module-install`: Retest python-module-install\n * `/retest all`: Retest all\n",
-            ),
-            (False, False, False, True, " * `/retest pre-commit`: Retest pre-commit\n * `/retest all`: Retest all\n"),
-            (
-                True,
-                True,
-                True,
-                True,
-                " * `/retest tox`: Retest tox\n * `/retest build-container`: Retest build-container\n * `/retest python-module-install`: Retest python-module-install\n * `/retest pre-commit`: Retest pre-commit\n * `/retest all`: Retest all\n",
-            ),
-        ],
-    )
-    def test_prepare_retest_wellcome_msg(
-        self, process_github_webhook, tox, build_and_push_container, pypi, pre_commit, expected
-    ):
-        process_github_webhook.tox = tox
-        process_github_webhook.build_and_push_container = build_and_push_container
-        process_github_webhook.pypi = pypi
-        process_github_webhook.pre_commit = pre_commit
-
-        assert process_github_webhook.prepare_retest_wellcome_msg == expected

From 1f763239d236b244460488e409cfdf78e1b49012 Mon Sep 17 00:00:00 2001
From: Meni Yakove <myakove@gmail.com>
Date: Thu, 24 Apr 2025 12:45:58 +0300
Subject: [PATCH 5/7] Fix tests

---
 .../test_prepare_retest_wellcome_comment.py   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 webhook_server_container/tests/test_prepare_retest_wellcome_comment.py

diff --git a/webhook_server_container/tests/test_prepare_retest_wellcome_comment.py b/webhook_server_container/tests/test_prepare_retest_wellcome_comment.py
new file mode 100644
index 00000000..06016867
--- /dev/null
+++ b/webhook_server_container/tests/test_prepare_retest_wellcome_comment.py
@@ -0,0 +1,42 @@
+import pytest
+
+
+class TestPrepareRetestWellcomeMsg:
+    @pytest.mark.parametrize(
+        "tox, build_and_push_container, pypi, pre_commit, expected",
+        [
+            (False, False, False, False, " * This repository does not support retest actions"),
+            (True, False, False, False, " * `/retest tox`: Retest tox\n * `/retest all`: Retest all\n"),
+            (
+                False,
+                True,
+                False,
+                False,
+                " * `/retest build-container`: Retest build-container\n * `/retest all`: Retest all\n",
+            ),
+            (
+                False,
+                False,
+                True,
+                False,
+                " * `/retest python-module-install`: Retest python-module-install\n * `/retest all`: Retest all\n",
+            ),
+            (False, False, False, True, " * `/retest pre-commit`: Retest pre-commit\n * `/retest all`: Retest all\n"),
+            (
+                True,
+                True,
+                True,
+                True,
+                " * `/retest tox`: Retest tox\n * `/retest build-container`: Retest build-container\n * `/retest python-module-install`: Retest python-module-install\n * `/retest pre-commit`: Retest pre-commit\n * `/retest all`: Retest all\n",
+            ),
+        ],
+    )
+    def test_prepare_retest_wellcome_comment(
+        self, process_github_webhook, tox, build_and_push_container, pypi, pre_commit, expected
+    ):
+        process_github_webhook.tox = tox
+        process_github_webhook.build_and_push_container = build_and_push_container
+        process_github_webhook.pypi = pypi
+        process_github_webhook.pre_commit = pre_commit
+
+        assert process_github_webhook._prepare_retest_welcome_comment == expected

From b6a1aec42c6d2d2a6d167561afc04ae9113f4b74 Mon Sep 17 00:00:00 2001
From: Meni Yakove <myakove@gmail.com>
Date: Thu, 24 Apr 2025 12:59:20 +0300
Subject: [PATCH 6/7] Fix tests

---
 webhook_server_container/libs/github_api.py   |  2 +-
 .../test_prepare_retest_wellcome_comment.py   | 31 +++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index 11961dec..d1c09126 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -208,7 +208,7 @@ def _prepare_retest_welcome_comment(self) -> str:
             retest_msg += f" * `/retest {PRE_COMMIT_STR}`: Retest pre-commit\n"
 
         if self.conventional_title:
-            retest_msg += f"  * `/retest {CONVENTIONAL_TITLE_STR}`: Retest conventional-title\n"
+            retest_msg += f" * `/retest {CONVENTIONAL_TITLE_STR}`: Retest conventional-title\n"
 
         if retest_msg:
             retest_msg += " * `/retest all`: Retest all\n"
diff --git a/webhook_server_container/tests/test_prepare_retest_wellcome_comment.py b/webhook_server_container/tests/test_prepare_retest_wellcome_comment.py
index 06016867..1e6c8b00 100644
--- a/webhook_server_container/tests/test_prepare_retest_wellcome_comment.py
+++ b/webhook_server_container/tests/test_prepare_retest_wellcome_comment.py
@@ -3,15 +3,16 @@
 
 class TestPrepareRetestWellcomeMsg:
     @pytest.mark.parametrize(
-        "tox, build_and_push_container, pypi, pre_commit, expected",
+        "tox, build_and_push_container, pypi, pre_commit, conventional_title, expected",
         [
-            (False, False, False, False, " * This repository does not support retest actions"),
-            (True, False, False, False, " * `/retest tox`: Retest tox\n * `/retest all`: Retest all\n"),
+            (False, False, False, False, False, " * This repository does not support retest actions"),
+            (True, False, False, False, False, " * `/retest tox`: Retest tox\n * `/retest all`: Retest all\n"),
             (
                 False,
                 True,
                 False,
                 False,
+                False,
                 " * `/retest build-container`: Retest build-container\n * `/retest all`: Retest all\n",
             ),
             (
@@ -19,24 +20,42 @@ class TestPrepareRetestWellcomeMsg:
                 False,
                 True,
                 False,
+                False,
                 " * `/retest python-module-install`: Retest python-module-install\n * `/retest all`: Retest all\n",
             ),
-            (False, False, False, True, " * `/retest pre-commit`: Retest pre-commit\n * `/retest all`: Retest all\n"),
+            (
+                False,
+                False,
+                False,
+                True,
+                False,
+                " * `/retest pre-commit`: Retest pre-commit\n * `/retest all`: Retest all\n",
+            ),
             (
                 True,
                 True,
                 True,
                 True,
-                " * `/retest tox`: Retest tox\n * `/retest build-container`: Retest build-container\n * `/retest python-module-install`: Retest python-module-install\n * `/retest pre-commit`: Retest pre-commit\n * `/retest all`: Retest all\n",
+                True,
+                " * `/retest tox`: Retest tox\n * `/retest build-container`: Retest build-container\n * `/retest python-module-install`: Retest python-module-install\n * `/retest pre-commit`: Retest pre-commit\n * `/retest conventional-title`: Retest conventional-title\n * `/retest all`: Retest all\n",
+            ),
+            (
+                False,
+                False,
+                False,
+                False,
+                True,
+                " * `/retest conventional-title`: Retest conventional-title\n * `/retest all`: Retest all\n",
             ),
         ],
     )
     def test_prepare_retest_wellcome_comment(
-        self, process_github_webhook, tox, build_and_push_container, pypi, pre_commit, expected
+        self, process_github_webhook, tox, build_and_push_container, pypi, pre_commit, conventional_title, expected
     ):
         process_github_webhook.tox = tox
         process_github_webhook.build_and_push_container = build_and_push_container
         process_github_webhook.pypi = pypi
         process_github_webhook.pre_commit = pre_commit
+        process_github_webhook.conventional_title = conventional_title
 
         assert process_github_webhook._prepare_retest_welcome_comment == expected

From c6e5ecf8cc02d96fdc5fa25b1365703b7e20fd07 Mon Sep 17 00:00:00 2001
From: Meni Yakove <myakove@gmail.com>
Date: Thu, 24 Apr 2025 13:07:07 +0300
Subject: [PATCH 7/7] owners text without <details> tag

---
 webhook_server_container/libs/github_api.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py
index d1c09126..39bcc58c 100644
--- a/webhook_server_container/libs/github_api.py
+++ b/webhook_server_container/libs/github_api.py
@@ -2170,11 +2170,6 @@ def _run_conventional_title_check(self) -> None:
             self.set_conventional_title_failure(output=output)
 
     def _prepare_owners_welcome_comment(self) -> str:
-        body: str = """
-<details>
-<summary>Approvers and Reviewers</summary>
-
-"""
         body_approvers: str = " * Approvers:\n"
         body_reviewers: str = " * Reviewers:\n"
 
@@ -2184,16 +2179,12 @@ def _prepare_owners_welcome_comment(self) -> str:
         for _reviewer in self.all_reviewers:
             body_reviewers += f"   * {_reviewer}\n"
 
-        body += f"""
+        return f"""
 {body_approvers}
 
 {body_reviewers}
-
-</details>
 """
 
-        return body
-
     def _prepare_welcome_comment(self) -> str:
         self.logger.info(f"{self.log_prefix} Prepare welcome comment")
         supported_user_labels_str: str = "".join([f" * {label}\n" for label in USER_LABELS_DICT.keys()])
@@ -2226,7 +2217,11 @@ def _prepare_welcome_comment(self) -> str:
  * `/approve` from one of the approvers.
  * Minimum number of required `/lgtm` (`{self.minimum_lgtm}`) is met.
 
+<details>
+<summary>Approvers and Reviewers</summary>
+
 {self._prepare_owners_welcome_comment()}
+</details>
 
 <details>
 <summary>Supported /retest check runs</summary>