Merge pull request #123 from ubiquity-os-marketplace/development

Merge development into main
ubiquity-os-marketplace · Jan 14, 2025 · abe8be1 · abe8be1
2 parents ecb726f + 80e980e
commit abe8be1
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 3 deletions.
diff --git a/.github/workflows/worker-deploy.yml b/.github/workflows/worker-deploy.yml
@@ -54,12 +54,14 @@ jobs:
             SUPABASE_URL
             SUPABASE_KEY
             BOT_USER_ID
+            CLOUDFLARE_ACCOUNT_ID
             ${{ secrets.KERNEL_PUBLIC_KEY && secrets.KERNEL_PUBLIC_KEY != '' && 'KERNEL_PUBLIC_KEY' || '' }}
         env:
           SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
           SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
           BOT_USER_ID: ${{ secrets.BOT_USER_ID }}
           KERNEL_PUBLIC_KEY: ${{ secrets.KERNEL_PUBLIC_KEY }}
+          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 
       - name: Update manifest.json worker url
         uses: actions/github-script@v7

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/handlers/user-start-stop.ts b/src/handlers/user-start-stop.ts
@@ -105,7 +105,7 @@ export async function userPullRequest(context: Context<"pull_request.opened" | "
         } as unknown as Context<"issue_comment.created">["payload"]["issue"];
         context.payload = Object.assign({ issue: issueWithComment }, context.payload);
         try {
-          return await start(context, issueWithComment, payload.sender, []);
+          return await start(context, issueWithComment, pull_request.user ?? payload.sender, []);
         } catch (error) {
           context.logger.info("The task could not be started, closing linked pull-request.", { pull_request });
           await closePullRequest(context, { number: pull_request.number });

diff --git a/src/utils/issue.ts b/src/utils/issue.ts
@@ -167,7 +167,7 @@ export async function addAssignees(context: Context, issueNo: number, assignees:
       assignees,
     });
   } catch (e: unknown) {
-    throw new Error(context.logger.error("Adding the assignee failed", { assignee: assignees, issueNo, error: e as Error }).logMessage.raw);
+    throw context.logger.error("Adding the assignee failed", { assignee: assignees, issueNo, error: e as Error });
   }
 
   await confirmMultiAssignment(context, issueNo, assignees);

diff --git a/tests/start.test.ts b/tests/start.test.ts
@@ -73,4 +73,64 @@ describe("Collaborator tests", () => {
       },
     });
   });
+
+  it("should assign the author of the pull-request and not the sender of the edit", async () => {
+    db.users.create({
+      id: 3,
+      login: "ubiquity-os-sender",
+      role: "admin",
+    });
+    const issue = db.issue.findFirst({ where: { id: { equals: 1 } } }) as unknown as Issue;
+    const sender = db.users.findFirst({ where: { id: { equals: 3 } } }) as unknown as PayloadSender;
+    const context = createContext(issue, sender, "") as Context<"pull_request.edited">;
+    context.eventName = "pull_request.edited";
+    context.payload.pull_request = {
+      html_url: "https://github.com/ubiquity-os-marketplace/command-start-stop",
+      number: 1,
+      user: {
+        id: 1,
+        login: "ubiquity-os-author",
+      },
+    } as unknown as Context<"pull_request.edited">["payload"]["pull_request"];
+    context.octokit = {
+      graphql: {
+        paginate: jest.fn(() =>
+          Promise.resolve({
+            repository: {
+              pullRequest: {
+                closingIssuesReferences: {
+                  nodes: [
+                    {
+                      assignees: {
+                        nodes: [],
+                      },
+                      labels: {
+                        nodes: [{ name: "Time: <1 Hour" }],
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          })
+        ),
+      },
+    } as unknown as Context<"pull_request.edited">["octokit"];
+
+    jest.unstable_mockModule("@supabase/supabase-js", () => ({
+      createClient: jest.fn(),
+    }));
+    jest.unstable_mockModule("../src/adapters", () => ({
+      createAdapters: jest.fn(),
+    }));
+    const start = jest.fn();
+    jest.unstable_mockModule("../src/handlers/shared/start", () => ({
+      start,
+    }));
+    const { startStopTask } = await import("../src/plugin");
+    await startStopTask(context);
+    // Make sure the author is the one who starts and not the sender who modified the comment
+    expect(start).toHaveBeenCalledWith(expect.anything(), expect.anything(), { id: 1, login: "ubiquity-os-author" }, []);
+    start.mockReset();
+  });
 });