Add graphql types for merged and review requested

Author: gmazoyer

backend/infrahub/graphql/types/event.py

@@ -136,6 +136,28 @@ class Meta:
     payload = Field(GenericScalar, required=True)
 
 
+class ProposedChangeReviewRequestedEvent(ObjectType):
+    class Meta:
+        interfaces = (EventNodeInterface,)
+
+    requested_by_account_id = String(
+        required=True, description="The ID of the user who requested the proposed change to be reviewed"
+    )
+    requested_by_account_name = String(
+        required=True, description="The name of the user who requested the proposed change to be reviewed"
+    )
+    payload = Field(GenericScalar, required=True)
+
+
+class ProposedChangeMergedEvent(ObjectType):
+    class Meta:
+        interfaces = (EventNodeInterface,)
+
+    merged_by_account_id = String(required=True, description="The ID of the user who merged the proposed change")
+    merged_by_account_name = String(required=True, description="The name of the user who merged the proposed change")
+    payload = Field(GenericScalar, required=True)
+
+
 # ---------------------------------------
 # Node/Object events
 # ---------------------------------------
@@ -190,5 +212,7 @@ class Meta:
     events.ProposedChangeApprovalRevokedEvent.event_name: ProposedChangeReviewRevokedEvent,
     events.ProposedChangeRejectedEvent.event_name: ProposedChangeReviewEvent,
     events.ProposedChangeRejectionRevokedEvent.event_name: ProposedChangeReviewRevokedEvent,
+    events.ProposedChangeReviewRequestedEvent.event_name: ProposedChangeReviewRequestedEvent,
+    events.ProposedChangeMergedEvent.event_name: ProposedChangeMergedEvent,
     "undefined": StandardEvent,
 }

backend/infrahub/task_manager/event.py

@@ -184,6 +184,18 @@ def _return_proposed_change_reviewer_decision(self) -> dict[str, Any]:
     def _return_proposed_change_reviewer_former_decision(self) -> dict[str, Any]:
         return {"reviewer_former_decision": self.resource.get("infrahub.proposed_change.reviewer_former_decision")}
 
+    def _return_proposed_change_requested_by(self) -> dict[str, Any]:
+        return {
+            "requested_by_account_id": self.resource.get("infrahub.proposed_change.requested_by_account_id"),
+            "requested_by_account_name": self.resource.get("infrahub.proposed_change.requested_by_account_name"),
+        }
+
+    def _return_proposed_change_merged_by(self) -> dict[str, Any]:
+        return {
+            "merged_by_account_id": self.resource.get("infrahub.proposed_change.merged_by_account_id"),
+            "merged_by_account_name": self.resource.get("infrahub.proposed_change.merged_by_account_name"),
+        }
+
     def _return_event_specifics(self) -> dict[str, Any]:
         """Return event specific data based on the type of event being processed"""
 
@@ -214,6 +226,10 @@ def _return_event_specifics(self) -> dict[str, Any]:
                     **self._return_proposed_change_reviewer(),
                     **self._return_proposed_change_reviewer_former_decision(),
                 }
+            case "infrahub.proposed_change.review_requested":
+                event_specifics = self._return_proposed_change_requested_by()
+            case "infrahub.proposed_change.merged":
+                event_specifics = self._return_proposed_change_merged_by()
 
         return event_specifics