Skip to content

Commit

Permalink
fix: Check for empty options in case of additional appeal
Browse files Browse the repository at this point in the history
  • Loading branch information
Vikash committed Mar 25, 2022
1 parent c020144 commit 90e6b2a
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions core/appeal/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ func (s *Service) MakeAction(approvalAction domain.ApprovalAction) (*domain.Appe
if err := s.approvalService.AdvanceApproval(appeal); err != nil {
return nil, err
}

} else if approvalAction.Action == domain.AppealActionNameReject {
approval.Reject()
appeal.Reject()
Expand Down Expand Up @@ -726,8 +725,14 @@ func (s *Service) isEligibleToExtend(a *domain.Appeal, p *domain.Provider, activ
}

now := s.TimeNow()
activeAppealExpDate := activeAppealsMap[a.AccountID][a.ResourceID][a.Role].Options.ExpirationDate
isEligibleForExtension := activeAppealExpDate.Sub(now) <= duration
appeal := activeAppealsMap[a.AccountID][a.ResourceID][a.Role]
var isEligibleForExtension bool
if appeal.Options != nil && appeal.Options.ExpirationDate != nil {
activeAppealExpDate := appeal.Options.ExpirationDate
isEligibleForExtension = activeAppealExpDate.Sub(now) <= duration
} else {
isEligibleForExtension = true
}
return isEligibleForExtension, nil
}
}
Expand Down

0 comments on commit 90e6b2a

Please sign in to comment.