Remove CampaignStatusErrors slice
List campaign status sentinels explicitly at resolver AnyOf call sites instead of a shared slice. Signed-off-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
@@ -34,14 +34,6 @@ var (
|
|||||||
ErrCampaignCancelled = errors.New("campaign is cancelled")
|
ErrCampaignCancelled = errors.New("campaign is cancelled")
|
||||||
)
|
)
|
||||||
|
|
||||||
// CampaignStatusErrors are client-facing invalid-state errors for non-draft campaigns.
|
|
||||||
var CampaignStatusErrors = []error{
|
|
||||||
ErrCampaignInProgress,
|
|
||||||
ErrCampaignPendingActions,
|
|
||||||
ErrCampaignCompleted,
|
|
||||||
ErrCampaignCancelled,
|
|
||||||
}
|
|
||||||
|
|
||||||
func CampaignStatusError(status coredata.AccessReviewCampaignStatus) error {
|
func CampaignStatusError(status coredata.AccessReviewCampaignStatus) error {
|
||||||
switch status {
|
switch status {
|
||||||
case coredata.AccessReviewCampaignStatusInProgress:
|
case coredata.AccessReviewCampaignStatusInProgress:
|
||||||
|
|||||||
@@ -761,7 +761,13 @@ func (r *mutationResolver) UpdateAccessReviewCampaign(ctx context.Context, input
|
|||||||
return nil, gqlutils.NotFound(ctx, err)
|
return nil, gqlutils.NotFound(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if errorx.AnyOf(err, accessreview.CampaignStatusErrors...) {
|
if errorx.AnyOf(
|
||||||
|
err,
|
||||||
|
accessreview.ErrCampaignInProgress,
|
||||||
|
accessreview.ErrCampaignPendingActions,
|
||||||
|
accessreview.ErrCampaignCompleted,
|
||||||
|
accessreview.ErrCampaignCancelled,
|
||||||
|
) {
|
||||||
return nil, gqlutils.Invalid(ctx, err)
|
return nil, gqlutils.Invalid(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -806,8 +812,14 @@ func (r *mutationResolver) StartAccessReviewCampaign(ctx context.Context, input
|
|||||||
|
|
||||||
campaign, err := r.accessReview.StartCampaign(ctx, scope, input.AccessReviewCampaignID)
|
campaign, err := r.accessReview.StartCampaign(ctx, scope, input.AccessReviewCampaignID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errorx.AnyOf(err, accessreview.ErrCampaignMissingSources) ||
|
if errorx.AnyOf(
|
||||||
errorx.AnyOf(err, accessreview.CampaignStatusErrors...) {
|
err,
|
||||||
|
accessreview.ErrCampaignMissingSources,
|
||||||
|
accessreview.ErrCampaignInProgress,
|
||||||
|
accessreview.ErrCampaignPendingActions,
|
||||||
|
accessreview.ErrCampaignCompleted,
|
||||||
|
accessreview.ErrCampaignCancelled,
|
||||||
|
) {
|
||||||
return nil, gqlutils.Invalid(ctx, err)
|
return nil, gqlutils.Invalid(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -879,7 +891,13 @@ func (r *mutationResolver) AddAccessReviewCampaignSource(ctx context.Context, in
|
|||||||
return nil, gqlutils.NotFound(ctx, err)
|
return nil, gqlutils.NotFound(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if errorx.AnyOf(err, accessreview.CampaignStatusErrors...) {
|
if errorx.AnyOf(
|
||||||
|
err,
|
||||||
|
accessreview.ErrCampaignInProgress,
|
||||||
|
accessreview.ErrCampaignPendingActions,
|
||||||
|
accessreview.ErrCampaignCompleted,
|
||||||
|
accessreview.ErrCampaignCancelled,
|
||||||
|
) {
|
||||||
return nil, gqlutils.Invalid(ctx, err)
|
return nil, gqlutils.Invalid(ctx, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user