Merge branch 'develop' into pallab/group-invite

pallabez · web-flow · commit 3e4b830fccaf · 2024-09-29T15:49:31.000+05:30
diff --git a/.github/workflows/register-commands-staging.yaml b/.github/workflows/register-commands-staging.yaml
@@ -34,6 +34,7 @@ jobs:
             DISCORD_GUILD_ID
             CURRENT_ENVIRONMENT
             BOT_PRIVATE_KEY
+            RDS_SERVERLESS_PUBLIC_KEY
             CRON_JOBS_PUBLIC_KEY
             IDENTITY_SERVICE_PUBLIC_KEY
         env:
@@ -43,5 +44,6 @@ jobs:
           DISCORD_TOKEN: ${{secrets.DISCORD_TOKEN}}
           BOT_PRIVATE_KEY: ${{secrets.BOT_PRIVATE_KEY}}
           DISCORD_GUILD_ID: ${{secrets.DISCORD_GUILD_ID}}
+          RDS_SERVERLESS_PUBLIC_KEY: ${{secrets.RDS_SERVERLESS_PUBLIC_KEY}}
           CRON_JOBS_PUBLIC_KEY: ${{secrets.CRON_JOBS_PUBLIC_KEY}}
           IDENTITY_SERVICE_PUBLIC_KEY: ${{secrets.IDENTITY_SERVICE_PUBLIC_KEY}}
diff --git a/src/constants/commands.ts b/src/constants/commands.ts
@@ -115,6 +115,12 @@ export const USER = {
       type: 6,
       required: true,
     },
+    {
+      name: "dev",
+      description: "want to see extra details?",
+      type: 5,
+      require: false,
+    },
   ],
 };
 
