Fix Prod issues on /user command (RealDevSquad#161)

* Refactor/fix : handle case if no user found, improve test stas, remove time from time stamp

* Refactor : discordJoinedAt to Joined Server on and return N/A for undefined server join date

Author: j24m

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/utils/formatUserDetails.ts

@@ -1,26 +1,26 @@
 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);
 
   const userFullName = `**Full Name :** ${userDetails.user?.first_name} ${userDetails.user?.last_name}`;
-  const discordJoinedAt = `**RDS Discord Joined at :** ${convertedTimestamp}`;
+  const discordJoinedAt = `**Joined Server on :** ${convertedTimestamp}`;
   const userState = `**State :** ${userDetails.user?.state}`;
 
   return `## User Details\n${userFullName}\n${discordJoinedAt}\n${userState}`;

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", () => {
@@ -14,12 +17,25 @@ describe("formatUserDetails function", () => {
     const formattedDetails = formatUserDetails(userResponse).trim();
 
     const userFullName = `**Full Name :** Sunny Sahsi`;
-    const discordJoinedAt = `**RDS Discord Joined at :** ${convertTimeStamp(
+    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);
+  });
 });