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

Dev to main sync

Author: iamitprakash

config/config.ts

@@ -6,21 +6,27 @@ import {
   VERIFICATION_SITE_URL,
   STAGING_VERIFICATION_SITE_URL,
   DEVELOPMENT_VERIFICATION_SITE_URL,
+  RDS_TRACKING_CHANNEL_URL,
+  DEVELOPMENT_RDS_TRACKING_CHANNEL_URL,
+  STAGING_RDS_TRACKING_CHANNEL_URL,
 } from "../src/constants/urls";
 
 const config = (env: env) => {
   const environment: environment = {
     production: {
       RDS_BASE_API_URL: RDS_BASE_API_URL,
       VERIFICATION_SITE_URL: VERIFICATION_SITE_URL,
+      TRACKING_CHANNEL_URL: RDS_TRACKING_CHANNEL_URL,
     },
     staging: {
       RDS_BASE_API_URL: RDS_BASE_STAGING_API_URL,
       VERIFICATION_SITE_URL: STAGING_VERIFICATION_SITE_URL,
+      TRACKING_CHANNEL_URL: STAGING_RDS_TRACKING_CHANNEL_URL,
     },
     default: {
       RDS_BASE_API_URL: RDS_BASE_DEVELOPMENT_API_URL,
       VERIFICATION_SITE_URL: DEVELOPMENT_VERIFICATION_SITE_URL,
+      TRACKING_CHANNEL_URL: DEVELOPMENT_RDS_TRACKING_CHANNEL_URL,
     },
   };
 

src/constants/commands.ts

@@ -79,3 +79,50 @@ export const USER = {
     },
   ],
 };
+
+export const NOTIFY = {
+  name: "notify",
+  description: "notify the user",
+  options: [
+    {
+      name: "type",
+      description: "type of notification",
+      type: 3,
+      required: true,
+      choices: [
+        {
+          name: "OVERDUE",
+          value: "OVERDUE",
+        },
+        {
+          name: "ONBOARDING",
+          value: "ONBOARDING",
+        },
+      ],
+    },
+    {
+      name: "sub-type",
+      description: "sub-type of notification",
+      type: 3,
+      required: false,
+      choices: [
+        {
+          name: "In 1 Day",
+          value: "1",
+        },
+        {
+          name: "In 2 Day",
+          value: "2",
+        },
+        {
+          name: "> 7 Days",
+          value: "7",
+        },
+        {
+          name: "> 31 Days",
+          value: "31",
+        },
+      ],
+    },
+  ],
+};

src/constants/inviteOptions.ts

@@ -0,0 +1,4 @@
+export const INVITE_OPTIONS = {
+  MAX_USE: 1,
+  UNIQUE: true,
+};

src/constants/responses.ts

@@ -14,6 +14,10 @@ export const STATUS_CHECK = {
   message: "Welcome to our discord Bot Server 👋",
 };
 
+export const TOO_MANY_REQUESTS = {
+  error: "Too many requests!",
+};
+
 export const COMMAND_NOT_FOUND = "Command Not Found";
 
 export const INTERNAL_SERVER_ERROR =
@@ -24,6 +28,8 @@ export const RETRY_COMMAND =
 
 export const ROLE_ADDED = "Role added successfully";
 
+export const INVITED_CREATED = "Invite created successfully!";
+
 export const NAME_CHANGED = "User nickname changed successfully";
 
 export const ROLE_REMOVED = "Role Removed successfully";
@@ -40,6 +46,9 @@ export const ROLE_FETCH_FAILED =
 export const BAD_REQUEST = {
   error: "Oops! This is not a proper request.",
 };
+export const UNAUTHORIZED = {
+  error: "UnAuthorized!",
+};
 
 export const LISTENING_SUCCESS_MESSAGE =
   "Your name is now changed to reflect your listening status";
