From d4b12cfafaaa445bd71d6b90d98a9abd9f06ede4 Mon Sep 17 00:00:00 2001 From: Johannes Batzill Date: Fri, 17 Mar 2023 13:41:10 -0700 Subject: [PATCH] [MISC] Fix cleanup on PR close|merge --- internal/services/pullreq/handlers_mergeable.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/services/pullreq/handlers_mergeable.go b/internal/services/pullreq/handlers_mergeable.go index 742c20446..581ea8b50 100644 --- a/internal/services/pullreq/handlers_mergeable.go +++ b/internal/services/pullreq/handlers_mergeable.go @@ -73,14 +73,14 @@ func (s *Service) mergeCheckOnReopen(ctx context.Context, func (s *Service) mergeCheckOnClosed(ctx context.Context, event *events.Event[*pullreqevents.ClosedPayload], ) error { - return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.PullReqID) + return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.Number) } // mergeCheckOnMerged deletes the merge ref. func (s *Service) mergeCheckOnMerged(ctx context.Context, event *events.Event[*pullreqevents.MergedPayload], ) error { - return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.PullReqID) + return s.deleteMergeRef(ctx, event.Payload.PrincipalID, event.Payload.SourceRepoID, event.Payload.Number) } func (s *Service) deleteMergeRef(ctx context.Context, principalID int64, repoID int64, prNum int64) error {