Merge pull request RealDevSquad#158 from Real-Dev-Squad/develop

Dev to main sync

Author: sahsisunny

src/constants/commands.ts

@@ -80,39 +80,46 @@ export const USER = {
   ],
 };
 
-export const NOTIFY = {
-  name: "notify",
-  description: "notify the user",
+export const NOTIFY_OVERDUE = {
+  name: "notify-overdue",
+  description: "Notify the user about overdue tasks.",
   options: [
     {
-      name: "type",
-      description: "type of notification",
+      name: "notify-overdue",
+      description: "Select the number of days",
       type: 3,
       required: true,
       choices: [
         {
-          name: "OVERDUE",
-          value: "OVERDUE",
+          name: "Already Overdue",
+          value: "0",
         },
         {
-          name: "ONBOARDING",
-          value: "ONBOARDING",
+          name: "In 1 Day",
+          value: "1",
+        },
+        {
+          name: "In 2 Days",
+          value: "2",
         },
       ],
     },
+  ],
+};
+
+export const NOTIFY_ONBOARDING = {
+  name: "notify-onboarding",
+  description: "Notify the user about onboarding information.",
+  options: [
     {
-      name: "sub-type",
-      description: "sub-type of notification",
+      name: "notify-onboarding",
+      description: "Select the number of days",
       type: 3,
-      required: false,
+      required: true,
       choices: [
         {
-          name: "In 1 Day",
-          value: "1",
-        },
-        {
-          name: "In 2 Day",
-          value: "2",
+          name: "All Onboarding Users",
+          value: "0",
         },
         {
           name: "> 7 Days",

src/controllers/baseHandler.ts

@@ -23,7 +23,8 @@ import {
   MENTION_EACH,
   VERIFY,
   TASK,
-  NOTIFY,
+  NOTIFY_OVERDUE,
+  NOTIFY_ONBOARDING,
   OOO,
   USER,
 } from "../constants/commands";
@@ -122,9 +123,13 @@ export async function baseHandler(
       const data = message.data?.options as Array<messageRequestDataOptions>;
       return await taskCommand(data[0].value);
     }
-    case getCommandName(NOTIFY): {
+    case getCommandName(NOTIFY_OVERDUE): {
       const data = message.data?.options as Array<messageRequestDataOptions>;
-      return await notifyCommand(data);
+      return await notifyCommand(data, true, false);
+    }
+    case getCommandName(NOTIFY_ONBOARDING): {
+      const data = message.data?.options as Array<messageRequestDataOptions>;
+      return await notifyCommand(data, false, true);
     }
     case getCommandName(OOO): {
       const data = message.data?.options as Array<messageRequestDataOptions>;

src/controllers/notifyCommand.ts

@@ -13,15 +13,18 @@ import { fetchRdsData } from "../utils/fetchRdsData";
 import { createTaggableDiscordIds } from "../utils/createTaggableDiscordIds";
 import { extractDiscordIds } from "../utils/extractDiscordIds";
 
-export async function notifyCommand(data: Array<{ value: string }>) {
-  const typeValue = data[0].value;
-  const daysValue = data[1]?.value;
+export async function notifyCommand(
+  data: Array<{ value: string }>,
+  overdue?: boolean,
+  onboarding?: boolean
+) {
+  const daysValue = data[0]?.value;
 
   try {
-    if (typeValue === "OVERDUE") {
+    if (overdue) {
       const options = {
-        isOverdue: true,
         days: daysValue,
+        isOverdue: true,
       };
       const usersResponse = (await fetchRdsData(
         options
@@ -30,25 +33,25 @@ export async function notifyCommand(data: Array<{ value: string }>) {
       const formattedIds = createTaggableDiscordIds(discordIDs);
 
       const message = `**Message:** ${
-        daysValue
+        Number(daysValue) > 0
           ? OVERDUE_CUSTOM_MESSAGE.replace("{{days}}", daysValue)
           : OVERDUE_DEFAULT_MESSAGE
       }`;
 
       const users = `**Developers:** ${formattedIds.join(", ")}`;
       const responseMessage = `${message}\n${users}`;
       return discordTextResponse(responseMessage);
-    } else if (typeValue === "ONBOARDING") {
+    } else if (onboarding) {
       const options = {
-        isOnboarding: true,
         days: daysValue,
+        isOnboarding: true,
       };
       const users = (await fetchRdsData(options)) as UserResponseType;
       const discordIDs = extractDiscordIds(users);
       const formattedIds = createTaggableDiscordIds(discordIDs);
 
       const message = `**Message:** ${
-        daysValue
+        Number(daysValue) > 0
           ? ONBOARDING_CUSTOM_MESSAGE.replace("{{days}}", daysValue)
           : ONBOARDING_DEFAULT_MESSAGE
       }`;

src/register.ts

@@ -4,7 +4,8 @@ import {
   VERIFY,
   LISTENING,
   TASK,
-  NOTIFY,
+  NOTIFY_OVERDUE,
+  NOTIFY_ONBOARDING,
   OOO,
   USER,
 } from "./constants/commands";
@@ -34,7 +35,8 @@ async function registerGuildCommands(
     TASK,
     OOO,
     USER,
-    NOTIFY,
+    NOTIFY_OVERDUE,
+    NOTIFY_ONBOARDING,
   ];
 
   try {

src/utils/fetchRdsData.ts

@@ -26,13 +26,15 @@ async function fetchRdsData(options = {}) {
     let url = RDS_BASE_API_URL;
 
     if (isOnboarding) {
-      url += days
-        ? `/users/search?state=ONBOARDING&time=${days}d`
-        : `/users/search?state=ONBOARDING`;
+      url +=
+        Number(days) > 0
+          ? `/users/search?state=ONBOARDING&time=${days}d`
+          : `/users/search?state=ONBOARDING`;
     } else if (isOverdue) {
-      url += days
-        ? `/users?query=filterBy:overdue_tasks+days:${days}`
-        : `/users?query=filterBy:overdue_tasks`;
+      url +=
+        Number(days) > 0
+          ? `/users?query=filterBy:overdue_tasks+days:${days}`
+          : `/users?query=filterBy:overdue_tasks`;
     }
     const response = await fetch(url);