Update map structure to include github id

Author: MathyouMB

data/githubDiscordMap.json

@@ -1,12 +1,77 @@
 {
-    "AJaccP": "693093284998021141",
-    "exkellybur": "398923451311587338",
-    "JohnLu2004": "358054341179080704",
-    "MathyouMB": "147881865548791808",
-    "MrRibcage": "142782738615762944",
-    "rebeccakempe12": "730876980861599744",
-    "richard-dh-kim": "241421629543022592",
-    "ryangchung": "365948481946517504",
-    "VictorLi5611": "247472197902270465",
-    "VMordvinova": "759902786107473932"
-}
+  "AJaccP": {
+    "githubUsername": "AJaccP",
+    "githubId": "U_kgDOBrIU2w",
+    "discordId": "693093284998021141"
+  },
+  "eros-mcguire": {
+    "githubUsername": "eros-mcguire",
+    "githubId": "tbd",
+    "discordId": "981895462992891935"
+  },
+  "exkellybur": {
+    "githubUsername": "exkellybur",
+    "githubId": "U_kgDOBx7TuA",
+    "discordId": "398923451311587338"
+  },
+  "JohnLu2004": {
+    "githubUsername": "JohnLu2004",
+    "githubId": "MDQ6VXNlcjg3NjczMDY4",
+    "discordId": "358054341179080704"
+  },
+  "kimiaKR": {
+    "githubUsername": "kimiaKR",
+    "githubId": "U_kgDOC0aBdw",
+    "discordId": "706977821502865578"
+  },
+  "LandonJMM": {
+    "githubUsername": "LandonJMM",
+    "githubId": "U_kgDOBs5OWw",
+    "discordId": "657607140835328059"
+  },
+  "MathyouMB": {
+    "githubUsername": "MathyouMB",
+    "githubId": "MDQ6VXNlcjQzMjIzNjgy",
+    "discordId": "147881865548791808"
+  },
+  "MrRibcage": {
+    "githubUsername": "MrRibcage",
+    "githubId": "MDQ6VXNlcjQzNjU2MTM3",
+    "discordId": "142782738615762944"
+  },
+  "Nguyen-HanhNong": {
+    "githubUsername": "Nguyen-HanhNong",
+    "githubId": "MDQ6VXNlcjgxOTc3MzUw",
+    "discordId": "929100662082531398"
+  },
+  "rebeccakempe12": {
+    "githubUsername": "rebeccakempe12",
+    "githubId": "MDQ6VXNlcjc3MzY4MTky",
+    "discordId": "730876980861599744"
+  },
+  "richard-dh-kim": {
+    "githubUsername": "richard-dh-kim",
+    "githubId": "MDQ6VXNlcjU4OTU5NjQ5",
+    "discordId": "241421629543022592"
+  },
+  "rj-sci": {
+    "githubUsername": "rj-sci",
+    "githubId": "tbd",
+    "discordId": "327557300497809422"
+  },
+  "ryangchung": {
+    "githubUsername": "ryangchung",
+    "githubId": "MDQ6VXNlcjg3MDI3OTgx",
+    "discordId": "365948481946517504"
+  },
+  "VictorLi5611": {
+    "githubUsername": "VictorLi5611",
+    "githubId": "MDQ6VXNlcjczMzA1Mjg3",
+    "discordId": "247472197902270465"
+  },
+  "VMordvinova": {
+    "githubUsername": "VMordvinova",
+    "githubId": "U_kgDOCFXXvw",
+    "discordId": "759902786107473932"
+  }
+}

src/infrastructure/discord/authz.ts

@@ -1,12 +1,21 @@
 import githubDiscordMapJson from "../../../data/githubDiscordMap.json";
 
-const githubDiscordMap: { [key: string]: string } = githubDiscordMapJson;
+// New structure: map from GitHub username to object with discordId
+const githubDiscordMap: {
+  [key: string]: {
+    githubUsername: string;
+    githubId: string;
+    discordId: string;
+  };
+} = githubDiscordMapJson;
 
 // TODO: this any should be the generalized discord.js interaction type so that all interactions can leverage this method
 export const can = (interaction: any): boolean => {
   const userId = interaction.user?.id;
 
-  const discordIds = Object.values(githubDiscordMap);
+  const discordIds = Object.values(githubDiscordMap).map(
+    (entry) => entry.discordId,
+  );
   const isAuthorized = discordIds.includes(userId);
 
   return isAuthorized;

src/infrastructure/discord/commands/myIssues.ts

@@ -5,8 +5,14 @@ import githubDiscordMapJson from "../../../../data/githubDiscordMap.json";
 import { can } from "../authz";
 import { buildIssueButtonRow } from "../builders";
 
-const githubDiscordMap: { [githubUsername: string]: string } =
-  githubDiscordMapJson;
+// Update type to reflect new structure
+const githubDiscordMap: {
+  [githubUsername: string]: {
+    githubUsername: string;
+    githubId: string;
+    discordId: string;
+  };
+} = githubDiscordMapJson;
 
 export const data = new SlashCommandBuilder()
   .setName("my-issues")
@@ -20,12 +26,13 @@ export async function execute(interaction: CommandInteraction) {
     });
     return;
   }
+
   const discordUserId = interaction.user.id;
 
-  // Find GitHub username from Discord ID
-  const githubUsername = Object.keys(githubDiscordMap).find(
-    (ghUser) => githubDiscordMap[ghUser] === discordUserId,
-  );
+  // Find GitHub username from Discord ID using the new structure
+  const githubUsername = Object.values(githubDiscordMap).find(
+    (entry) => entry.discordId === discordUserId,
+  )?.githubUsername;
 
   if (!githubUsername) {
     await interaction.reply({

src/infrastructure/discord/interactions/assigneeSelectInteraction.ts

@@ -1,5 +1,15 @@
 import { ItemService } from "@src/items/services";
 import { UserSelectMenuInteraction } from "discord.js";
+import githubDiscordMapJson from "../../../../data/githubDiscordMap.json";
+
+// Updated structure of the map
+const githubDiscordMap: {
+  [githubUsername: string]: {
+    githubUsername: string;
+    githubId: string;
+    discordId: string;
+  };
+} = githubDiscordMapJson;
 
 export async function assigneeSelectInteraction(
   interaction: UserSelectMenuInteraction,
@@ -8,16 +18,31 @@ export async function assigneeSelectInteraction(
   if (!match) {
     throw new Error("Invalid customId format");
   }
+
   const githubIssueId = match[1];
   const selectedUserId = interaction.values[0];
+
+  // Find the GitHub ID using the selected Discord ID
+  const githubId = Object.values(githubDiscordMap).find(
+    (entry) => entry.discordId === selectedUserId,
+  )?.githubId;
+
+  if (!githubId) {
+    await interaction.reply({
+      content: "❌ Unable to find linked GitHub account for selected user.",
+      ephemeral: true,
+    });
+    return;
+  }
+
   const result = await ItemService.updateAssignee({
     itemId: githubIssueId,
-    assigneeId: "MDQ6VXNlcjQzMjIzNjgy",
+    assigneeId: githubId,
   });
 
   if (result.err) {
     await interaction.reply({
-      content: "Failed to update assignee",
+      content: "❌ Failed to update assignee.",
       ephemeral: true,
     });
     return;

src/infrastructure/discord/webhookMessages.ts

@@ -63,7 +63,7 @@ const githubUrlToDiscordId = (githubUrl: string) => {
       "https://github.com/",
       "",
     ) as keyof typeof githubDiscordMap
-  ];
+  ].discordId;
 };
 
 const formatDiscordDate = (date: Date) => {