Merge pull request #160 from Real-Dev-Squad/develop

Dev To main Sync

Author: ankushdharkar

src/controllers/userCommand.ts

@@ -2,10 +2,14 @@ import { env } from "../typeDefinitions/default.types";
 import { discordTextResponse } from "../utils/discordResponse";
 import { getUserDetails } from "../utils/getUserDetails";
 import { formatUserDetails } from "../utils/formatUserDetails";
+import { USER_NOT_FOUND } from "../constants/responses";
 
 export async function userCommand(discordId: string, env: env) {
   try {
     const userDetails = await getUserDetails(discordId);
+    if (!userDetails.user?.discordId) {
+      return discordTextResponse(USER_NOT_FOUND);
+    }
     const formattedUserDetails = formatUserDetails(userDetails);
     return discordTextResponse(formattedUserDetails);
   } catch (error) {

src/handlers/scheduledEventHandler.ts

@@ -29,13 +29,6 @@ export async function send(env: env): Promise<void> {
       }
     });
 
-    if (
-      assigneeIds === error.INTERNAL_SERVER_ERROR ||
-      discordIds === error.INTERNAL_SERVER_ERROR
-    ) {
-      throw new Error(error.INTERNAL_SERVER_ERROR);
-    }
-
     const bodyObj = {
       content: stringToBeSent,
     };

src/utils/formatUserDetails.ts

@@ -1,27 +1,27 @@
 import { UserResponseType } from "../typeDefinitions/rdsUser";
 
 export function convertTimeStamp(userDetails: UserResponseType) {
-  const timestamp = userDetails.user?.discordJoinedAt ?? "";
-  const date = new Date(timestamp);
+  const timestamp = userDetails.user?.discordJoinedAt;
 
-  const day = String(date.getDate()).padStart(2, "0");
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const year = date.getFullYear();
+  if (timestamp) {
+    const date = new Date(timestamp);
 
-  const hours = String(date.getHours()).padStart(2, "0");
-  const minutes = String(date.getMinutes()).padStart(2, "0");
-  const seconds = String(date.getSeconds()).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const year = date.getFullYear();
+    const formattedDate = `${day}/${month}/${year}`;
+    return formattedDate;
+  }
 
-  const formattedDate = `${day}/${month}/${year} ${hours}:${minutes}:${seconds}`;
-  return formattedDate;
+  return "N/A";
 }
 
 export function formatUserDetails(userDetails: UserResponseType) {
   const convertedTimestamp = convertTimeStamp(userDetails);
-  return `
-          ## User Details
-          **Full Name :** ${userDetails.user?.first_name} ${userDetails.user?.last_name}
-          **RDS Discord Joined At :** ${convertedTimestamp}
-          **State :** ${userDetails.user?.state}
-          `;
+
+  const userFullName = `**Full Name :** ${userDetails.user?.first_name} ${userDetails.user?.last_name}`;
+  const discordJoinedAt = `**Joined Server on :** ${convertedTimestamp}`;
+  const userState = `**State :** ${userDetails.user?.state}`;
+
+  return `## User Details\n${userFullName}\n${discordJoinedAt}\n${userState}`;
 }

src/utils/getDiscordIds.ts

@@ -4,7 +4,7 @@ import * as response from "../constants/responses";
 
 export const getDiscordIds = async (
   userIds: string[] | string
-): Promise<string[] | string> => {
+): Promise<string[]> => {
   try {
     const url = `${RDS_BASE_API_URL}/users/userId`;
 
@@ -65,6 +65,7 @@ export const getDiscordIds = async (
 
     return discordIds;
   } catch (e) {
-    return response.INTERNAL_SERVER_ERROR;
+    console.log(e);
+    throw e;
   }
 };

src/utils/taskOverDueDiscordMembers.ts

@@ -20,6 +20,7 @@ export const taskOverDueDiscordMembers = async (): Promise<
 
     return assigneeIds;
   } catch (e) {
-    return errors.INTERNAL_SERVER_ERROR;
+    console.log(e);
+    throw e;
   }
 };

tests/fixtures/user.ts

@@ -173,3 +173,29 @@ export const onboardingUsersResponse = {
   message: "Users returned successfully!",
   users: users,
 };
