Admin: Add label when notifying users

Author: bblommers

backend/github_bot.py

@@ -21,6 +21,8 @@ def notify_user(pr_number: str, notification_text: str) -> None:
         access_token = GithubBot.get_access_token(installation_id, jwt_token)
         # use REST api to make comment
         QueryGithub.create_comment(access_token, pr_number, notification_text)
+        # Set label
+        QueryGithub.add_label(access_token, pr_number, "payment-approved")
 
     @staticmethod
     def get_jwt_token(private_key, app_id):

backend/query_github.py

@@ -141,6 +141,16 @@ def create_comment(cls, access_token: str, pr_number: str, notification_text) ->
         )
         print(resp.__dict__)
 
+    @classmethod
+    def add_label(cls, access_token: str, pr_number: str, label_name: str) -> None:
+        resp = http.request(
+            "POST",
+            f"https://api.github.com/repos/{repo_owner_name}/issues/{pr_number}/labels",
+            body=json.dumps({"labels": [label_name]}),
+            headers={"Authorization": f"Bearer {access_token}"}
+        )
+        print(resp.__dict__)
+
     @classmethod
     def get_access_token(cls, installation_id, jwt_token) -> str:
         resp = http.request(

integration_tests/test_admin_area.py

@@ -182,7 +182,8 @@ def test_get_contributor(self):
                                       'state': 'MERGED',
                                       'title': 'Title of PR 1',
                                       'updatedAt': '2023-07-04T16:59:28Z'}],
-                            "payments": []}
+                            "payments": [],
+                            "oc_name": None}
 
     def test_create_payment(self):
         with patch("github_bot.GithubBot.notify_user", return_value=Mock()) as github_notifier:
@@ -305,8 +306,8 @@ def test_approve_payment(self):
 
         db_item = self.ddb.scan(TableName="Payments")["Items"][0]
         print(db_item)
-        assert "order" in db_item["processed"]
-        assert "approved_by" in db_item["processed"]
+        assert "order" in db_item["processed"]["M"]
+        assert "approved_by" in db_item["processed"]["M"]
 
     def test_unknown_caller(self):
         resp = admin_area.lambda_handler(event={}, context=None)

tests/test_github_bot.py

@@ -69,5 +69,9 @@ def test_invite_user(self):
             assert comment_url == ("POST", "https://api.github.com/repos/owner/repo/issues/42/comments")
             assert comment_details == {'body': '{"body": "some text"}', 'headers': {'Authorization': 'Bearer some access token'}}
 
+            comment_url, comment_details = github_http.call_args_list[2]
+            assert comment_url == ("POST", "https://api.github.com/repos/owner/repo/issues/42/labels")
+            assert comment_details == {'body': '{"labels": ["payment-approved"]}', 'headers': {'Authorization': 'Bearer some access token'}}
+
     def test_get_bot_details(self):
         assert self.bot.get_bot_details() == (self.app_id, self.installation_id, self.private_key_bytes)

website/details.html

@@ -103,6 +103,7 @@
           document.getElementById("details").value = "Development of ...";
           document.getElementById("amount").value = "";
           document.getElementById("pr_notification").value = "";
+          document.getElementById("pr_text").value = pr_text;
           document.getElementById("submitbutton").removeAttribute("aria-busy");
           // Scroll to the top, so the user can see the latest updates
           window.scrollTo(0, 0);