put the changes under same feature flag

Author: RishiChaubey31

src/controllers/mentionEachUser.ts

@@ -21,49 +21,35 @@ export async function mentionEachUser(
   env: env,
   ctx: ExecutionContext
 ) {
-  const isFeatureEnabled = true;
-
-  if (!isFeatureEnabled) {
-    return discordTextResponse("This feature is currently disabled.");
-  }
-
   const getMembersInServerResponse = await getMembersInServer(env);
   const roleId = transformedArgument.roleToBeTaggedObj.value;
-  const msgToBeSent = transformedArgument?.displayMessageObj?.value; // Get custom message
+  const msgToBeSent = transformedArgument?.displayMessageObj?.value;
   const dev = transformedArgument?.dev?.value || false;
 
   const usersWithMatchingRole = filterUserByRoles(
     getMembersInServerResponse as UserArray[],
     roleId
   );
-
-  // 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 <@&${roleId}> role.`;
-  } else if (usersWithMatchingRole.length === 1) {
-    responseMessage = `The user with ${roleTag} roles is: ${userList}`;
-  } else {
-    responseMessage = `The users with ${roleTag} roles are: ${userList}`;
-  }
-
+  const payload = {
+    channelId: transformedArgument.channelId,
+    roleId: roleId,
+    message: msgToBeSent,
+    usersWithMatchingRole,
+  };
   if (!dev || usersWithMatchingRole.length === 0) {
-    return discordTextResponse(responseMessage);
+    const responseData = checkDisplayType({
+      usersWithMatchingRole,
+      msgToBeSent,
+      roleId,
+    });
+    return discordTextResponse(responseData);
   } else {
-    ctx.waitUntil(
-      mentionEachUserInMessage({
-        message: responseMessage,
-        userIds: usersWithMatchingRole,
-        channelId: transformedArgument.channelId,
-        env,
-      })
-    );
-
-    return discordTextResponse(
-      `Found ${usersWithMatchingRole.length} users with matched role, mentioning them shortly...`
-    );
+    let responseMessage = "";
+    if (usersWithMatchingRole.length === 1) {
+      responseMessage = `The user with <@&${roleId}> role is: ${payload.usersWithMatchingRole}`;
+    } else {
+      responseMessage = `The users with <@&${roleId}> role are: ${payload.usersWithMatchingRole} `;
+    }
+    return discordTextResponse(responseMessage);
   }
 }

src/utils/checkDisplayType.ts

@@ -4,14 +4,16 @@
 export function checkDisplayType({
   usersWithMatchingRole,
   msgToBeSent,
+  roleId,
 }: {
   msgToBeSent?: string;
   usersWithMatchingRole: string[];
+  roleId?: string;
 }) {
   if (usersWithMatchingRole.length > 0) {
     const returnString = msgToBeSent ? msgToBeSent : "";
     return `${returnString} ${usersWithMatchingRole}`;
   } else {
-    return `Sorry no user found under this role.`;
+    return `Sorry no user found with <@&${roleId ?? "undefined"}> role.`;
   }
 }

tests/unit/handlers/mentionEachUser.test.ts

@@ -43,7 +43,7 @@ describe("Test mention each function", () => {
       (res) => res.json()
     );
     expect(textMessage.data.content).toBe(
-      `Sorry no user found under <@&${roleId}> role.`
+      `Sorry no user found with <@&${roleId}> role.`
     );
   });
 
@@ -60,7 +60,7 @@ describe("Test mention each function", () => {
       (res) => res.json()
     );
     expect(textMessage.data.content).toBe(
-      `Sorry no user found under <@&${roleId}> role.`
+      `Sorry no user found with <@&${roleId}> role.`
     );
   });
 
@@ -108,11 +108,16 @@ describe("Test mention each function", () => {
     expect(response).toBe(expectedResponse);
   });
 
-  it("should return default string ", () => {
-    const usersWithMatchingRole = [] as string[];
+  it("should return default string", () => {
+    const roleId = "1118201414078976192";
+    const usersWithMatchingRole: string[] = [];
     const msgToBeSent = "hello";
-    const response = checkDisplayType({ usersWithMatchingRole, msgToBeSent });
-    const expectedResponse = `Sorry no user found under this role.`;
+    const response = checkDisplayType({
+      usersWithMatchingRole,
+      msgToBeSent,
+      roleId,
+    });
+    const expectedResponse = `Sorry no user found with <@&${roleId}> role.`;
     expect(response).toBe(expectedResponse);
   });
 
@@ -128,37 +133,18 @@ describe("Test mention each function", () => {
     expect(response).toBe(expectedResponse);
   });
 
-  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 message with no matching users", () => {
-    const usersWithMatchingRole = [] as string[];
-    const roleId = "1118201414078976192";
-    const msgToBeSent = "No users found:";
-    const response = checkDisplayType({ usersWithMatchingRole, msgToBeSent });
-    const modifiedResponse = response.replace("this", `<@&${roleId}>`);
-    expect(modifiedResponse).toBe(
-      `Sorry no user found under <@&${roleId}> role.`
-    );
+  describe("checkDisplayType", () => {
+    it("should handle message with no matching users", () => {
+      const usersWithMatchingRole: string[] = [];
+      const roleId = "1118201414078976192";
+      const msgToBeSent = "No users found:";
+      const response = checkDisplayType({
+        usersWithMatchingRole,
+        msgToBeSent,
+        roleId,
+      });
+      expect(response).toBe(`Sorry no user found with <@&${roleId}> role.`);
+    });
   });
   it("should handle case when only one user found", () => {
     const roleId = "860900892193456149";
@@ -175,9 +161,9 @@ describe("Test mention each function", () => {
       },
     ];
     const response = filterUserByRoles(optionsArray, roleId);
-    const message = `The user with <@&${roleId}> roles is: ${response}`;
+    const message = `The user with <@&${roleId}> role is: ${response}`;
     expect(message).toBe(
-      `The user with <@&${roleId}> roles is: <@${optionsArray[0].user.id}>`
+      `The user with <@&${roleId}> role is: <@${optionsArray[0].user.id}>`
     );
   });
 });