+
+export const userWithoutDiscordJoinedAt = {
+  id: "DWcTUhbC5lRXfDjZRp06",
+  incompleteUserDetails: false,
+  discordJoinedAt: "",
+  discordId: "504855562094247953",
+  github_display_name: "Jyotsna Mehta",
+  updated_at: 1694888822719,
+  roles: {
+    archived: false,
+    in_discord: true,
+    member: false,
+    super_user: false,
+    archive: false,
+  },
+  last_name: "Mehta",
+  github_id: "j24m",
+  first_name: "Jyotsna",
+  username: "jyotsna",
+  state: "IDLE",
+};
+
+export const userWithoutDiscordJoinedAtResponse = {
+  message: "Users returned successfully!",
+  user: userWithoutDiscordJoinedAt,
+};

tests/unit/utils/formatUserDetails.test.ts

@@ -1,6 +1,9 @@
 import { UserResponseType } from "../../../src/typeDefinitions/rdsUser";
 import { formatUserDetails } from "../../../src/utils/formatUserDetails";
-import { userResponse } from "../../fixtures/user";
+import {
+  userResponse,
+  userWithoutDiscordJoinedAtResponse,
+} from "../../fixtures/user";
 import { convertTimeStamp } from "../../../src/utils/formatUserDetails";
 
 describe("formatUserDetails function", () => {
@@ -12,13 +15,27 @@ describe("formatUserDetails function", () => {
 
   it("should format user details correctly", () => {
     const formattedDetails = formatUserDetails(userResponse).trim();
-    console.log(formattedDetails);
-    const expectedFormattedDetails = `
-          ## User Details
-          **Full Name :** Sunny Sahsi
-          **RDS Discord Joined At :** ${convertTimeStamp(userResponse)}
-          **State :** ACTIVE
-        `.trim();
+
+    const userFullName = `**Full Name :** Sunny Sahsi`;
+    const discordJoinedAt = `**Joined Server on :** ${convertTimeStamp(
+      userResponse
+    )}`;
+    const userState = `**State :** ACTIVE`;
+
+    const expectedFormattedDetails = `## User Details\n${userFullName}\n${discordJoinedAt}\n${userState}`;
+    expect(formattedDetails).toEqual(expectedFormattedDetails);
+  });
+
+  it("should return empty string if discordJoinedAt is undefined", () => {
+    const formattedDetails = formatUserDetails(
+      userWithoutDiscordJoinedAtResponse
+    ).trim();
+    const userFullName = `**Full Name :** Jyotsna Mehta`;
+    const discordJoinedAt = `**Joined Server on :** ${convertTimeStamp(
+      userWithoutDiscordJoinedAtResponse
+    )}`;
+    const userState = `**State :** IDLE`;
+    const expectedFormattedDetails = `## User Details\n${userFullName}\n${discordJoinedAt}\n${userState}`;
     expect(formattedDetails).toEqual(expectedFormattedDetails);
   });
 });

tests/unit/utils/getDiscordIds.test.ts

@@ -39,11 +39,11 @@ describe("getDiscordIds()", () => {
       .spyOn(global, "fetch")
       .mockRejectedValueOnce(new Error("Network error"));
 
-    const result = await getDiscordIds([userBackendMock.user.id]);
-
-    expect(result).toEqual(
-      "Oops! We have encountered an internal Server Error"
-    );
+    try {
+      await getDiscordIds([userBackendMock.user.id]);
+    } catch (error: any) {
+      expect(error.message).toEqual("Network error");
+    }
 
     expect(global.fetch).toHaveBeenCalledWith(
       `${RDS_BASE_API_URL}/users/userId/${userBackendMock.user.id}`

tests/unit/utils/taskOverDueDiscordMembers.test.ts

@@ -27,11 +27,11 @@ describe("taskOverDueDiscordMembers()", () => {
       .spyOn(global, "fetch")
       .mockRejectedValueOnce(new Error("Network error"));
 
-    const result = await taskOverDueDiscordMembers();
-
-    expect(result).toEqual(
-      "Oops! We have encountered an internal Server Error"
-    );
+    try {
+      await taskOverDueDiscordMembers();
+    } catch (error: any) {
+      expect(error.message).toEqual("Network error");
+    }
 
     expect(global.fetch).toHaveBeenCalledWith(
       `${RDS_BASE_API_URL}/tasks?dev=true&status=overdue&size=100`