Merge pull request #112 from gentlementlegen/fix/deadline-message

fix: removed deadline message on issue assigned

src/adapters/supabase/helpers/user.ts

@@ -1,7 +1,6 @@
 import { SupabaseClient } from "@supabase/supabase-js";
-import { Super } from "./supabase";
 import { Context } from "../../../types/context";
-import { addCommentToIssue } from "../../../utils/issue";
+import { Super } from "./supabase";
 
 type Wallet = {
   address: string;
@@ -17,8 +16,7 @@ export class User extends Super {
     if ((error && !data) || !data.wallets?.address) {
       this.context.logger.error("No wallet address found", { userId, issueNumber });
       if (this.context.config.startRequiresWallet) {
-        await addCommentToIssue(this.context, this.context.logger.error(this.context.config.emptyWalletText, { userId, issueNumber }).logMessage.diff);
-        throw new Error("No wallet address found");
+        throw this.context.logger.error(this.context.config.emptyWalletText, { userId, issueNumber });
       }
     } else {
       this.context.logger.info("Successfully fetched wallet", { userId, address: data.wallets?.address });

src/handlers/shared/start.ts

@@ -4,7 +4,7 @@ import { addAssignees, addCommentToIssue, getAssignedIssues, getPendingOpenedPul
 import { HttpStatusCode, Result } from "../result-types";
 import { hasUserBeenUnassigned } from "./check-assignments";
 import { checkTaskStale } from "./check-task-stale";
-import { generateAssignmentComment, getDeadline } from "./generate-assignment-comment";
+import { generateAssignmentComment } from "./generate-assignment-comment";
 import { getUserRoleAndTaskLimit } from "./get-user-task-limit-and-role";
 import structuredMetadata from "./structured-metadata";
 import { assignTableComment } from "./table";
@@ -167,10 +167,9 @@ ${issues}
     }
   }
 
-  const deadline = getDeadline(labels);
   const toAssignIds = await fetchUserIds(context, toAssign);
 
-  const assignmentComment = await generateAssignmentComment(context, issue.created_at, issue.number, sender.id, deadline);
+  const assignmentComment = await generateAssignmentComment(context, issue.created_at, issue.number, sender.id, null);
   const logMessage = logger.info("Task assigned successfully", {
     taskDeadline: assignmentComment.deadline,
     taskAssignees: toAssignIds,

src/handlers/user-start-stop.ts

@@ -1,7 +1,7 @@
 import { Repository } from "@octokit/graphql-schema";
 import { Context, isIssueCommentEvent, Label } from "../types";
 import { QUERY_CLOSING_ISSUE_REFERENCES } from "../utils/get-closing-issue-references";
-import { addCommentToIssue, closePullRequestForAnIssue, getOwnerRepoFromHtmlUrl } from "../utils/issue";
+import { closePullRequestForAnIssue, getOwnerRepoFromHtmlUrl } from "../utils/issue";
 import { HttpStatusCode, Result } from "./result-types";
 import { getDeadline } from "./shared/generate-assignment-comment";
 import { start } from "./shared/start";
@@ -60,9 +60,6 @@ export async function userSelfAssign(context: Context<"issues.assigned">): Promi
     return { status: HttpStatusCode.NOT_MODIFIED };
   }
 
-  const users = issue.assignees.map((user) => `@${user?.login}`).join(", ");
-
-  await addCommentToIssue(context, `${users} the deadline is at ${deadline}`);
   return { status: HttpStatusCode.OK };
 }
 

tests/http/run.http

@@ -55,12 +55,12 @@ X-GitHub-Delivery: mock-delivery-id
         }
       ],
       "user": {
-        "login": "ubiquity-ubiquibot",
+        "login": "{{LOGIN}}",
         "id": 12345678,
         "node_id": "MDQ6VXNlcjEyMzQ1Njc4",
         "avatar_url": "https://avatars.githubusercontent.com/u/12345678?v=4",
-        "url": "https://api.github.com/users/ubiquity-ubiquibot",
-        "html_url": "https://github.com/ubiquity-ubiquibot",
+        "url": "https://api.github.com/users/{{LOGIN}}",
+        "html_url": "https://github.com/{{LOGIN}}",
         "type": "User",
         "site_admin": false
       },
@@ -82,12 +82,12 @@ X-GitHub-Delivery: mock-delivery-id
     "id": 1234567890,
     "node_id": "IC_kwDOA1234567",
     "user": {
-      "login": "ubiquity-ubiquibot",
+      "login": "{{LOGIN}}",
       "id": 163369652,
       "node_id": "MDQ6VXNlcjEyMzQ1Njc4",
       "avatar_url": "https://avatars.githubusercontent.com/u/12345678?v=4",
-      "url": "https://api.github.com/users/ubiquity-ubiquibot",
-      "html_url": "https://github.com/ubiquity-ubiquibot",
+      "url": "https://api.github.com/users/{{LOGIN}}",
+      "html_url": "https://github.com/{{LOGIN}}",
       "type": "User",
       "site_admin": false
     },
@@ -134,12 +134,12 @@ X-GitHub-Delivery: mock-delivery-id
     "description": "Ubiquity Organization"
   },
   "sender": {
-    "login": "ubiquity-ubiquibot",
+    "login": "{{LOGIN}}",
     "id": 163369652,
     "node_id": "MDQ6VXNlcjEyMzQ1Njc4",
     "avatar_url": "https://avatars.githubusercontent.com/u/12345678?v=4",
-    "url": "https://api.github.com/users/ubiquity-ubiquibot",
-    "html_url": "https://github.com/ubiquity-ubiquibot",
+    "url": "https://api.github.com/users/{{LOGIN}}",
+    "html_url": "https://github.com/{{LOGIN}}",
     "type": "User",
     "site_admin": false
   }

tests/main.test.ts

@@ -2,7 +2,7 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect } from "@j
 import { drop } from "@mswjs/data";
 import { TransformDecodeError, Value } from "@sinclair/typebox/value";
 import { createClient } from "@supabase/supabase-js";
-import { cleanLogString, Logs } from "@ubiquity-os/ubiquity-os-logger";
+import { cleanLogString, LogReturn, Logs } from "@ubiquity-os/ubiquity-os-logger";
 import dotenv from "dotenv";
 import { createAdapters } from "../src/adapters";
 import { HttpStatusCode } from "../src/handlers/result-types";
@@ -211,7 +211,7 @@ describe("User start/stop", () => {
     const context = createContext(issue, sender, "/start", "2", true) as Context<"issue_comment.created">;
 
     context.adapters = createAdapters(getSupabase(false), context);
-    await expect(userStartStop(context)).rejects.toThrow("No wallet address found");
+    await expect(userStartStop(context)).rejects.toBeInstanceOf(LogReturn);
   });
 
   test("User can't start an issue that's closed", async () => {