feat: multiple prs handling

src/data-collection/collect-linked-pulls.ts

@@ -20,7 +20,7 @@ type IssueWithClosedByPRs = {
   };
 };
 
-export async function collectLinkedMergedPull(issue: IssueParams) {
+export async function collectLinkedMergedPulls(issue: IssueParams) {
   const octokit = getOctokitInstance();
   const { owner, repo, issue_number } = issue;
 
@@ -30,5 +30,5 @@ export async function collectLinkedMergedPull(issue: IssueParams) {
     issue_number,
   });
 
-  return result.repository.issue.closedByPullRequestsReferences.edges.map((edge) => edge.node).slice(-1);
+  return result.repository.issue.closedByPullRequestsReferences.edges.map((edge) => edge.node);
 }

src/issue-activity.ts

@@ -1,7 +1,7 @@
 import { CommentAssociation, CommentKind } from "./configuration/comment-types";
 import configuration from "./configuration/config-reader";
 import { DataCollectionConfiguration } from "./configuration/data-collection-config";
-import { collectLinkedMergedPull } from "./data-collection/collect-linked-pulls";
+import { collectLinkedMergedPulls } from "./data-collection/collect-linked-pulls";
 import {
   GitHubIssue,
   GitHubIssueComment,
@@ -47,7 +47,7 @@ export class IssueActivity {
 
   private async _getLinkedReviews(): Promise<Review[]> {
     logger.debug("Trying to fetch linked pull-requests for", this._issueParams);
-    const pulls = await collectLinkedMergedPull(this._issueParams);
+    const pulls = (await collectLinkedMergedPulls(this._issueParams)).slice(-1);
     logger.debug("Collected linked pull-requests", { pulls });
     const promises = pulls
       .map(async (pull) => {

src/run.ts

@@ -1,8 +1,10 @@
 import configuration from "./configuration/config-reader";
+import { collectLinkedMergedPulls } from "./data-collection/collect-linked-pulls";
 import githubCommentModuleInstance from "./helpers/github-comment-module-instance";
 import { getSortedPrices } from "./helpers/label-price-extractor";
 import logger from "./helpers/logger";
 import { IssueActivity } from "./issue-activity";
+import { getOctokitInstance } from "./octokit";
 import program from "./parser/command-line";
 import { Processor } from "./parser/processor";
 import { parseGitHubUrl } from "./start";
@@ -13,6 +15,11 @@ export async function run() {
     if (eventPayload.issue.state_reason !== "completed") {
       return logger.info("Issue was not closed as completed. Skipping.").logMessage.raw;
     }
+    if (!(await preCheck())) {
+      const result = logger.error("All linked pull requests must be closed to generate rewards.");
+      await githubCommentModuleInstance.postComment(result.logMessage.diff);
+      return result.logMessage.raw;
+    }
     const issue = parseGitHubUrl(eventPayload.issue.html_url);
     const activity = new IssueActivity(issue);
     await activity.init();
@@ -28,3 +35,24 @@ export async function run() {
     return logger.error(`${eventName} is not supported, skipping.`).logMessage.raw;
   }
 }
+
+async function preCheck() {
+  const { eventPayload } = program;
+
+  const issue = parseGitHubUrl(eventPayload.issue.html_url);
+  const linkedPulls = await collectLinkedMergedPulls(issue);
+  logger.debug("Checking open linked pull-requests for", {
+    issue,
+    linkedPulls,
+  });
+  if (linkedPulls.some((linkedPull) => linkedPull.state === "OPEN")) {
+    await getOctokitInstance().rest.issues.update({
+      owner: issue.owner,
+      repo: issue.repo,
+      issue_number: issue.issue_number,
+      state: "open",
+    });
+    return false;
+  }
+  return true;
+}

src/types/requests.ts

@@ -10,6 +10,7 @@ export const LINKED_PULL_REQUESTS = /* GraphQL */ `
               title
               number
               url
+              state
               author {
                 login
                 ... on User {

tests/pre-check.test.ts

@@ -0,0 +1,132 @@
+import { drop } from "@mswjs/data";
+import { http, HttpResponse } from "msw";
+import "../src/parser/command-line";
+import { db } from "./__mocks__/db";
+import dbSeed from "./__mocks__/db-seed.json";
+import { server } from "./__mocks__/node";
+
+const issueUrl = "https://github.com/ubiquity/work.ubq.fi/issues/69";
+
+jest.mock("@actions/github", () => ({
+  context: {
+    runId: "1",
+    payload: {
+      repository: {
+        html_url: "https://github.com/ubiquibot/conversation-rewards",
+      },
+    },
+  },
+}));
+
+jest.mock("@octokit/plugin-paginate-graphql", () => ({
+  paginateGraphQL() {
+    return {
+      graphql: {
+        paginate() {
+          return {
+            repository: {
+              issue: {
+                closedByPullRequestsReferences: {
+                  edges: [
+                    {
+                      node: {
+                        id: "PR_kwDOKzVPS85zXUoj",
+                        title: "fix: add state to sorting manager for bottom and top",
+                        number: 70,
+                        url: "https://github.com/ubiquity/work.ubq.fi/pull/70",
+                        state: "OPEN",
+                        author: {
+                          login: "0x4007",
+                          id: 4975670,
+                        },
+                        repository: {
+                          owner: {
+                            login: "ubiquity",
+                          },
+                          name: "work.ubq.fi",
+                        },
+                      },
+                    },
+                    {
+                      node: {
+                        id: "PR_kwDOKzVPS85zXUok",
+                        title: "fix: add state to sorting manager for bottom and top 2",
+                        number: 71,
+                        url: "https://github.com/ubiquity/work.ubq.fi/pull/71",
+                        state: "MERGED",
+                        author: {
+                          login: "0x4007",
+                          id: 4975670,
+                        },
+                        repository: {
+                          owner: {
+                            login: "ubiquity",
+                          },
+                          name: "work.ubq.fi",
+                        },
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          };
+        },
+      },
+    };
+  },
+}));
+
+jest.mock("../src/parser/command-line", () => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const cfg = require("./__mocks__/results/valid-configuration.json");
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const dotenv = require("dotenv");
+  dotenv.config();
+  return {
+    stateId: 1,
+    eventName: "issues.closed",
+    authToken: process.env.GITHUB_TOKEN,
+    ref: "",
+    eventPayload: {
+      issue: {
+        html_url: issueUrl,
+        number: 1,
+        state_reason: "completed",
+      },
+      repository: {
+        name: "conversation-rewards",
+        owner: {
+          login: "ubiquibot",
+          id: 76412717,
+        },
+      },
+    },
+    settings: JSON.stringify(cfg),
+  };
+});
+
+beforeAll(() => server.listen());
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+
+describe("Pre-check tests", () => {
+  beforeEach(async () => {
+    drop(db);
+    for (const table of Object.keys(dbSeed)) {
+      const tableName = table as keyof typeof dbSeed;
+      for (const row of dbSeed[tableName]) {
+        db[tableName].create(row);
+      }
+    }
+  });
+
+  it("Should reopen the issue and not generate rewards if linked pull-requests are still open", async () => {
+    const patchMock = jest.fn(() => HttpResponse.json({}));
+    server.use(http.patch("https://api.github.com/repos/ubiquity/work.ubq.fi/issues/69", patchMock, { once: true }));
+    const module = (await import("../src/index")) as unknown as { default: Promise<string> };
+    const result = await module.default;
+    expect(result).toEqual("All linked pull requests must be closed to generate rewards.");
+    expect(patchMock).toHaveBeenCalled();
+  });
+});