fix: add check for empty appeal duration (#376)

* refactor: add func to check if appeal duration is empty

* fix: add check for empty appeal duration

Author: bsushmith

core/appeal/service.go

@@ -28,6 +28,7 @@ const (
 	AuditKeyDeleteApprover = "appeal.deleteApprover"
 
 	RevokeReasonForExtension = "Automatically revoked for grant extension"
+	PermanentDuration        = "Permanent"
 )
 
 var TimeNow = time.Now
@@ -785,6 +786,12 @@ func (s *Service) getPoliciesMap(ctx context.Context) (map[string]map[uint]*doma
 func getApprovalNotifications(appeal *domain.Appeal) []domain.Notification {
 	notifications := []domain.Notification{}
 	approval := appeal.GetNextPendingApproval()
+
+	duration := PermanentDuration
+	if !appeal.IsDurationEmpty() {
+		duration = appeal.Options.Duration
+	}
+
 	if approval != nil {
 		for _, approver := range approval.Approvers {
 			notifications = append(notifications, domain.Notification{
@@ -804,7 +811,7 @@ func getApprovalNotifications(appeal *domain.Appeal) []domain.Notification {
 						"approval_step": approval.Name,
 						"actor":         approver,
 						"details":       appeal.Details,
-						"duration":      appeal.Options.Duration,
+						"duration":      duration,
 					},
 				},
 			})

domain/appeal.go

@@ -83,11 +83,7 @@ func (a *Appeal) Cancel() {
 func (a *Appeal) Approve() error {
 	a.Status = AppealStatusApproved
 
-	if a.Options == nil || a.Options.Duration == "" {
-		return nil
-	}
-
-	duration, err := time.ParseDuration(a.Options.Duration)
+	duration, err := a.GetDuration()
 	if err != nil {
 		return err
 	}
@@ -102,6 +98,23 @@ func (a *Appeal) Approve() error {
 	return nil
 }
 
+func (a *Appeal) GetDuration() (time.Duration, error) {
+	if a.IsDurationEmpty() {
+		return 0 * time.Second, nil
+	}
+
+	duration, err := time.ParseDuration(a.Options.Duration)
+	if err != nil {
+		return 0 * time.Second, err
+	}
+
+	return duration, nil
+}
+
+func (a *Appeal) IsDurationEmpty() bool {
+	return a.Options == nil || a.Options.Duration == "" || a.Options.Duration == "0h"
+}
+
 func (a *Appeal) Reject() {
 	a.Status = AppealStatusRejected
 }