diff --git a/src/controllers/baseHandler.ts b/src/controllers/baseHandler.ts
@@ -156,7 +156,10 @@ export async function baseHandler(
 
     case getCommandName(USER): {
       const data = message.data?.options as Array<messageRequestDataOptions>;
-      return await userCommand(data[0].value, env);
+      const dev = data.find(
+        (item) => item.name === "dev"
+      ) as unknown as DevFlag;
+      return await userCommand(data[0].value, env, dev);
     }
 
     case getCommandName(GROUP_INVITE): {
diff --git a/src/controllers/userCommand.ts b/src/controllers/userCommand.ts
@@ -2,15 +2,17 @@ import { env } from "../typeDefinitions/default.types";
 import { discordTextResponse } from "../utils/discordResponse";
 import { getUserDetails } from "../utils/getUserDetails";
 import { formatUserDetails } from "../utils/formatUserDetails";
+import { DevFlag } from "../typeDefinitions/filterUsersByRole";
 import { USER_NOT_FOUND } from "../constants/responses";
 
-export async function userCommand(discordId: string, env: env) {
+export async function userCommand(discordId: string, env: env, dev?: DevFlag) {
   try {
+    const flag = dev?.value || false;
     const userDetails = await getUserDetails(discordId);
     if (!userDetails.user?.discordId) {
       return discordTextResponse(USER_NOT_FOUND);
     }
-    const formattedUserDetails = formatUserDetails(userDetails);
+    const formattedUserDetails = formatUserDetails(userDetails, flag);
     return discordTextResponse(formattedUserDetails);
   } catch (error) {
     return discordTextResponse("Trouble in fetching user details.");
diff --git a/src/utils/formatUserDetails.ts b/src/utils/formatUserDetails.ts
@@ -1,6 +1,6 @@
 import { UserResponseType } from "../typeDefinitions/rdsUser";
 
-export function convertTimeStamp(userDetails: UserResponseType) {
+export function convertTimeStamp(userDetails: UserResponseType, flag: boolean) {
   const timestamp = userDetails.user?.discordJoinedAt;
 
   if (timestamp) {
@@ -9,19 +9,55 @@ export function convertTimeStamp(userDetails: UserResponseType) {
     const day = String(date.getDate()).padStart(2, "0");
     const month = String(date.getMonth() + 1).padStart(2, "0");
     const year = date.getFullYear();
+    if (flag) {
+      const monthName = date.toLocaleString("default", { month: "short" });
+      const formattedDate = `${day} ${monthName}, ${year}`;
+      return formattedDate;
+    }
     const formattedDate = `${day}/${month}/${year}`;
     return formattedDate;
   }
 
   return "N/A";
 }
+export function convertEpochToDate(timestamp: number | undefined) {
+  if (timestamp) {
+    const date = new Date(timestamp);
+
+    const day = String(date.getDate()).padStart(2, "0");
+    const month = date.toLocaleString("default", { month: "short" });
+    const year = date.getFullYear();
+    const formattedDate = `${day} ${month}, ${year}`;
+
+    return formattedDate;
+  }
+
+  return "N/A";
+}
+
+export function formatUserDetails(
+  userDetails: UserResponseType,
+  flag: boolean
+) {
+  const convertedTimestamp = convertTimeStamp(userDetails, flag);
+  const accountCreationDate = convertEpochToDate(userDetails.user?.created_at);
 
-export function formatUserDetails(userDetails: UserResponseType) {
-  const convertedTimestamp = convertTimeStamp(userDetails);
+  const userId = " ".repeat(30) + `**Id:** ${userDetails.user?.id}`;
+  const userName =
+    " ".repeat(13) + `**Username:** ${userDetails.user?.username}`;
+  const userFullName = `${
+    flag ? " ".repeat(13) + "**Full Name:**" : "**Full Name :**"
+  } ${userDetails.user?.first_name} ${userDetails.user?.last_name}`;
+  const userState = `${flag ? " ".repeat(23) + "**State:**" : "**State :**"} ${
+    userDetails.user?.state
+  }`;
+  const discordJoinedAt = `${
+    flag ? " ".repeat(4) + "**Joined Discord:**" : "**Joined Server on :**"
+  } ${convertedTimestamp}`;
+  const accountCreated = `**Account Created:** ${accountCreationDate}`;
 
-  const userFullName = `**Full Name :** ${userDetails.user?.first_name} ${userDetails.user?.last_name}`;
-  const discordJoinedAt = `**Joined Server on :** ${convertedTimestamp}`;
-  const userState = `**State :** ${userDetails.user?.state}`;
+  if (!flag)
+    return `## User Details\n${userFullName}\n${userState}\n${discordJoinedAt}`;
 
-  return `## User Details\n${userFullName}\n${discordJoinedAt}\n${userState}`;
+  return `## User Details\n${userName}\n${userState}\n\n${userFullName}\n${userId}\n\n${accountCreated}\n${discordJoinedAt}`;
 }
diff --git a/tests/fixtures/user.ts b/tests/fixtures/user.ts
@@ -2,8 +2,9 @@ export const user = {
   id: "iODXB6ns8jaZB9p0XlBw",
   incompleteUserDetails: false,
   discordJoinedAt: "2023-08-08T11:40:42.522000+00:00",
+  created_at: 1692748800000,
   discordId: "858838385330487336",
-  github_display_name: "Sunny Sahsi",
+  github_display_name: "John Doe",
   updated_at: 1694888822719,
   roles: {
     archived: false,
@@ -12,10 +13,10 @@ export const user = {
     super_user: false,
     archive: false,
   },
-  last_name: "Sahsi",
-  github_id: "sahsisunny",
-  first_name: "Sunny",
-  username: "sunny",
+  last_name: "Doe",
+  github_id: "johndoe",
+  first_name: "John",
+  username: "johndoe",
   state: "ACTIVE",
 };
 
@@ -178,8 +179,9 @@ export const userWithoutDiscordJoinedAt = {
   id: "DWcTUhbC5lRXfDjZRp06",
   incompleteUserDetails: false,
   discordJoinedAt: "",
+  created_at: 1692748800000,
   discordId: "504855562094247953",
-  github_display_name: "Jyotsna Mehta",
+  github_display_name: "John Doe",
   updated_at: 1694888822719,
   roles: {
     archived: false,
@@ -188,10 +190,10 @@ export const userWithoutDiscordJoinedAt = {
     super_user: false,
     archive: false,
   },
-  last_name: "Mehta",
-  github_id: "j24m",
-  first_name: "Jyotsna",
-  username: "jyotsna",
+  last_name: "Doe",
+  github_id: "johndoe",
+  first_name: "John",
+  username: "johndoe",
   state: "IDLE",
 };
 
diff --git a/tests/unit/utils/formatUserDetails.test.ts b/tests/unit/utils/formatUserDetails.test.ts
@@ -4,38 +4,88 @@ import {
   userResponse,
   userWithoutDiscordJoinedAtResponse,
 } from "../../fixtures/user";
-import { convertTimeStamp } from "../../../src/utils/formatUserDetails";
+import {
+  convertTimeStamp,
+  convertEpochToDate,
+} from "../../../src/utils/formatUserDetails";
 
 describe("formatUserDetails function", () => {
   it("Should return a string", () => {
     const userData: UserResponseType = userResponse;
-    const formattedUserDetails = formatUserDetails(userData);
+    const formattedUserDetails = formatUserDetails(userData, true);
     expect(typeof formattedUserDetails).toBe("string");
   });
 
-  it("should format user details correctly", () => {
-    const formattedDetails = formatUserDetails(userResponse).trim();
+  it("should format user details correctly in dev mode", () => {
+    const formattedDetails = formatUserDetails(userResponse, true).trim();
 
-    const userFullName = `**Full Name :** Sunny Sahsi`;
-    const discordJoinedAt = `**Joined Server on :** ${convertTimeStamp(
-      userResponse
+    const userId = " ".repeat(30) + `**Id:** iODXB6ns8jaZB9p0XlBw`;
+    const userName = " ".repeat(13) + `**Username:** johndoe`;
+    const userFullName = " ".repeat(13) + `**Full Name:** John Doe`;
+    const userState = " ".repeat(23) + `**State:** ACTIVE`;
+    const discordJoinedAt =
+      " ".repeat(4) +
+      `**Joined Discord:** ${convertTimeStamp(userResponse, true)}`;
+    const accountCreated = `**Account Created:** ${convertEpochToDate(
+      userResponse.user.created_at
     )}`;
+
+    const expectedFormattedDetails = `## User Details\n${userName}\n${userState}\n\n${userFullName}\n${userId}\n\n${accountCreated}\n${discordJoinedAt}`;
+    expect(formattedDetails).toEqual(expectedFormattedDetails);
+  });
+
+  it("should format user details correctly when not in dev mode", () => {
+    const formattedDetails = formatUserDetails(userResponse, false).trim();
+
+    const userFullName = `**Full Name :** John Doe`;
     const userState = `**State :** ACTIVE`;
+    const discordJoinedAt = `**Joined Server on :** ${convertTimeStamp(
+      userResponse,
+      false
+    )}`;
 
-    const expectedFormattedDetails = `## User Details\n${userFullName}\n${discordJoinedAt}\n${userState}`;
+    const expectedFormattedDetails = `## User Details\n${userFullName}\n${userState}\n${discordJoinedAt}`;
     expect(formattedDetails).toEqual(expectedFormattedDetails);
   });
 
-  it("should return empty string if discordJoinedAt is undefined", () => {
+  it("should return empty string if discordJoinedAt is undefined in dev mode", () => {
     const formattedDetails = formatUserDetails(
-      userWithoutDiscordJoinedAtResponse
+      userWithoutDiscordJoinedAtResponse,
+      true
     ).trim();
-    const userFullName = `**Full Name :** Jyotsna Mehta`;
-    const discordJoinedAt = `**Joined Server on :** ${convertTimeStamp(
-      userWithoutDiscordJoinedAtResponse
+
+    const userId = " ".repeat(30) + `**Id:** DWcTUhbC5lRXfDjZRp06`;
+    const userName = " ".repeat(13) + `**Username:** johndoe`;
+    const userFullName = " ".repeat(13) + `**Full Name:** John Doe`;
+    const userState = " ".repeat(23) + `**State:** IDLE`;
+    const discordJoinedAt =
+      " ".repeat(4) +
+      `**Joined Discord:** ${convertTimeStamp(
+        userWithoutDiscordJoinedAtResponse,
+        true
+      )}`;
+    const accountCreated = `**Account Created:** ${convertEpochToDate(
+      userResponse.user.created_at
     )}`;
+
+    const expectedFormattedDetails = `## User Details\n${userName}\n${userState}\n\n${userFullName}\n${userId}\n\n${accountCreated}\n${discordJoinedAt}`;
+    expect(formattedDetails).toEqual(expectedFormattedDetails);
+  });
+
+  it("should return empty string if discordJoinedAt is undefined when not in dev mode", () => {
+    const formattedDetails = formatUserDetails(
+      userWithoutDiscordJoinedAtResponse,
+      false
+    ).trim();
+
+    const userFullName = `**Full Name :** John Doe`;
     const userState = `**State :** IDLE`;
-    const expectedFormattedDetails = `## User Details\n${userFullName}\n${discordJoinedAt}\n${userState}`;
+    const discordJoinedAt = `**Joined Server on :** ${convertTimeStamp(
+      userWithoutDiscordJoinedAtResponse,
+      false
+    )}`;
+
+    const expectedFormattedDetails = `## User Details\n${userFullName}\n${userState}\n${discordJoinedAt}`;
     expect(formattedDetails).toEqual(expectedFormattedDetails);
   });
 });
