Merge pull request #8 from teams-notifier/multiple-fixes

Misc fixes

Author: babs

cards/merge_request.yaml.j2

@@ -11,7 +11,7 @@ body:
   wrap: true
 - columns:
   - items:
-    - color: Accent
+    - color: {{ precalc.icon_color | default("Accent") }}
       name: BranchRequest
       type: Icon
     type: Column
@@ -24,7 +24,7 @@ body:
       weight: Bolder
       wrap: true
     - size: Small
-      text: Opened by {{ precalc.openner.name }}
+      text: Opened by {{ precalc.opener.name }}
       type: TextBlock
       wrap: true
     spacing: Small

cards/render.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import datetime
 import json
+from enum import Enum
 from typing import Any
 
 import yaml
@@ -11,6 +12,16 @@
 from db import MergeRequestInfos
 
 
+class Teams_Color(Enum):
+    DEFAULT = "default"
+    DARK = "dark"
+    LIGHT = "light"
+    ACCENT = "accent"
+    GOOD = "good"
+    WARNING = "warning"
+    ATTENTION = "attention"
+
+
 def render(mri: MergeRequestInfos) -> dict[str, Any]:
     env = Environment(loader=FileSystemLoader("./cards/"))
     templ: Template = env.get_template("merge_request.yaml.j2")
@@ -36,11 +47,18 @@ def render(mri: MergeRequestInfos) -> dict[str, Any]:
         if approver.status == "approved"
     ]
 
+    icon_color: Teams_Color = Teams_Color.ACCENT
+
+    if mri.merge_request_payload.object_attributes.action == "close":
+        icon_color = Teams_Color.ATTENTION
+    if mri.merge_request_payload.object_attributes.action == "merge":
+        icon_color = Teams_Color.GOOD
+
     precalc = {
         "path_with_namespace": mri.merge_request_payload.project.path_with_namespace,
         "iid": mri.merge_request_payload.object_attributes.iid,
         "title": mri.merge_request_payload.object_attributes.title,
-        "openner": mri.merge_request_extra_state.openner,
+        "opener": mri.merge_request_extra_state.opener,
         "detailed_merge_status": mri.merge_request_payload.object_attributes.detailed_merge_status,
         "latest_action": mri.merge_request_payload.object_attributes.action,
         "source_branch": mri.merge_request_payload.object_attributes.source_branch,
@@ -49,6 +67,7 @@ def render(mri: MergeRequestInfos) -> dict[str, Any]:
         "url": mri.merge_request_payload.object_attributes.url,
         "latest_pipeline": latest_pipeline_infos,
         "approvers": approvers,
+        "icon_color": icon_color.value,
     }
 
     rendered = templ.render(

db.py

@@ -94,7 +94,7 @@ class GitlabApprovals(GitlabUser):
 
 class MergeRequestExtraState(BaseModel):
     version: int
-    openner: GitlabUser
+    opener: GitlabUser
     approvers: dict[str, GitlabApprovals]
     pipeline_statuses: dict[str, PipelinePayload]
     emojis: dict[str, Any]
@@ -145,7 +145,7 @@ async def get_merge_request_ref_infos(self, merge_request: MergeRequestPayload)
             insert_only_vals={
                 "merge_request_extra_state": {
                     "version": 1,
-                    "openner": {
+                    "opener": {
                         "id": merge_request.user.id,
                         "name": merge_request.user.name,
                         "username": merge_request.user.username,

webhook/merge_request.py

@@ -100,14 +100,25 @@ async def create_or_update_message(
 
         connection: asyncpg.Connection
         async with await database.acquire() as connection:
-            await connection.execute(
+            result = await connection.fetchrow(
                 """UPDATE merge_request_message_ref
                     SET message_id = $1
                     WHERE merge_request_message_ref_id = $2
+                        AND message_id IS NULL
+                    RETURNING merge_request_message_ref_id
                 """,
                 response.get("message_id"),
                 mrmsgref.merge_request_message_ref_id,
             )
+        if result is None or len(result) == 0:
+            # This case is a race condition so cleanup the second message :)
+            await client.request(
+                "DELETE",
+                config.ACTIVITY_API + "api/v1/message",
+                json={
+                    "message_id": str(response.get("message_id")),
+                },
+            )
     else:
         payload["message_id"] = str(mrmsgref.message_id)
         res = await client.request(