Merge pull request #4206 from Northeastern-Electric-Racing/feature/descoping-cr

Descoping CR Feature

Author: wavehassman

src/backend/src/controllers/change-requests.controllers.ts

@@ -83,14 +83,13 @@ export default class ChangeRequestsController {
 
   static async reviewChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { crId, reviewNotes, accepted, psId } = req.body;
+      const { crId, reviewNotes, accepted } = req.body;
       const id = await ChangeRequestsService.reviewChangeRequest(
         req.currentUser,
         crId,
-        reviewNotes,
         accepted,
         req.organization,
-        psId
+        reviewNotes
       );
       res.status(200).json({ message: `Change request #${id} successfully reviewed.` });
     } catch (error: unknown) {
@@ -100,14 +99,13 @@ export default class ChangeRequestsController {
 
   static async createActivationChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { wbsNum, type, leadId, managerId, startDate, confirmDetails } = req.body;
+      const { wbsNum, leadId, managerId, startDate, confirmDetails } = req.body;
 
       const id = await ChangeRequestsService.createActivationChangeRequest(
         req.currentUser,
         wbsNum.carNumber,
         wbsNum.projectNumber,
         wbsNum.workPackageNumber,
-        type,
         leadId,
         managerId,
         startDate,
@@ -122,14 +120,14 @@ export default class ChangeRequestsController {
 
   static async createStageGateChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { wbsNum, type, confirmDone } = req.body;
+      const { wbsNum, confirmDone, dateCompleted } = req.body;
       const id = await ChangeRequestsService.createStageGateChangeRequest(
         req.currentUser,
         wbsNum.carNumber,
         wbsNum.projectNumber,
         wbsNum.workPackageNumber,
-        type,
         confirmDone,
+        new Date(dateCompleted),
         req.organization
       );
       res.status(200).json({ message: `Successfully created stage gate request with id #${id}` });
@@ -140,10 +138,9 @@ export default class ChangeRequestsController {
 
   static async createBudgetChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { otherReasonId, accountCodeId, type, proposedBudget } = req.body;
+      const { otherReasonId, accountCodeId, proposedBudget } = req.body;
       const cr = await ChangeRequestsService.createBudgetChangeRequest(
         req.currentUser,
-        type,
         proposedBudget,
         req.organization,
         otherReasonId,
@@ -176,7 +173,7 @@ export default class ChangeRequestsController {
 
   static async createStandardChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
-      const { wbsNum, type, what, why, proposedSolutions, projectProposedChanges, workPackageProposedChanges } = req.body;
+      const { wbsNum, why, requestedReviewerId, projectProposedChanges, workPackageProposedChanges } = req.body;
       if (workPackageProposedChanges && workPackageProposedChanges.stage === 'NONE') {
         workPackageProposedChanges.stage = null;
       }
@@ -186,11 +183,9 @@ export default class ChangeRequestsController {
         wbsNum.carNumber,
         wbsNum.projectNumber,
         wbsNum.workPackageNumber,
-        type,
-        what,
         why,
-        proposedSolutions,
         req.organization,
+        requestedReviewerId,
         projectProposedChanges,
         workPackageProposedChanges
       );
@@ -200,24 +195,6 @@ export default class ChangeRequestsController {
     }
   }
 
-  static async addProposedSolution(req: Request, res: Response, next: NextFunction) {
-    try {
-      const { crId, budgetImpact, description, timelineImpact, scopeImpact } = req.body;
-      const id = await ChangeRequestsService.addProposedSolution(
-        req.currentUser,
-        crId,
-        budgetImpact,
-        description,
-        timelineImpact,
-        scopeImpact,
-        req.organization
-      );
-      res.status(200).json({ message: `Successfully added proposed solution with id #${id}` });
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
   static async deleteChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
       const { crId } = req.params as Record<string, string>;

src/backend/src/controllers/slack.controllers.ts

@@ -1,6 +1,11 @@
 import { getWorkspaceId, replyToMessageInThread } from '../integrations/slack.js';
 import OrganizationsService from '../services/organizations.services.js';
-import SlackServices, { SlackBlockActionBody, SaboSubmissionActionValue } from '../services/slack.services.js';
+import SlackServices, {
+  SlackBlockActionBody,
+  SaboSubmissionActionValue,
+  CrApprovalActionValue
+} from '../services/slack.services.js';
+import { tryParseJson } from '../utils/slack.utils.js';
 
 export default class SlackController {
   static async processMessageEvent(event: any) {
@@ -30,33 +35,75 @@ export default class SlackController {
     const [firstAction] = actions;
 
     try {
-      // Action-specific validation: verify action_id
-      if (firstAction.action_id !== 'sabo_submitted_confirmation') {
-        console.error('Unexpected action_id:', firstAction.action_id);
+      // Action-specific validation: verify value format
+      const parsed = tryParseJson<SaboSubmissionActionValue>(firstAction.value);
+      if (!parsed.ok) {
+        await replyToMessageInThread(
+          channelId,
+          threadTs,
+          `❌ An error occurred: Invalid action data format.\n\n*Error:* ${parsed.error}\n*Value:* \`${firstAction.value}\`\n\nPlease contact the software team.`
+        );
+        return;
+      }
+      const actionValue = parsed.data;
+
+      // Validate that reimbursementRequestId exists in the parsed value
+      if (!actionValue.reimbursementRequestId || typeof actionValue.reimbursementRequestId !== 'string') {
+        const actionValueStr = JSON.stringify(actionValue, null, 2);
         await replyToMessageInThread(
           channelId,
           threadTs,
-          `❌ An error occurred: Unexpected action type "${firstAction.action_id}". Please contact the software team.`
+          `❌ An error occurred: Missing or invalid reimbursement request ID.\n\n*Parsed value:*\n\`\`\`${actionValueStr}\`\`\`\n\nPlease contact the software team.`
         );
         return;
       }
 
+      // Extract validated fields
+      const userSlackId = user.id;
+      const { reimbursementRequestId } = actionValue;
+
+      // Pass the extracted fields to the service layer for business logic
+      await SlackServices.handleSaboSubmittedAction(userSlackId, reimbursementRequestId);
+    } catch (error: unknown) {
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+      await replyToMessageInThread(
+        channelId,
+        threadTs,
+        `❌ An unexpected error occurred while processing your request.\n\n*Error message:* ${errorMessage}\n\nPlease contact the software team and provide them with this information.`
+      );
+      throw error;
+    }
+  }
+
+  static async handleApproveCRAction(
+    body: SlackBlockActionBody,
+    respond: (msg: {
+      response_type?: 'ephemeral';
+      text?: string;
+      replace_original?: boolean;
+      delete_original?: boolean;
+    }) => Promise<unknown>
+  ) {
+    const { user, container, actions } = body;
+    const channelId = container.channel_id;
+    const threadTs = container.thread_ts || container.message_ts;
+    const [firstAction] = actions;
+
+    try {
       // Action-specific validation: verify value format
-      let actionValue: SaboSubmissionActionValue;
-      try {
-        actionValue = JSON.parse(firstAction.value);
-      } catch (parseError) {
-        const parseErrorMsg = parseError instanceof Error ? parseError.message : 'Unknown parse error';
+      const parsed = tryParseJson<CrApprovalActionValue>(firstAction.value);
+      if (!parsed.ok) {
         await replyToMessageInThread(
           channelId,
           threadTs,
-          `❌ An error occurred: Invalid action data format.\n\n*Error:* ${parseErrorMsg}\n*Value:* \`${firstAction.value}\`\n\nPlease contact the software team.`
+          `❌ An error occurred: Invalid action data format.\n\n*Error:* ${parsed.error}\n*Value:* \`${firstAction.value}\`\n\nPlease contact the software team.`
         );
         return;
       }
+      const actionValue = parsed.data;
 
-      // Validate that reimbursementRequestId exists in the parsed value
-      if (!actionValue.reimbursementRequestId || typeof actionValue.reimbursementRequestId !== 'string') {
+      // Validate that changeRequestId exists in the parsed value
+      if (!actionValue.crId || typeof actionValue.crId !== 'string') {
         const actionValueStr = JSON.stringify(actionValue, null, 2);
         await replyToMessageInThread(
           channelId,
@@ -68,10 +115,10 @@ export default class SlackController {
 
       // Extract validated fields
       const userSlackId = user.id;
-      const { reimbursementRequestId } = actionValue;
+      const { crId } = actionValue;
 
       // Pass the extracted fields to the service layer for business logic
-      await SlackServices.handleSaboSubmittedAction(userSlackId, reimbursementRequestId);
+      await SlackServices.handleApproveCRAction(userSlackId, crId, respond);
     } catch (error: unknown) {
       const errorMessage = error instanceof Error ? error.message : 'Unknown error';
       await replyToMessageInThread(