fix: update slack home after review is dismissed even if repo is ignored

christophehurpeau · Dec 31, 2021 · 7e85dd4 · 7e85dd4
1 parent 91394f3
commit 7e85dd4
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/src/events/pr-handlers/reviewDismissed.ts b/src/events/pr-handlers/reviewDismissed.ts
@@ -26,6 +26,7 @@ export default function reviewDismissed(
       const reviewerGroup = repoContext.getReviewerGroup(reviewer.login);
 
       if (
+        reviewflowPrContext &&
         !repoContext.shouldIgnore &&
         reviewerGroup &&
         repoContext.config.labels.review[reviewerGroup]
@@ -46,19 +47,18 @@ export default function reviewDismissed(
           { includesReviewerGroup: true },
         );
 
+        const isApproved =
+          hasApprovals &&
+          !hasRequestedReviewsForGroup &&
+          !hasChangesRequestedInReviews;
+
         await updateReviewStatus(
           updatedPr,
           context,
           repoContext,
           reviewerGroup,
           {
-            add: [
-              !hasApprovals && 'needsReview',
-              hasApprovals &&
-                !hasRequestedReviewsForGroup &&
-                !hasChangesRequestedInReviews &&
-                'approved',
-            ],
+            add: [!hasApprovals && 'needsReview', isApproved && 'approved'],
             remove: [
               !hasRequestedReviewsForGroup &&
                 !hasChangesRequestedInReviews &&
@@ -68,22 +68,22 @@ export default function reviewDismissed(
             ],
           },
         );
+      }
 
-        if (updatedPr.assignees) {
-          updatedPr.assignees.forEach((assignee) => {
-            if (assignee) {
-              repoContext.slack.updateHome(assignee.login);
-            }
-          });
-        }
-        if (
-          !updatedPr.assignees ||
-          !updatedPr.assignees.some(
-            (assignee) => assignee && assignee.login === reviewer.login,
-          )
-        ) {
-          repoContext.slack.updateHome(reviewer.login);
-        }
+      if (pullRequest.assignees) {
+        pullRequest.assignees.forEach((assignee) => {
+          if (assignee) {
+            repoContext.slack.updateHome(assignee.login);
+          }
+        });
+      }
+      if (
+        !pullRequest.assignees ||
+        !pullRequest.assignees.some(
+          (assignee) => assignee && assignee.login === reviewer.login,
+        )
+      ) {
+        repoContext.slack.updateHome(reviewer.login);
       }
 
       if (repoContext.slack) {