@@ -55,3 +64,11 @@ export const TASKS_FETCH_FAILED = "An error occurred while fetching tasks.";
 export const FAILED_TO_FETCH_TASKS = `Failed to fetch tasks for **{{assignee}}**.`;
 export const USER_NOT_FOUND = `User Not Found`;
 export const USER_STATUS_NOT_FOUND = "No Status Found";
+
+export const OVERDUE_DEFAULT_MESSAGE = "You have overdue tasks.";
+export const OVERDUE_CUSTOM_MESSAGE =
+  "Please be aware that you currently have tasks that are overdue or due within the next {{days}} day. If you require additional time to complete these tasks, kindly submit an extension request.";
+
+export const ONBOARDING_DEFAULT_MESSAGE = `You currently have an onboarding status. Please provide an update explaining any challenges you're facing in completing your tasks. If you're finished, consider assigning new tasks to Admin.`;
+
+export const ONBOARDING_CUSTOM_MESSAGE = `Please update your status explaining why you are unable to complete your onboarding tasks within {{days}} days.`;

src/constants/urls.ts

@@ -13,4 +13,10 @@ export const STAGING_VERIFICATION_SITE_URL =
 export const RDS_TRACKING_CHANNEL_URL =
   "https://discord.com/api/v10/channels/1136650427878871090/messages";
 
+export const STAGING_RDS_TRACKING_CHANNEL_URL =
+  "https://discord.com/api/v10/channels/1154572818902696028/messages";
+
+export const DEVELOPMENT_RDS_TRACKING_CHANNEL_URL =
+  "https://discord.com/api/v10/channels/1136583634845962261/messages";
+
 export const RDS_STATUS_SITE_URL = "https://status.realdevsquad.com";

src/controllers/baseHandler.ts

@@ -3,6 +3,7 @@ import { helloCommand } from "./helloCommand";
 import { verifyCommand } from "./verifyCommand";
 import { mentionEachUser } from "./mentionEachUser";
 import { taskCommand } from "./taskCommand";
+import { notifyCommand } from "./notifyCommand";
 import { oooCommand } from "./oooCommand";
 import { userCommand } from "./userCommand";
 
@@ -22,6 +23,7 @@ import {
   MENTION_EACH,
   VERIFY,
   TASK,
+  NOTIFY,
   OOO,
   USER,
 } from "../constants/commands";
