Merge pull request #27 from teams-notifier/feat-reset-approval-on-new-commits

feat: remove approvals on new commits/push…

Author: babs

app.py

@@ -93,6 +93,7 @@ async def handle_webhook(
     x_conversation_token: Annotated[str, Header()],
     x_gitlab_token: Annotated[str, Header()],
     filter_on_participant_ids: str | None = None,
+    new_commits_revoke_approvals: bool = True,
 ):
     validate_gitlab_token(x_gitlab_token)
     conversation_tokens = list(
@@ -114,7 +115,12 @@ async def handle_webhook(
                         detail="filter_on_participant_ids must be a list of comma separated integers",
                     )
 
-            await webhook.merge_request(payload, conversation_tokens, participant_ids_filter)
+            await webhook.merge_request(
+                payload,
+                conversation_tokens,
+                participant_ids_filter,
+                new_commits_revoke_approvals,
+            )
         if isinstance(payload, PipelinePayload):
             await webhook.pipeline(payload, conversation_tokens)
         if isinstance(payload, EmojiPayload):

gitlab_model.py

@@ -37,6 +37,7 @@ class GLMRAttributes(BaseModel, extra="allow"):
     url: str
     action: str
     updated_at: str | None
+    oldrev: str | None = None
 
     # https://docs.gitlab.com/ee/api/merge_requests.html#merge-status
     detailed_merge_status: str  # mergeable, not_approved

webhook/merge_request.py

@@ -142,6 +142,7 @@ async def merge_request(
     mr: MergeRequestPayload,
     conversation_tokens: list[str],
     participant_ids_filter: list[int],
+    new_commits_revoke_approvals: bool,
 ):
     payload_fingerprint = hashlib.sha256(mr.model_dump_json().encode("utf8")).hexdigest()
     logger.debug("payload fingerprint: %s", payload_fingerprint)
@@ -176,6 +177,22 @@ async def merge_request(
             if row is not None:
                 mri.merge_request_extra_state = row["merge_request_extra_state"]
 
+            # If update and oldrev field is set => new commit in MR
+            # Approvals must be reset
+            if new_commits_revoke_approvals and mr.object_attributes.oldrev:
+                row = await connection.fetchrow(
+                    """UPDATE merge_request_ref
+                        SET merge_request_extra_state = jsonb_set(merge_request_extra_state, $1, $2::jsonb)
+                        WHERE merge_request_ref_id = $3
+                        RETURNING merge_request_extra_state""",
+                    ["approvers"],
+                    {},
+                    mri.merge_request_ref_id,
+                )
+                print(mri.merge_request_ref_id)
+                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