feat: add support for approval_id in update_approval api

Author: anjaliagg9791

api/handler/v1beta1/approval.go

@@ -93,6 +93,7 @@ func (s *GRPCServer) UpdateApproval(ctx context.Context, req *guardianv1beta1.Up
 	a, err := s.appealService.UpdateApproval(ctx, domain.ApprovalAction{
 		AppealID:     id,
 		ApprovalName: req.GetApprovalName(),
+		ApprovalID:   req.GetApprovalId(),
 		Actor:        actor,
 		Action:       req.GetAction().GetAction(),
 		Reason:       req.GetAction().GetReason(),

core/appeal/service.go

@@ -850,9 +850,31 @@ func (s *Service) UpdateApproval(ctx context.Context, approvalAction domain.Appr
 		return nil, err
 	}
 
-	currentApproval := appeal.GetApproval(approvalAction.ApprovalName)
+	// Prioritize approval_id over approval_name
+	var currentApproval *domain.Approval
+	if approvalAction.ApprovalID != "" {
+		currentApproval = appeal.GetApproval(approvalAction.ApprovalID)
+	} else {
+		currentApproval = appeal.GetApproval(approvalAction.ApprovalName)
+	}
+
 	if currentApproval == nil {
-		return nil, fmt.Errorf("%w: %q", ErrApprovalNotFound, approvalAction.ApprovalName)
+		identifier := approvalAction.ApprovalID
+		if identifier == "" {
+			identifier = approvalAction.ApprovalName
+		}
+		return nil, fmt.Errorf("%w: %q", ErrApprovalNotFound, identifier)
+	}
+
+	// If both approval_id and approval_name are provided, verify they match
+	if approvalAction.ApprovalID != "" && approvalAction.ApprovalName != "" {
+		if currentApproval.Name != approvalAction.ApprovalName {
+			return nil, fmt.Errorf("%w: approval with id %q has name %q, but expected %q",
+				ErrInvalidUpdateApprovalParameter,
+				approvalAction.ApprovalID,
+				currentApproval.Name,
+				approvalAction.ApprovalName)
+		}
 	}
 
 	// validate previous approvals status

domain/appeal.go

@@ -373,7 +373,8 @@ const (
 
 type ApprovalAction struct {
 	AppealID     string `validate:"required" json:"appeal_id"`
-	ApprovalName string `validate:"required" json:"approval_name"`
+	ApprovalName string `json:"approval_name"`
+	ApprovalID   string `json:"approval_id"`
 	Actor        string `validate:"email" json:"actor"`
 	Action       string `validate:"required,oneof=approve reject" json:"action"`
 	Reason       string `json:"reason"`
@@ -383,8 +384,9 @@ func (a ApprovalAction) Validate() error {
 	if a.AppealID == "" {
 		return fmt.Errorf("appeal id is required")
 	}
-	if a.ApprovalName == "" {
-		return fmt.Errorf("approval name is required")
+	// Either approval_name or approval_id must be provided
+	if a.ApprovalName == "" && a.ApprovalID == "" {
+		return fmt.Errorf("either approval_name or approval_id is required")
 	}
 	if validator.New().Var(a.Actor, "email") != nil {
 		return fmt.Errorf("actor is not a valid email: %q", a.Actor)