updated for comments

Author: DashDeipayan

src/constants/urls.ts

@@ -1,7 +1,6 @@
 export const RDS_BASE_API_URL = "https://api.realdevsquad.com";
 export const RDS_BASE_STAGING_API_URL = "https://staging-api.realdevsquad.com";
-export const RDS_BASE_DEVELOPMENT_API_URL =
-  "https://d0ef-103-75-162-230.ngrok.io"; // If needed, modify the URL to your local API server
+export const RDS_BASE_DEVELOPMENT_API_URL = "YOUR_LOCAL_API_URL"; // If needed, modify the URL to your local API server
 
 export const DISCORD_BASE_URL = "https://discord.com/api/v10";
 export const DISCORD_AVATAR_BASE_URL = "https://cdn.discordapp.com/avatars";

src/controllers/guildRoleHandler.ts

@@ -22,7 +22,6 @@ export async function createGuildRoleHandler(request: IRequest, env: env) {
     const res = await createGuildRole(body, env);
     return new JSONResponse(res);
   } catch (err) {
-    console.error(err);
     return new JSONResponse(response.BAD_SIGNATURE);
   }
 }
@@ -37,10 +36,8 @@ export async function addGroupRoleHandler(request: IRequest, env: env) {
     const body: memberGroupRole = await request.json();
 
     const res = await addGroupRole(body, env);
-    console.log(res);
     return new JSONResponse(res);
   } catch (err) {
-    console.error(err);
     return new JSONResponse(response.BAD_SIGNATURE);
   }
 }

src/utils/guildRole.ts

@@ -27,7 +27,6 @@ export async function createGuildRole(body: createNewRole, env: env) {
       return INTERNAL_SERVER_ERROR;
     }
   } catch (err) {
-    console.log(err);
     return INTERNAL_SERVER_ERROR;
   }
 }
@@ -49,7 +48,6 @@ export async function addGroupRole(body: memberGroupRole, env: env) {
       return INTERNAL_SERVER_ERROR;
     }
   } catch (err) {
-    console.log(err);
     return INTERNAL_SERVER_ERROR;
   }
 }

tests/fixtures/fixture.ts

@@ -1,4 +1,8 @@
-import { discordMessageRequest } from "../../src/typeDefinitions/discordMessage.types";
+import {
+  createNewRole,
+  discordMessageRequest,
+  memberGroupRole,
+} from "../../src/typeDefinitions/discordMessage.types";
 import { InteractionType } from "discord-interactions";
 
 export const dummyHelloMessage: discordMessageRequest = {
@@ -32,3 +36,18 @@ export const dummyVerifyMessage: discordMessageRequest = {
   },
   guild_id: 123456,
 };
+
+export const dummyCreateBody: createNewRole = {
+  rolename: "test role",
+  mentionable: true,
+};
+
+export const dummyAddRoleBody: memberGroupRole = {
+  userid: "abcd1234",
+  roleid: "defg5678",
+};
+
+export const guildEnv = {
+  DISCORD_GUILD_ID: "1234",
+  DISCORD_TOKEN: "abcd",
+};

tests/unit/guildRole.test.ts

@@ -1,74 +1,62 @@
-import { createNewRole } from "../../src/typeDefinitions/discordMessage.types";
 import JSONResponse from "../../src/utils/JsonResponse";
 import * as response from "../../src/constants/responses";
 import { createGuildRole, addGroupRole } from "../../src/utils/guildRole";
