Adding extra try blocks in utils to handle errors

Author: bksh05

src/controllers/guildRoleHandler.ts

@@ -79,6 +79,9 @@ 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) {

src/utils/guildRole.ts

@@ -2,7 +2,6 @@ import {
   INTERNAL_SERVER_ERROR,
   ROLE_ADDED,
   ROLE_REMOVED,
-  ROLE_FETCH_FAILED,
 } from "../constants/responses";
 import { DISCORD_BASE_URL } from "../constants/urls";
 import { env } from "../typeDefinitions/default.types";
@@ -87,33 +86,39 @@ export async function removeGuildRole(details: memberGroupRole, env: env) {
   }
 }
 
-export async function getGuildRoles(env: env): Promise<Array<GuildRole>> {
+export async function getGuildRoles(
+  env: env
+): Promise<Array<GuildRole> | undefined> {
   const guildDetailsUrl = `${DISCORD_BASE_URL}/guilds/${env.DISCORD_GUILD_ID}`;
 
-  const response = await fetch(guildDetailsUrl, {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bot ${env.DISCORD_TOKEN}`,
-    },
-  });
+  try {
+    const response = await fetch(guildDetailsUrl, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bot ${env.DISCORD_TOKEN}`,
+      },
+    });
 
-  if (!response.ok) {
-    throw new Error(ROLE_FETCH_FAILED);
-  }
+    if (!response.ok) {
+      return undefined;
+    }
 
-  const guildDetails: GuildDetails = await response.json();
+    const guildDetails: GuildDetails = await response.json();
 
-  return guildDetails.roles.map((role) => ({
-    id: role.id,
-    name: role.name,
-  }));
+    return guildDetails.roles.map((role) => ({
+      id: role.id,
+      name: role.name,
+    }));
+  } catch (err) {
+    return undefined;
+  }
 }
 
 export async function getGuildRoleByName(
   roleName: string,
   env: env
 ): Promise<GuildRole | undefined> {
   const roles = await getGuildRoles(env);
-  return roles.find((role) => role.name === roleName);
+  return roles?.find((role) => role.name === roleName);
 }

tests/unit/utils/guildRole.test.ts

@@ -133,15 +133,15 @@ describe("removeGuildRole", () => {
   });
 });
 describe("getGuildRoles", () => {
-  it("should throw role fetch failed message if status is not ok", async () => {
+  it("should return undefined if status is not ok", async () => {
     jest
       .spyOn(global, "fetch")
       .mockImplementationOnce(async () =>
         Promise.resolve(new JSONResponse({}, { status: 500 }))
       );
-    await expect(getGuildRoles(guildEnv)).rejects.toThrow(
-      response.ROLE_FETCH_FAILED
-    );
+
+    const response = await getGuildRoles(guildEnv);
+    expect(response).toBeUndefined();
   });
 
   it("should return array of objects containing role_id and role_name", async () => {
@@ -172,9 +172,8 @@ describe("getGuildRolesByName", () => {
       .mockImplementationOnce(async () =>
         Promise.resolve(new JSONResponse({}, { status: 500 }))
       );
-    await expect(getGuildRoleByName("@everyone", guildEnv)).rejects.toThrow(
-      response.ROLE_FETCH_FAILED
-    );
+    const response = await getGuildRoleByName("@everyone", guildEnv);
+    expect(response).toBeUndefined();
   });
 
   it("should return array of objects containing role_id and role_name", async () => {