@@ -118,7 +120,11 @@ export async function baseHandler(
     }
     case getCommandName(TASK): {
       const data = message.data?.options as Array<messageRequestDataOptions>;
-      return await taskCommand(data[0].value, env);
+      return await taskCommand(data[0].value);
+    }
+    case getCommandName(NOTIFY): {
+      const data = message.data?.options as Array<messageRequestDataOptions>;
+      return await notifyCommand(data);
     }
     case getCommandName(OOO): {
       const data = message.data?.options as Array<messageRequestDataOptions>;

src/controllers/generateDiscordInvite.ts

@@ -0,0 +1,22 @@
+import { IRequest } from "itty-router";
+import * as response from "../constants/responses";
+import { env } from "../typeDefinitions/default.types";
+import JSONResponse from "../utils/JsonResponse";
+import { verifyAuthToken } from "../utils/verifyAuthToken";
+import { generateDiscordLink } from "../utils/generateDiscordInvite";
+import { inviteLinkBody } from "../typeDefinitions/discordLink.types";
+
+export async function generateInviteLink(request: IRequest, env: env) {
+  const authHeader = request.headers.get("Authorization");
+  if (!authHeader) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+  try {
+    await verifyAuthToken(authHeader, env);
+    const body: inviteLinkBody = await request.json();
+    const res = await generateDiscordLink(body, env);
+    return new JSONResponse(res);
+  } catch (err) {
+    return new JSONResponse(response.BAD_SIGNATURE);
+  }
+}

src/controllers/notifyCommand.ts

@@ -0,0 +1,66 @@
+import {
+  OVERDUE_DEFAULT_MESSAGE,
+  OVERDUE_CUSTOM_MESSAGE,
+  ONBOARDING_DEFAULT_MESSAGE,
+  ONBOARDING_CUSTOM_MESSAGE,
+} from "../constants/responses";
+import {
+  UserOverdueTaskResponseType,
+  UserResponseType,
+} from "../typeDefinitions/rdsUser";
+import { discordTextResponse } from "../utils/discordResponse";
+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;
+
+  try {
+    if (typeValue === "OVERDUE") {
+      const options = {
+        isOverdue: true,
+        days: daysValue,
+      };
+      const usersResponse = (await fetchRdsData(
+        options
+      )) as UserOverdueTaskResponseType;
+      const discordIDs = extractDiscordIds(usersResponse);
+      const formattedIds = createTaggableDiscordIds(discordIDs);
+
+      const message = `**Message:** ${
+        daysValue
+          ? 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") {
+      const options = {
+        isOnboarding: true,
+        days: daysValue,
+      };
+      const users = (await fetchRdsData(options)) as UserResponseType;
+      const discordIDs = extractDiscordIds(users);
+      const formattedIds = createTaggableDiscordIds(discordIDs);
+
+      const message = `**Message:** ${
+        daysValue
+          ? ONBOARDING_CUSTOM_MESSAGE.replace("{{days}}", daysValue)
+          : ONBOARDING_DEFAULT_MESSAGE
+      }`;
+
+      const usersMessage = `**Developers:** ${formattedIds.join(", ")}`;
+      const responseMessage = `${message}\n${usersMessage}`;
+      return discordTextResponse(responseMessage);
+    }
+    const responseMessage = "Please provide a valid type";
+    return discordTextResponse(responseMessage);
+  } catch (error) {
+    console.error(error);
+    return discordTextResponse("Something went wrong");
+  }
+}

src/handlers/scheduledEventHandler.ts

@@ -2,7 +2,7 @@ import { env } from "../typeDefinitions/default.types";
 import { taskOverDueDiscordMembers } from "../utils/taskOverDueDiscordMembers";
 import * as error from "../constants/responses";
 import { getDiscordIds } from "../utils/getDiscordIds";
-import { RDS_TRACKING_CHANNEL_URL } from "../constants/urls";
+import config from "../../config/config";
 import { SUPER_USER_ONE, SUPER_USER_TWO } from "../constants/variables";
 
 export async function send(env: env): Promise<void> {
@@ -40,7 +40,7 @@ export async function send(env: env): Promise<void> {
       content: stringToBeSent,
     };
 
-    const url = `${RDS_TRACKING_CHANNEL_URL}`;
+    const url = config(env).TRACKING_CHANNEL_URL;
 
     const res = await fetch(url, {
       method: "POST",

src/index.ts

@@ -17,6 +17,7 @@ import { getMembersInServerHandler } from "./controllers/getMembersInServer";
 import { changeNickname } from "./controllers/changeNickname";
 import { getGuildMemberDetailsHandler } from "./controllers/getGuildMemberDetailsHandler";
 import { send } from "./handlers/scheduledEventHandler";
+import { generateInviteLink } from "./controllers/generateDiscordInvite";
 
 const router = Router();
 
@@ -44,6 +45,7 @@ router.get("/member/:id", getGuildMemberDetailsHandler);
 router.patch("/guild/member", changeNickname);
 
 router.put("/roles/create", createGuildRoleHandler);
+router.post("/invite", generateInviteLink);
 
 router.put("/roles/add", addGroupRoleHandler);
 
@@ -71,10 +73,11 @@ router.all("*", async () => {
 
 export default {
   async fetch(request: Request, env: env): Promise<Response> {
-    if (request.method === "POST") {
+    const apiUrls = ["/invite"];
+    const url = new URL(request.url);
+    if (request.method === "POST" && !apiUrls.includes(url.pathname)) {
       const isVerifiedRequest = await verifyBot(request, env);
       if (!isVerifiedRequest) {
-        console.error("Invalid Request");
         return new JSONResponse(response.BAD_SIGNATURE, { status: 401 });
       }
     }