Combine mutually exclusive actions

DefinitelyTyped · Jan 21, 2021 · 858a194 · 858a194
1 parent fbd480b
commit 858a194
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/compute-pr-actions.ts b/src/compute-pr-actions.ts
@@ -52,8 +52,7 @@ export interface Actions {
     targetColumn?: ColumnName;
     labels: LabelName[];
     responseComments: Comments.Comment[];
-    shouldClose: boolean;
-    shouldMerge: boolean;
+    state?: "close" | "merge";
     shouldUpdateLabels: boolean;
     shouldUpdateProjectColumn: boolean;
     shouldRemoveFromActiveColumns: boolean;
@@ -64,8 +63,6 @@ function createDefaultActions(): Actions {
         targetColumn: "Other",
         labels: [],
         responseComments: [],
-        shouldClose: false,
-        shouldMerge: false,
         shouldUpdateLabels: true,
         shouldUpdateProjectColumn: true,
         shouldRemoveFromActiveColumns: false,
@@ -76,8 +73,6 @@ function createEmptyActions(): Actions {
     return {
         labels: [],
         responseComments: [],
-        shouldClose: false,
-        shouldMerge: false,
         shouldUpdateLabels: false,
         shouldUpdateProjectColumn: false,
         shouldRemoveFromActiveColumns: false,
@@ -334,7 +329,7 @@ export function process(prInfo: BotResult,
                                          (info.tooManyOwners || info.hasMultiplePackages) ? [] : info.otherOwners,
                                          headCommitAbbrOid));
             if (info.hasValidMergeRequest) {
-                context.shouldMerge = true;
+                context.state = "merge";
                 context.targetColumn = "Recently Merged";
             } else {
                 context.targetColumn = "Waiting for Author to Merge";
@@ -348,7 +343,7 @@ export function process(prInfo: BotResult,
         }
     }
 
-    if (!context.shouldMerge) {
+    if (!context.state) {
         if (info.mergeRequestUser) {
             post(Comments.WaitUntilMergeIsOK(info.mergeRequestUser, headCommitAbbrOid, urls.workflow));
         }
@@ -385,7 +380,7 @@ function makeStaleness(now: Date, author: string, otherOwners: string[]) { // cu
             }
             if (state === "done") {
                 if (doneColumn === "CLOSE") {
-                    context.shouldClose = true;
+                    context.state = "close";
                     context.shouldRemoveFromActiveColumns = true;
                 } else {
                     context.targetColumn = doneColumn;

diff --git a/src/execute-pr-actions.ts b/src/execute-pr-actions.ts
@@ -101,20 +101,20 @@ function getMutationsForCommentRemovals(actions: Actions, botComments: ParsedCom
     });
 }
 
-function getMutationsForChangingPRState(actions: Actions, pr: PR_repository_pullRequest) {
-    return [
-        actions.shouldMerge
-            ? createMutation<schema.MergePullRequestInput>("mergePullRequest", {
+function* getMutationsForChangingPRState(actions: Actions, pr: PR_repository_pullRequest) {
+    switch (actions.state) {
+        case "close":
+            yield createMutation<schema.ClosePullRequestInput>("closePullRequest", { pullRequestId: pr.id });
+            break;
+        case "merge":
+            yield createMutation<schema.MergePullRequestInput>("mergePullRequest", {
                 commitHeadline: `🤖 Merge PR #${pr.number} ${pr.title} by @${pr.author?.login ?? "(ghost)"}`,
                 expectedHeadOid: pr.headRefOid,
                 mergeMethod: "SQUASH",
                 pullRequestId: pr.id,
-            })
-            : null,
-        actions.shouldClose
-            ? createMutation<schema.ClosePullRequestInput>("closePullRequest", { pullRequestId: pr.id })
-            : null
-    ];
+            });
+            break;
+    }
 }
 
 async function getProjectBoardColumnIdByName(name: string): Promise<string> {