Merge pull request #26 from teams-notifier/feat-rework-draft-ready-transition

feat: rework draft handling and draft to ready transition

Author: babs

.pre-commit-config.yaml

@@ -54,6 +54,7 @@ repos:
         additional_dependencies:
           - pydantic
           - types-PyYAML
+          - types-python-dateutil
         args:
           - --check-untyped-defs
           - --disallow-any-generics

requirements.txt

@@ -1,4 +1,5 @@
 python-dotenv
+python-dateutil
 pydantic
 asyncpg
 httpx

webhook/merge_request.py

@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 import datetime
+import hashlib
+import logging
 import uuid
 from typing import Any
 
 import asyncpg
+import dateutil.parser
 import httpx
 from pydantic import BaseModel
 
@@ -14,6 +17,8 @@
 from db import dbh
 from gitlab_model import MergeRequestPayload
 
+logger = logging.getLogger(__name__)
+
 
 class MRMessRef(BaseModel):
     merge_request_message_ref_id: int
@@ -138,11 +143,9 @@ async def merge_request(
     conversation_tokens: list[str],
     participant_ids_filter: list[int],
 ):
+    payload_fingerprint = hashlib.sha256(mr.model_dump_json().encode("utf8")).hexdigest()
+    logger.debug("payload fingerprint: %s", payload_fingerprint)
     mri = await dbh.get_merge_request_ref_infos(mr)
-    convtoken_to_msgrefs = await get_or_create_message_refs(
-        mri.merge_request_ref_id,
-        conversation_tokens,
-    )
 
     participant_found = True
     if participant_ids_filter:
@@ -159,7 +162,7 @@ async def merge_request(
     connection: asyncpg.Connection
 
     if mr.object_attributes.action in ("update"):
-        ...  # Update MR info (head_pipeline_id)
+        # Update MR info (head_pipeline_id)
         async with await database.acquire() as connection:
             row = await connection.fetchrow(
                 """UPDATE merge_request_ref
@@ -173,6 +176,42 @@ async def merge_request(
             if row is not None:
                 mri.merge_request_extra_state = row["merge_request_extra_state"]
 
+            # if it's a transition from draft to ready
+            # - Delete all messages related to this MR prior to the current event update
+            # then create_or_update_message will re-post new message
+            #  to have cards being the most recent in the feeds.
+            # Rows are used as lock to avoid race condition when multiple instances can receive hooks
+            # for the same MR (multiple webhook same project, multiple instances [kube?])
+            if mr.changes and "draft" in mr.changes and not mr.object_attributes.draft:
+                assert mr.object_attributes.updated_at is not None
+                update_ref_datetime = dateutil.parser.parse(mr.object_attributes.updated_at)
+                message_expiration = datetime.timedelta(seconds=0)
+                async with connection.transaction():
+                    res = await connection.fetch(
+                        """SELECT merge_request_message_ref_id, message_id
+                            FROM merge_request_message_ref
+                            WHERE merge_request_ref_id = $1 AND created_at < $2
+                            FOR UPDATE""",
+                        mri.merge_request_ref_id,
+                        update_ref_datetime,
+                    )
+                    for row in res:
+                        message_id = row.get("message_id")
+                        if message_id is not None:
+                            await connection.execute(
+                                """INSERT INTO msg_to_delete
+                                    (message_id, expire_at)
+                                VALUES
+                                    ($1, now()+$2::INTERVAL)""",
+                                str(message_id),
+                                message_expiration,
+                            )
+                        await connection.execute(
+                            "DELETE FROM merge_request_message_ref WHERE merge_request_message_ref_id = $1",
+                            row.get("merge_request_message_ref_id"),
+                        )
+                periodic_cleanup.reschedule()
+
     if mr.object_attributes.action in ("approved", "unapproved"):
         v = mr.user.model_dump()
         v["status"] = mr.object_attributes.action
@@ -189,13 +228,23 @@ async def merge_request(
             )
 
     mri = await dbh.get_merge_request_ref_infos(mr)
-    card = render(mri)
+    should_be_collapsed: bool = mr.object_attributes.draft or mr.object_attributes.work_in_progress
+    card = render(
+        mri,
+        collapsed=should_be_collapsed,
+        show_collapsible=should_be_collapsed,
+    )
     summary = (
         f"MR {mri.merge_request_payload.object_attributes.state}:"
         f" {mri.merge_request_payload.object_attributes.title}\n"
         f"on {mri.merge_request_payload.project.path_with_namespace}"
     )
 
+    convtoken_to_msgrefs = await get_or_create_message_refs(
+        mri.merge_request_ref_id,
+        conversation_tokens,
+    )
+
     if mr.object_attributes.action in ("open", "reopen") or True:
         async with httpx.AsyncClient() as client:
             for ct in conversation_tokens:
@@ -215,21 +264,13 @@ async def merge_request(
                     or not participant_found,
                 )
 
-    if (
-        mr.object_attributes.action
-        in (
-            "merge",
-            "close",
-        )
-        or mr.object_attributes.state
-        in (
-            "closed",
-            "merged",
-        )
-        or mr.object_attributes.draft
-        or mr.object_attributes.work_in_progress
+    if mr.object_attributes.action in (
+        "merge",
+        "close",
+    ) or mr.object_attributes.state in (
+        "closed",
+        "merged",
     ):
-
         message_expiration = datetime.timedelta(seconds=30)
         async with await database.acquire() as connection:
             res = await connection.fetch(