added a case when only one user is found and a suited test case

Author: RishiChaubey31

src/controllers/mentionEachUser.ts

@@ -19,9 +19,10 @@ export async function mentionEachUser(
     dev?: DevFlag;
   },
   env: env,
-  ctx: ExecutionContext
+  ctx: ExecutionContext,
+  mockUserData?: UserArray[] // Optional parametr to pass user data directly for testing
 ) {
-  const getMembersInServerResponse = await getMembersInServer(env);
+  const getMembersInServerResponse = mockUserData || await getMembersInServer(env);
   const roleId = transformedArgument.roleToBeTaggedObj.value;
   const msgToBeSent = transformedArgument?.displayMessageObj?.value; // Get custom message
   const dev = transformedArgument?.dev?.value || false;
@@ -33,11 +34,15 @@ export async function mentionEachUser(
 
   // Use the custom message if provided, otherwise construct the default message
   let responseMessage;
+  const roleTag = `<@&${roleId}>`;
+  const userList = usersWithMatchingRole.join(", ");
+
   if (usersWithMatchingRole.length === 0) {
-    responseMessage = msgToBeSent || "Sorry no user found under this role."; // Use custom message if available
+    responseMessage =
+      msgToBeSent || `Sorry no user found under ${roleTag} role.`; // Use custom message if available
+  } else if (usersWithMatchingRole.length === 1) {
+    responseMessage = `The user with ${roleTag} role is: ${userList}`;  // Handle singular user case
   } else {
-    const roleTag = `<@&${roleId}>`;
-    const userList = usersWithMatchingRole.join(", ");
     responseMessage = `The users with ${roleTag} roles are: ${userList}`;
   }
 

tests/unit/handlers/mentionEachUser.test.ts

@@ -25,9 +25,15 @@ describe("Test mention each function", () => {
       DISCORD_GUILD_ID: "123",
       DISCORD_TOKEN: "abc",
     };
+    const roleId = "123456789";
     const response = mentionEachUser(
       {
         ...onlyRoleToBeTagged,
+        roleToBeTaggedObj: {
+          name: "roleToBeTagged",
+          type: 3,
+          value: roleId,
+        },
         dev: {
           name: "dev",
           type: 4,
@@ -42,7 +48,7 @@ describe("Test mention each function", () => {
       (res) => res.json()
     );
     expect(textMessage.data.content).toBe(
-      "Sorry no user found under this role."
+      `Sorry no user found under <@&${roleId}> role.`
     );
   });
 
@@ -52,14 +58,25 @@ describe("Test mention each function", () => {
       DISCORD_GUILD_ID: "123",
       DISCORD_TOKEN: "abc",
     };
-
-    const response = mentionEachUser(onlyRoleToBeTagged, env, ctx);
+    const roleId = "123456789";
+    const response = mentionEachUser(
+      {
+        ...onlyRoleToBeTagged,
+        roleToBeTaggedObj: {
+          name: "roleToBeTagged",
+          type: 3,
+          value: roleId,
+        },
+      },
+      env,
+      ctx
+    );
     expect(response).toBeInstanceOf(Promise);
     const textMessage: { data: { content: string } } = await response.then(
       (res) => res.json()
     );
     expect(textMessage.data.content).toBe(
-      "Sorry no user found under this role."
+      `Sorry no user found under <@&${roleId}> role.`
     );
   });
 
@@ -162,4 +179,43 @@ describe("Test mention each function", () => {
     const response = checkDisplayType({ usersWithMatchingRole, msgToBeSent });
     expect(response).toBe("Sorry no user found under this role.");
   });
+
+  it("should return message when only one user found", async () => {
+    const env = {
+      BOT_PUBLIC_KEY: "xyz",
+      DISCORD_GUILD_ID: "123",
+      DISCORD_TOKEN: "abc",
+    };
+  
+    const roleId = "123456789"; 
+    const userId = "256859044593598464"; 
+  
+    const mockUserData = [
+      {
+        roles: ["123456789"], 
+        user: { id: userId },
+      },
+    ];
+  
+    const onlyRoleToBeTagged = {
+      roleToBeTaggedObj: {
+        name: "roleToBeTagged",
+        type: 3,
+        value: roleId,
+      },
+      channelId: 12345,
+    };
+  
+    // Call mentionEachUser and pass in the mock user data
+    const response = await mentionEachUser(onlyRoleToBeTagged, env, ctx, mockUserData);
+  
+    // Extract the message content from the response
+    const textMessage: { data: { content: string } } = await response.json();
+  
+    // Construct the expected response based on the function logic
+    const expectedResponse = `The user with <@&${roleId}> role is: <@${userId}>`;
+  
+    // Assert that the response message content matches the expected output
+    expect(textMessage.data.content).toBe(expectedResponse);
+  }); 
 });