added test cases for /mentioneachuser discord command

Author: RishiChaubey31

src/controllers/mentionEachUser.ts

@@ -23,27 +23,20 @@ export async function mentionEachUser(
 ) {
   const getMembersInServerResponse = await getMembersInServer(env);
   const roleId = transformedArgument.roleToBeTaggedObj.value;
-  const msgToBeSent = transformedArgument?.displayMessageObj?.value;
+  const customMessage = transformedArgument?.displayMessageObj?.value; // Get custom message
   const dev = transformedArgument?.dev?.value || false;
 
   const usersWithMatchingRole = filterUserByRoles(
     getMembersInServerResponse as UserArray[],
     roleId
   );
 
-  const payload = {
-    channelId: transformedArgument.channelId,
-    roleId: roleId,
-    message: msgToBeSent,
-    usersWithMatchingRole,
-  };
-
-  // Construct the message with the role mention and user list
-  const roleTag = `<@&${roleId}>`;
+  // Use the custom message if provided, otherwise construct the default message
   let responseMessage;
   if (usersWithMatchingRole.length === 0) {
-    responseMessage = `No users found with the ${roleTag} role.`;
+    responseMessage = customMessage || "Sorry no user found under this role."; // Use custom message if available
   } else {
+    const roleTag = `<@&${roleId}>`;
     const userList = usersWithMatchingRole.join(", ");
     responseMessage = `The users with ${roleTag} roles are: ${userList}`;
   }
@@ -54,14 +47,14 @@ export async function mentionEachUser(
     ctx.waitUntil(
       mentionEachUserInMessage({
         message: responseMessage,
-        userIds: payload.usersWithMatchingRole,
-        channelId: payload.channelId,
+        userIds: usersWithMatchingRole,
+        channelId: transformedArgument.channelId,
         env,
       })
     );
-    
+
     return discordTextResponse(
       `Found ${usersWithMatchingRole.length} users with matched role, mentioning them shortly...`
     );
   }
-}
+}

src/utils/guildRole.ts

@@ -44,7 +44,7 @@ export async function createGuildRole(
       body: JSON.stringify(data),
     });
     if (response.ok) {
-      return await response.json();
+      return (await response.json()) as string | guildRoleResponse;
     } else {
       return INTERNAL_SERVER_ERROR;
     }
@@ -125,7 +125,7 @@ export async function getGuildRoles(env: env): Promise<Array<Role>> {
       throw new Error(ROLE_FETCH_FAILED);
     }
 
-    const guildRoles: Array<GuildRole> = await response.json();
+    const guildRoles: Array<GuildRole> = (await response.json()) as GuildRole[];
 
     return guildRoles.map((role) => ({
       id: role.id,
@@ -143,6 +143,7 @@ export async function getGuildRoleByName(
   const roles = await getGuildRoles(env);
   return roles?.find((role) => role.name === roleName);
 }
+import { Response } from "@cloudflare/workers-types";
 
 export async function mentionEachUserInMessage({
   message,
@@ -173,10 +174,12 @@ export async function mentionEachUserInMessage({
             content: `${message ? message + " " : ""} ${userId}`,
           }),
         }).then((response) => {
-          const rateLimitRemaining = parseRateLimitRemaining(response);
+          const rateLimitRemaining = parseRateLimitRemaining(
+            response as unknown as Response
+          );
           if (rateLimitRemaining === 0) {
             waitTillNextAPICall = Math.max(
-              parseResetAfter(response),
+              parseResetAfter(response as unknown as Response),
               waitTillNextAPICall
             );
           }

tests/unit/handlers/mentionEachUser.test.ts

@@ -126,4 +126,42 @@ describe("Test mention each function", () => {
     const expectedResponse = `${returnString} ${usersWithMatchingRole}`;
     expect(response).toBe(expectedResponse);
   });
+
+  // New test cases in the same style
+
+  it("should handle custom message when provided", async () => {
+    const env = {
+      BOT_PUBLIC_KEY: "xyz",
+      DISCORD_GUILD_ID: "123",
+      DISCORD_TOKEN: "abc",
+    };
+    const customArg = {
+      ...transformedArgument,
+      displayMessageObj: {
+        name: "displayMessage",
+        type: 3,
+        value: "Custom message:",
+      },
+    };
+    const response = mentionEachUser(customArg, env, ctx);
+    expect(response).toBeInstanceOf(Promise);
+    const textMessage: { data: { content: string } } = await response.then(
+      (res) => res.json()
+    );
+    expect(textMessage.data.content).toContain("Custom message:");
+  });
+
+  it("should handle empty user array", () => {
+    const roleId = "123456";
+    const optionsArray = [] as any[];
+    const response = filterUserByRoles(optionsArray, roleId);
+    expect(response).toStrictEqual([]);
+  });
+
+  it("should handle message with no matching users", () => {
+    const usersWithMatchingRole = [] as string[];
+    const msgToBeSent = "No users found:";
+    const response = checkDisplayType({ usersWithMatchingRole, msgToBeSent });
+    expect(response).toBe("Sorry no user found under this role.");
+  });
 });