Throwing errors when something goes wrong

Author: bksh05

src/controllers/guildRoleHandler.ts

@@ -79,24 +79,16 @@ export async function getGuildRolesHandler(request: IRequest, env: env) {
   try {
     await verifyAuthToken(authHeader, env);
     const roles = await getGuildRoles(env);
-    if (!roles) {
-      throw new Error(response.ROLE_FETCH_FAILED);
-    }
     return new JSONResponse({ roles });
   } catch (err: any) {
-    if (err.message === response.ROLE_FETCH_FAILED) {
-      return new JSONResponse(
-        { error: response.ROLE_FETCH_FAILED },
-        {
-          status: 500,
-          headers: {
-            "content-type": "application/json;charset=UTF-8",
-          },
-        }
-      );
-    }
+    const error =
+      err?.message === response.ROLE_FETCH_FAILED
+        ? response.ROLE_FETCH_FAILED
+        : response.INTERNAL_SERVER_ERROR;
     return new JSONResponse(
-      { error: response.INTERNAL_SERVER_ERROR },
+      {
+        error,
+      },
       {
         status: 500,
         headers: {
@@ -134,19 +126,12 @@ export async function getGuildRoleByRoleNameHandler(
     }
     return new JSONResponse(role);
   } catch (err: any) {
-    if (err.message === response.ROLE_FETCH_FAILED) {
-      return new JSONResponse(
-        { error: response.ROLE_FETCH_FAILED },
-        {
-          status: 500,
-          headers: {
-            "content-type": "application/json;charset=UTF-8",
-          },
-        }
-      );
-    }
+    const error =
+      err?.message === response.ROLE_FETCH_FAILED
+        ? response.ROLE_FETCH_FAILED
+        : response.INTERNAL_SERVER_ERROR;
     return new JSONResponse(
-      { error: response.INTERNAL_SERVER_ERROR },
+      { error },
       {
         status: 500,
         headers: {

src/utils/guildRole.ts

@@ -1,6 +1,7 @@
 import {
   INTERNAL_SERVER_ERROR,
   ROLE_ADDED,
+  ROLE_FETCH_FAILED,
   ROLE_REMOVED,
 } from "../constants/responses";
 import { DISCORD_BASE_URL } from "../constants/urls";
@@ -86,9 +87,7 @@ export async function removeGuildRole(details: memberGroupRole, env: env) {
   }
 }
 
-export async function getGuildRoles(
-  env: env
-): Promise<Array<GuildRole> | undefined> {
+export async function getGuildRoles(env: env): Promise<Array<GuildRole>> {
   const guildDetailsUrl = `${DISCORD_BASE_URL}/guilds/${env.DISCORD_GUILD_ID}`;
 
   try {
@@ -101,7 +100,7 @@ export async function getGuildRoles(
     });
 
     if (!response.ok) {
-      return undefined;
+      throw new Error(ROLE_FETCH_FAILED);
     }
 
     const guildDetails: GuildDetails = await response.json();
@@ -111,7 +110,7 @@ export async function getGuildRoles(
       name: role.name,
     }));
   } catch (err) {
-    return undefined;
+    throw new Error(ROLE_FETCH_FAILED);
   }
 }
 

tests/unit/utils/guildRole.test.ts

@@ -132,16 +132,30 @@ describe("removeGuildRole", () => {
     expect(result).toEqual(response.INTERNAL_SERVER_ERROR);
   });
 });
+
 describe("getGuildRoles", () => {
-  it("should return undefined if status is not ok", async () => {
+  it("should throw role fetch failed error if status is not ok", async () => {
     jest
       .spyOn(global, "fetch")
       .mockImplementationOnce(async () =>
         Promise.resolve(new JSONResponse({}, { status: 500 }))
       );
 
-    const response = await getGuildRoles(guildEnv);
-    expect(response).toBeUndefined();
+    await expect(getGuildRoles(guildEnv)).rejects.toThrow(
+      response.ROLE_FETCH_FAILED
+    );
+  });
+
+  it("should throw role fetch failed error if discord request fails", async () => {
+    jest
+      .spyOn(global, "fetch")
+      .mockImplementationOnce(async () =>
+        Promise.reject(new JSONResponse({}, { status: 500 }))
+      );
+
+    await expect(getGuildRoles(guildEnv)).rejects.toThrow(
+      response.ROLE_FETCH_FAILED
+    );
   });
 
   it("should return array of objects containing role_id and role_name", async () => {
@@ -151,16 +165,10 @@ describe("getGuildRoles", () => {
         Promise.resolve(new JSONResponse(guildDetailsMock))
       );
     const roles = await getGuildRoles(guildEnv);
-    const expectedRoles = [
-      {
-        id: "1234567889",
-        name: "@everyone",
-      },
-      {
-        id: "12344567",
-        name: "bot one",
-      },
-    ];
+    const expectedRoles = guildDetailsMock.roles.map(({ id, name }) => ({
+      id,
+      name,
+    }));
     expect(roles).toEqual(expectedRoles);
   });
 });
@@ -172,8 +180,20 @@ describe("getGuildRolesByName", () => {
       .mockImplementationOnce(async () =>
         Promise.resolve(new JSONResponse({}, { status: 500 }))
       );
-    const response = await getGuildRoleByName("@everyone", guildEnv);
-    expect(response).toBeUndefined();
+    await expect(getGuildRoles(guildEnv)).rejects.toThrow(
+      response.ROLE_FETCH_FAILED
+    );
+  });
+
+  it("should throw role fetch failed message if discord request fails", async () => {
+    jest
+      .spyOn(global, "fetch")
+      .mockImplementationOnce(async () =>
+        Promise.reject(new JSONResponse({}, { status: 500 }))
+      );
+    await expect(getGuildRoles(guildEnv)).rejects.toThrow(
+      response.ROLE_FETCH_FAILED
+    );
   });
 
   it("should return array of objects containing role_id and role_name", async () => {