+import {
+  dummyAddRoleBody,
+  dummyCreateBody,
+  guildEnv,
+} from "../fixtures/fixture";
 
 describe("createGuildRole", () => {
   test("should return INTERNAL_SERVER_ERROR when response is not ok", async () => {
-    const mockEnv = {
-      DISCORD_GUILD_ID: "1234",
-      DISCORD_TOKEN: "abcd",
-    };
-    const mockBody: createNewRole = {
-      rolename: "test role",
-      mentionable: true,
-    };
     const mockResponse = response.INTERNAL_SERVER_ERROR;
     jest
       .spyOn(global, "fetch")
       .mockImplementation(() =>
         Promise.resolve(new JSONResponse(mockResponse))
       );
 
-    const result = await createGuildRole(mockBody, mockEnv);
+    const result = await createGuildRole(dummyCreateBody, guildEnv);
 
     expect(result).toEqual(response.INTERNAL_SERVER_ERROR);
     expect(global.fetch).toHaveBeenCalledWith(
-      `https://discord.com/api/v10/guilds/${mockEnv.DISCORD_GUILD_ID}/roles`,
+      `https://discord.com/api/v10/guilds/${guildEnv.DISCORD_GUILD_ID}/roles`,
       {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          Authorization: `Bot ${mockEnv.DISCORD_TOKEN}`,
+          Authorization: `Bot ${guildEnv.DISCORD_TOKEN}`,
         },
         body: JSON.stringify({
-          ...mockBody,
-          name: mockBody.rolename,
+          ...dummyCreateBody,
+          name: dummyCreateBody.rolename,
         }),
       }
     );
   });
 
   test("should return JSON response when response is ok", async () => {
-    const mockEnv = {
-      DISCORD_GUILD_ID: "1234",
-      DISCORD_TOKEN: "abcd",
-    };
-    const mockBody: createNewRole = {
-      rolename: "test role",
-      mentionable: true,
-    };
     const mockResponse = {};
     jest
       .spyOn(global, "fetch")
       .mockImplementation(() =>
         Promise.resolve(new JSONResponse(mockResponse))
       );
 
-    const result = await createGuildRole(mockBody, mockEnv);
+    const result = await createGuildRole(dummyCreateBody, guildEnv);
 
     expect(result).toEqual({});
     expect(global.fetch).toHaveBeenCalledWith(
-      `https://discord.com/api/v10/guilds/${mockEnv.DISCORD_GUILD_ID}/roles`,
+      `https://discord.com/api/v10/guilds/${guildEnv.DISCORD_GUILD_ID}/roles`,
       {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          Authorization: `Bot ${mockEnv.DISCORD_TOKEN}`,
+          Authorization: `Bot ${guildEnv.DISCORD_TOKEN}`,
         },
         body: JSON.stringify({
-          ...mockBody,
-          name: mockBody.rolename,
+          ...dummyCreateBody,
+          name: dummyCreateBody.rolename,
         }),
       }
     );
@@ -77,14 +65,6 @@ describe("createGuildRole", () => {
 
 describe("addGroupRole", () => {
   test("should return success message when response is ok", async () => {
-    const mockEnv = {
-      DISCORD_GUILD_ID: "1234",
-      DISCORD_TOKEN: "abcd",
-    };
-    const mockBody = {
-      userid: "abcd1234",
-      roleid: "defg5678",
-    };
     const mockResponse = {
       ok: true,
     };
@@ -94,16 +74,16 @@ describe("addGroupRole", () => {
         Promise.resolve(new JSONResponse(mockResponse))
       );
 
-    const result = await addGroupRole(mockBody, mockEnv);
+    const result = await addGroupRole(dummyAddRoleBody, guildEnv);
 
     expect(result).toEqual({ message: "Role added successfully" });
     expect(global.fetch).toHaveBeenCalledWith(
-      `https://discord.com/api/v10/guilds/${mockEnv.DISCORD_GUILD_ID}/members/${mockBody.userid}/roles/${mockBody.roleid}`,
+      `https://discord.com/api/v10/guilds/${guildEnv.DISCORD_GUILD_ID}/members/${dummyAddRoleBody.userid}/roles/${dummyAddRoleBody.roleid}`,
       {
         method: "PUT",
         headers: {
           "Content-Type": "application/json",
-          Authorization: `Bot ${mockEnv.DISCORD_TOKEN}`,
+          Authorization: `Bot ${guildEnv.DISCORD_TOKEN}`,
         },
       }
     );