fix: fix merged pr still marked as prs to merge

christophehurpeau · Mar 9, 2023 · 087a0e7 · 087a0e7
1 parent 7f4b235
commit 087a0e7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/src/events/pr-handlers/actions/editOpenedPR.ts b/src/events/pr-handlers/actions/editOpenedPR.ts
@@ -255,6 +255,7 @@ export const editOpenedPR = async <
               headSha: pullRequest.head.sha,
               title,
               isDraft: pullRequest.draft === true,
+              isClosed: !!pullRequest.closed_at,
               checksConclusion: checksAndStatuses.checksConclusionRecord,
               statusesConclusion: checksAndStatuses.statusesConclusionRecord,
               ...(reviews ? { reviews } : {}),

diff --git a/src/events/pr-handlers/closed.ts b/src/events/pr-handlers/closed.ts
@@ -29,6 +29,15 @@ export default function closed(app: Probot, appContext: AppContext): void {
           reviewflowPrContext,
         });
 
+        const updateClosedPromise = appContext.mongoStores.prs.partialUpdateOne(
+          reviewflowPrContext.reviewflowPr,
+          {
+            $set: {
+              isClosed: true,
+            },
+          },
+        );
+
         if ((pullRequest as any).merged) {
           const isNotFork = pullRequest.head.repo.id === repo.id;
           const options = parseOptions(
@@ -37,6 +46,7 @@ export default function closed(app: Probot, appContext: AppContext): void {
           );
 
           await Promise.all([
+            updateClosedPromise,
             repoContext.removePrFromAutomergeQueue(
               context,
               pullRequest,
@@ -57,6 +67,7 @@ export default function closed(app: Probot, appContext: AppContext): void {
           ]);
         } else {
           await Promise.all([
+            updateClosedPromise,
             repoContext.removePrFromAutomergeQueue(
               context,
               pullRequest,

diff --git a/src/events/pr-handlers/utils/createPullRequestContext.ts b/src/events/pr-handlers/utils/createPullRequestContext.ts
@@ -46,6 +46,7 @@ export const getReviewflowPrContext = async <T extends EventsWithRepository>(
       pr: prEmbed,
       commentId: comment.id,
       title: 'title' in pullRequest ? pullRequest.title : 'Unknown Title',
+      isClosed: 'closed_at' in pullRequest ? !!pullRequest.closed_at : false,
       isDraft: 'draft' in pullRequest && pullRequest.draft === true,
       reviews: createEmptyReviews(),
       assignees:
@@ -87,6 +88,7 @@ export const getReviewflowPrContext = async <T extends EventsWithRepository>(
     repo: repoContext.repoEmbed,
     pr: prEmbed,
     title: 'title' in pullRequest ? pullRequest.title : 'Unknown Title',
+    isClosed: 'closed_at' in pullRequest ? !!pullRequest.closed_at : false,
     isDraft: 'draft' in pullRequest && pullRequest.draft === true,
     commentId,
     reviews: groupReviewsWithState(reviewersWithState!),

diff --git a/src/mongo.ts b/src/mongo.ts
@@ -164,6 +164,7 @@ export interface ReviewflowPr extends MongoBaseModel {
   headSha?: string;
   title: string;
   isDraft: boolean;
+  isClosed: boolean;
   lastLintStatusesCommit?: string;
   lintStatuses?: ReviewflowStatus[];
   lastFlowStatusCommit?: string;

diff --git a/src/slack/home.ts b/src/slack/home.ts
@@ -37,6 +37,7 @@ export const createSlackHomeWorker = (mongoStores: MongoStores) => {
         {
           'account.id': member.org.id,
           'assignees.id': member.user.id,
+          isClosed: false,
           'reviews.reviewRequested': { $exists: true, $eq: [] },
           'reviews.changesRequested': { $exists: true, $eq: [] },
           'reviews.approved': { $exists: true, $ne: [] },