Descoping CR Feature

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,10 @@
 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';
 
 export default class SlackController {
   static async processMessageEvent(event: any) {
@@ -82,4 +86,72 @@ export default class SlackController {
       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 action_id
+      if (firstAction.action_id !== 'approve_cr') {
+        console.error('Unexpected action_id:', firstAction.action_id);
+        await replyToMessageInThread(
+          channelId,
+          threadTs,
+          `❌ An error occurred: Unexpected action type "${firstAction.action_id}". Please contact the software team.`
+        );
+        return;
+      }
+
+      // Action-specific validation: verify value format
+      let actionValue: CrApprovalActionValue;
+      try {
+        actionValue = JSON.parse(firstAction.value);
+      } catch (parseError) {
+        const parseErrorMsg = parseError instanceof Error ? parseError.message : 'Unknown parse error';
+        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.`
+        );
+        return;
+      }
+
+      // 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,
+          threadTs,
+          `❌ 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 { crId } = actionValue;
+
+      // Pass the extracted fields to the service layer for business logic
+      await SlackServices.handleApproveCRAction(userSlackId, crId, respond);
+    } 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;
+    }
+  }
 }

src/backend/src/prisma-query-args/change-requests.query-args.ts

@@ -1,17 +1,73 @@
 import { Prisma } from '@prisma/client';
-import { getScopeChangeRequestQueryArgs } from './scope-change-requests.query-args.js';
 import { getUserQueryArgs } from './user.query-args.js';
 import { getWorkPackageQueryArgs } from './work-packages.query-args.js';
 import { getReimbursementProductOtherReasonQueryArgs } from './reimbursement-product-other-reason.query-args.js';
 import { getAccountCodeQueryArgs } from './account-code.query-args.js';
+import { getTeamQueryArgs } from './teams.query-args.js';
 
 export type ChangeRequestQueryArgs = ReturnType<typeof getChangeRequestQueryArgs>;
-
 export type ChangeRequestWithProjectAndWorkPackageQueryArgs = ReturnType<
   typeof getChangeRequestWithProjectAndWorkPackageQueryArgs
 >;
-
+export type WbsProposedChangeQueryArgs = ReturnType<typeof getWbsProposedChangesQueryArgs>;
 export type ChangeRequestManyQueryArgs = ReturnType<typeof getManyChangeRequestQueryArgs>;
+export type WorkPackageProposedChangesQueryArgs = ReturnType<typeof getWorkPackageProposedChangesQueryArgs>;
+export type ProjectProposedChangesQueryArgs = ReturnType<typeof getProjectProposedChangesQueryArgs>;
+
+const getProjectProposedChangesQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.Project_Proposed_ChangesDefaultArgs>()({
+    include: {
+      teams: getTeamQueryArgs(organizationId),
+      car: { include: { wbsElement: true } },
+      workPackageProposedChanges: getWorkPackageProposedChangesQueryArgs(organizationId)
+    }
+  });
+
+const getWorkPackageProposedChangesQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.Work_Package_Proposed_ChangesDefaultArgs>()({
+    include: {
+      wbsProposedChanges: {
+        include: {
+          links: { where: { dateDeleted: null }, include: { linkType: true } },
+          proposedDescriptionBulletChanges: {
+            where: { dateDeleted: null },
+            include: {
+              descriptionBulletType: true,
+              userChecked: getUserQueryArgs(organizationId)
+            }
+          },
+          lead: getUserQueryArgs(organizationId),
+          manager: getUserQueryArgs(organizationId)
+        }
+      },
+      blockedBy: true
+    }
+  });
+
+const getWbsProposedChangesQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.Wbs_Proposed_ChangesDefaultArgs>()({
+    include: {
+      links: { where: { dateDeleted: null }, include: { linkType: true } },
+      proposedDescriptionBulletChanges: {
+        where: { dateDeleted: null },
+        include: { descriptionBulletType: true, userChecked: getUserQueryArgs(organizationId) }
+      },
+      lead: getUserQueryArgs(organizationId),
+      manager: getUserQueryArgs(organizationId),
+      projectProposedChanges: {
+        include: {
+          teams: getTeamQueryArgs(organizationId),
+          car: {
+            include: {
+              wbsElement: true
+            }
+          },
+          workPackageProposedChanges: getWorkPackageProposedChangesQueryArgs(organizationId)
+        }
+      },
+      workPackageProposedChanges: getWorkPackageProposedChangesQueryArgs(organizationId)
+    }
+  });
 
 export const getChangeRequestQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.Change_RequestDefaultArgs>()({
@@ -22,17 +78,13 @@ export const getChangeRequestQueryArgs = (organizationId: string) =>
       accountCode: getAccountCodeQueryArgs(organizationId),
       reviewer: getUserQueryArgs(organizationId),
       changes: {
-        where: {
-          wbsElement: {
-            dateDeleted: null
-          }
-        },
+        where: { wbsElement: { dateDeleted: null } },
         include: {
           implementer: getUserQueryArgs(organizationId),
           wbsElement: true
         }
       },
-      scopeChangeRequest: getScopeChangeRequestQueryArgs(organizationId),
+      wbsProposedChanges: getWbsProposedChangesQueryArgs(organizationId),
       stageGateChangeRequest: true,
       activationChangeRequest: {
         include: { lead: getUserQueryArgs(organizationId), manager: getUserQueryArgs(organizationId) }
@@ -91,19 +143,15 @@ export const getGuestChangeRequestQueryArgs = (organizationId: string) =>
           project: {
             select: {
               wbsElement: { select: { name: true } },
-              teams: {
-                select: { teamType: { select: { name: true } } }
-              }
+              teams: { select: { teamType: { select: { name: true } } } }
             }
           },
           workPackage: {
             select: {
               project: {
                 select: {
                   wbsElement: { select: { name: true } },
-                  teams: {
-                    select: { teamType: { select: { name: true } } }
-                  }
+                  teams: { select: { teamType: { select: { name: true } } } }
                 }
               }
             }
@@ -120,11 +168,7 @@ export const getChangeRequestWithProjectAndWorkPackageQueryArgs = (organizationI
       wbsElement: {
         include: {
           workPackage: getWorkPackageQueryArgs(organizationId),
-          project: {
-            include: {
-              teams: true
-            }
-          },
+          project: { include: { teams: true } },
           descriptionBullets: { where: { dateDeleted: null } },
           links: { where: { dateDeleted: null } }
         }
@@ -133,19 +177,15 @@ export const getChangeRequestWithProjectAndWorkPackageQueryArgs = (organizationI
       accountCode: getAccountCodeQueryArgs(organizationId),
       reviewer: getUserQueryArgs(organizationId),
       changes: {
-        where: {
-          wbsElement: {
-            dateDeleted: null
-          }
-        },
+        where: { wbsElement: { dateDeleted: null } },
         include: {
           implementer: getUserQueryArgs(organizationId),
           wbsElement: true,
           category: getReimbursementProductOtherReasonQueryArgs(organizationId),
           accountCode: getAccountCodeQueryArgs(organizationId)
         }
       },
-      scopeChangeRequest: getScopeChangeRequestQueryArgs(organizationId),
+      wbsProposedChanges: getWbsProposedChangesQueryArgs(organizationId),
       stageGateChangeRequest: true,
       activationChangeRequest: {
         include: { lead: getUserQueryArgs(organizationId), manager: getUserQueryArgs(organizationId) }