Add working assign user flow

MathyouMB · MathyouMB · commit 8af73739e20d · 2025-05-17T23:38:54.000-04:00
diff --git a/src/infrastructure/discord/builders/assigneeSelectionRow.ts b/src/infrastructure/discord/builders/assigneeSelectionRow.ts
@@ -1,9 +1,9 @@
 import { ActionRowBuilder, UserSelectMenuBuilder } from "discord.js";
 
-export const buildAssigneeSelectionRow = () => {
+export const buildAssigneeSelectionRow = (githubIssueId: string) => {
   return new ActionRowBuilder<UserSelectMenuBuilder>().addComponents(
     new UserSelectMenuBuilder()
-      .setCustomId("create-issue:assigneeSelect")
+      .setCustomId(`issue:assignee:select:${githubIssueId}`)
       .setPlaceholder("Choose a user")
       .setMinValues(1)
       .setMaxValues(1),
diff --git a/src/infrastructure/discord/commands/createIssue.ts b/src/infrastructure/discord/commands/createIssue.ts
@@ -88,5 +88,5 @@ export async function handleModalSubmit(
     return;
   }
 
-  await promptAssigneeSelection(interaction);
+  await promptAssigneeSelection(interaction, result.val.githubIssueId);
 }
diff --git a/src/infrastructure/discord/commands/myIssues.ts b/src/infrastructure/discord/commands/myIssues.ts
@@ -1,7 +1,4 @@
-import {
-  SlashCommandBuilder,
-  CommandInteraction,
-} from "discord.js";
+import { SlashCommandBuilder, CommandInteraction } from "discord.js";
 import { GithubAPI } from "@infrastructure/github";
 import logger from "@config/logger";
 import githubDiscordMapJson from "../../../../data/githubDiscordMap.json";
@@ -75,7 +72,10 @@ export async function execute(interaction: CommandInteraction) {
   for (const item of assignedItems.slice(0, 5)) {
     const link = item.url ?? "https://github.com/";
 
-    const buttons = buildIssueButtonRow(item.githubId, link, ["unassign", "open"]);
+    const buttons = buildIssueButtonRow(item.githubIssueId, link, [
+      "unassign",
+      "open",
+    ]);
 
     await interaction.followUp({
       content: `## ${item.title}`,
diff --git a/src/infrastructure/discord/commands/unassignedIssues.ts b/src/infrastructure/discord/commands/unassignedIssues.ts
@@ -76,7 +76,7 @@ export async function execute(interaction: CommandInteraction) {
   for (const item of limitedItems) {
     const link = item.url ?? "https://github.com/";
 
-    const buttons = buildIssueButtonRow(item.githubId, link, [
+    const buttons = buildIssueButtonRow(item.githubIssueId, link, [
       "assign",
       "open",
     ]);
diff --git a/src/infrastructure/discord/interactions/assigneeSelectInteraction.ts b/src/infrastructure/discord/interactions/assigneeSelectInteraction.ts
@@ -1,9 +1,27 @@
+import { ItemService } from "@src/items/services";
 import { UserSelectMenuInteraction } from "discord.js";
 
 export async function assigneeSelectInteraction(
   interaction: UserSelectMenuInteraction,
 ): Promise<void> {
+  const match = interaction.customId.match(/^issue:assignee:select:(.+)$/);
+  if (!match) {
+    throw new Error("Invalid customId format");
+  }
+  const githubIssueId = match[1];
   const selectedUserId = interaction.values[0];
+  const result = await ItemService.updateAssignee({
+    itemId: githubIssueId,
+    assigneeId: "MDQ6VXNlcjQzMjIzNjgy",
+  });
+
+  if (result.err) {
+    await interaction.reply({
+      content: "Failed to update assignee",
+      ephemeral: true,
+    });
+    return;
+  }
 
   await interaction.update({
     content: `**Assigned**: <@${selectedUserId}>`,
diff --git a/src/infrastructure/discord/interactions/issueButtonInteraction.ts b/src/infrastructure/discord/interactions/issueButtonInteraction.ts
@@ -25,7 +25,7 @@ export async function issueButtonInteraction(
       break;
 
     case "assign":
-      await promptAssigneeSelection(interaction);
+      await promptAssigneeSelection(interaction, githubId);
       break;
 
     case "delete":
diff --git a/src/infrastructure/discord/interactions/promptAssigneeSelection.ts b/src/infrastructure/discord/interactions/promptAssigneeSelection.ts
@@ -1,8 +1,11 @@
 import { buildAssigneeSelectionRow } from "../builders";
 
 // TODO: fix any type
-export const promptAssigneeSelection = async (interaction: any) => {
-  const assigneeSelectionRow = buildAssigneeSelectionRow();
+export const promptAssigneeSelection = async (
+  interaction: any,
+  githubIssueId: string,
+) => {
+  const assigneeSelectionRow = buildAssigneeSelectionRow(githubIssueId);
 
   await interaction.reply({
     content: "Select an assignee for this issue:",
diff --git a/src/infrastructure/github/constants.ts b/src/infrastructure/github/constants.ts
@@ -1,3 +1,4 @@
 export const REPO_ID = "R_kgDOLyx0yw";
 export const PROJECT_ID = "PVT_kwDOABL5c84Ag5Rq";
 export const DUE_DATE_FIELD_ID = "PVTF_lADOABL5c84Ag5RqzgXvHkQ";
+export const ASSIGNEES_FIELD_ID = "PVTF_lADOABL5c84Ag5RqzgXodws";
diff --git a/src/infrastructure/github/functions/fetchProjectItems.ts b/src/infrastructure/github/functions/fetchProjectItems.ts
@@ -63,7 +63,8 @@ const convertGithubItems = (items: ProjectV2Item[]) => {
       }
 
       return {
-        githubId: item.id,
+        githubProjectItemId: item.id,
+        githubIssueId: item.content.id,
         title: item.content.title,
         url: item.content.url,
         assignedUsers,
diff --git a/src/infrastructure/github/functions/index.ts b/src/infrastructure/github/functions/index.ts
@@ -2,3 +2,4 @@ export { addIssueToProject } from "./addIssueToProject";
 export { createIssue } from "./createIssue";
 export { fetchProjectItems } from "./fetchProjectItems";
 export { updateProjectItemDueDate } from "./updateProjectItemDueDate";
+export { updateProjectItemAssignee } from "./updateProjectItemAssignee";
diff --git a/src/infrastructure/github/functions/updateProjectItemAssignee.ts b/src/infrastructure/github/functions/updateProjectItemAssignee.ts
@@ -1,34 +1,28 @@
 import logger from "@src/config/logger";
 import axios from "axios";
 import { Result, Err, Ok } from "ts-results";
-import { UPDATE_PROJECT_V2_ITEM_ASSIGNEE } from "../graphql";
+import { UPDATE_ISSUE_ASSIGNEE } from "../graphql";
 import dotenv from "dotenv";
 
 dotenv.config();
 
 const TOKEN = process.env.GITHUB_ACCESS_TOKEN ?? "";
 
 export const updateProjectItemAssignee = async ({
-  projectId,
-  itemId,
-  fieldId,
+  issueId,
   assigneeId,
 }: {
-  projectId: string;
-  itemId: string;
-  fieldId: string;
+  issueId: string;
   assigneeId: string;
 }): Promise<Result<{ id: string }, Error>> => {
   try {
     const response = await axios.post(
       "https://api.github.com/graphql",
       {
-        query: UPDATE_PROJECT_V2_ITEM_ASSIGNEE,
+        query: UPDATE_ISSUE_ASSIGNEE,
         variables: {
-          projectId,
-          itemId,
-          fieldId,
-          assigneeId,
+          issueId: issueId,
+          assigneeIds: [assigneeId],
         },
       },
       {
@@ -48,7 +42,7 @@ export const updateProjectItemAssignee = async ({
       return Err(new Error("Failed to update assignee"));
     }
 
-    return Ok(response.data.data.updateProjectV2ItemFieldValue.projectV2Item);
+    return Ok(response.data.data.updateIssue);
   } catch (error) {
     logger.error({
       event: "github.updateProjectItemAssignee.error",
diff --git a/src/infrastructure/github/graphql/createIssue.ts b/src/infrastructure/github/graphql/createIssue.ts
@@ -14,6 +14,8 @@ mutation(
       number
       title
       url
+      createdAt
+      updatedAt
     }
   }
 }
diff --git a/src/infrastructure/github/graphql/index.ts b/src/infrastructure/github/graphql/index.ts
@@ -2,4 +2,4 @@ export { ADD_PROJECT_V2_ITEM_BY_ID } from "./addProjectV2ItemById";
 export { CREATE_ISSUE_WITH_PROJECT } from "./createIssue";
 export { PROJECT_V2_ITEMS } from "./projectV2Items";
 export { UPDATE_PROJECT_V2_ITEM_DUE_DATE } from "./updateProjectV2ItemFieldValue";
-export { UPDATE_PROJECT_V2_ITEM_ASSIGNEE } from "./updateProjectV2ItemFieldValue";
+export { UPDATE_ISSUE_ASSIGNEE } from "./updateIssue";
diff --git a/src/infrastructure/github/graphql/projectV2Items.ts b/src/infrastructure/github/graphql/projectV2Items.ts
@@ -10,10 +10,12 @@ export const PROJECT_V2_ITEMS = `
 				content {
 					... on DraftIssue {
 						title
+						id
 					}
 					... on Issue {
 						title
 						url
+						id
 					}
 				}
 				fieldValueByName(name: "Due") {
diff --git a/src/infrastructure/github/graphql/updateIssue.ts b/src/infrastructure/github/graphql/updateIssue.ts
@@ -0,0 +1,14 @@
+export const UPDATE_ISSUE_ASSIGNEE = `mutation UpdateIssueAssignee(
+  $issueId: ID!
+  $assigneeIds: [ID!]!
+) {
+  updateIssue(input: {
+    id: $issueId
+    assigneeIds: $assigneeIds
+  }) {
+    issue {
+      id
+    }
+  }
+}
+`;
diff --git a/src/infrastructure/github/graphql/updateProjectV2ItemFieldValue.ts b/src/infrastructure/github/graphql/updateProjectV2ItemFieldValue.ts
@@ -17,24 +17,3 @@ export const UPDATE_PROJECT_V2_ITEM_DUE_DATE = `mutation UpdateDueDate(
     }
   }
 }`;
-
-export const UPDATE_PROJECT_V2_ITEM_ASSIGNEE = `mutation UpdateAssignee(
-  $projectId: ID!,
-  $itemId: ID!,
-  $fieldId: ID!,
-  $assigneeId: ID!
-) {
-  updateProjectV2ItemFieldValue(input: {
-    projectId: $projectId,
-    itemId: $itemId,
-    fieldId: $fieldId,
-    value: {
-      users: [$assigneeId]
-    }
-  }) {
-    projectV2Item {
-      id
-    }
-  }
-}
-`;
diff --git a/src/infrastructure/github/index.ts b/src/infrastructure/github/index.ts
@@ -6,6 +6,7 @@ export interface ProjectV2Item {
   content: {
     title: string;
     url: string;
+    id: string;
   };
   fieldValueByName: {
     id: string;
diff --git a/src/items/index.ts b/src/items/index.ts
@@ -1,5 +1,6 @@
 export interface Item {
-  githubId: string;
+  githubProjectItemId: string;
+  githubIssueId: string;
   title: string;
   status: string;
   assignedUsers: string[];
diff --git a/src/items/services/ItemService.ts b/src/items/services/ItemService.ts
@@ -1,9 +1,10 @@
-import { Result } from "ts-results";
+import { Ok, Result } from "ts-results";
 import { GithubAPI } from "@infrastructure/github";
 import {
   PROJECT_ID,
   DUE_DATE_FIELD_ID,
 } from "@infrastructure/github/constants";
+import { Item } from "..";
 
 export const create = async ({
   title,
@@ -13,7 +14,7 @@ export const create = async ({
   title: string;
   description: string;
   dueDate: Date;
-}): Promise<Result<any, Error>> => {
+}): Promise<Result<Item, Error>> => {
   // TODO: it is worth considering how we should handle the case of when one of this operations fails...
   // For now, we will just return the error of the first operation that fails, but these will leave dangling issues
   // We should consider using background jobs to process the sequential operations or have jobs that retry the failed operations
@@ -44,5 +45,41 @@ export const create = async ({
     date: dueDate.toISOString(),
   });
 
-  return updateDueDate;
+  if (updateDueDate.err) {
+    return updateDueDate;
+  }
+
+  const item: Item = {
+    githubIssueId: result.val.id,
+    githubProjectItemId: addItemResult.val.id,
+    title: result.val.title,
+    dueDate: dueDate,
+    assignedUsers: [],
+    labels: [],
+    url: result.val.url,
+    createdAt: new Date(result.val.createdAt),
+    updatedAt: new Date(result.val.updatedAt),
+    status: "Backlog", // TODO: we should set the status when we create the item
+  };
+
+  return Ok(item);
+};
+
+export const updateAssignee = async ({
+  assigneeId,
+  itemId,
+}: {
+  assigneeId: string;
+  itemId: string;
+}): Promise<Result<any, Error>> => {
+  const result = await GithubAPI.updateProjectItemAssignee({
+    issueId: itemId,
+    assigneeId,
+  });
+
+  if (result.err) {
+    return result;
+  }
+
+  return result;
 };
diff --git a/test/factories/itemFactory.ts b/test/factories/itemFactory.ts
@@ -16,7 +16,8 @@ export const itemFactory = ({
   url?: string;
 } = {}): Item => {
   return {
-    githubId: "githubId",
+    githubProjectItemId: "githubProjectItemId",
+    githubIssueId: "githubIssueId",
     createdAt: new Date(),
     updatedAt: new Date(),
     title: title ?? "title",

Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,5 @@ export async function handleModalSubmit(`
`88`	`88`	`return;`
`89`	`89`	`}`
`90`	`90`
`91`		`- await promptAssigneeSelection(interaction);`
	`91`	`+ await promptAssigneeSelection(interaction, result.val.githubIssueId);`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ const convertGithubItems = (items: ProjectV2Item[]) => {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`return {`
`66`		`- githubId: item.id,`
	`66`	`+ githubProjectItemId: item.id,`
	`67`	`+ githubIssueId: item.content.id,`
`67`	`68`	`title: item.content.title,`
`68`	`69`	`url: item.content.url,`
`69`	`70`	`assignedUsers,`