#1587: copied changes from old branch to this branch

src/backend/src/controllers/work-packages.controllers.ts

@@ -111,9 +111,10 @@ export default class WorkPackagesController {
     try {
       const user = await getCurrentUser(res);
       const wbsNum = validateWBS(req.params.wbsNum);
+      const { crId } = req.body;
       const organizationId = getOrganizationId(req.headers);
 
-      await WorkPackagesService.deleteWorkPackage(user, wbsNum, organizationId);
+      await WorkPackagesService.deleteWorkPackage(user, wbsNum, crId, organizationId);
       res.status(200).json({ message: `Successfully deleted work package #${req.params.wbsNum}` });
     } catch (error: unknown) {
       next(error);

src/backend/src/routes/work-packages.routes.ts

@@ -51,7 +51,7 @@ workPackagesRouter.post(
   validateInputs,
   WorkPackagesController.editWorkPackage
 );
-workPackagesRouter.delete('/:wbsNum/delete', WorkPackagesController.deleteWorkPackage);
+workPackagesRouter.delete('/:wbsNum/delete', intMinZero(body('crId')), WorkPackagesController.deleteWorkPackage);
 workPackagesRouter.get('/:wbsNum/blocking', WorkPackagesController.getBlockingWorkPackages);
 workPackagesRouter.post(
   '/slack-upcoming-deadlines',

src/backend/src/services/projects.services.ts

@@ -406,7 +406,12 @@ export default class ProjectsService {
     await Promise.all(
       workPackages.map(
         async (workPackage) =>
-          await WorkPackagesService.deleteWorkPackage(user, wbsNumOf(workPackage.wbsElement), organizationId)
+          await WorkPackagesService.deleteWorkPackage(
+            user,
+            wbsNumOf(workPackage.wbsElement),
+            workPackage.workPackageId,
+            organizationId
+          )
       )
     );
 

src/backend/src/services/work-packages.services.ts

@@ -426,9 +426,10 @@ export default class WorkPackagesService {
    * Deletes the Work Package
    * @param submitter The user who deleted the work package
    * @param wbsNum The work package number to be deleted
+   * @param crId The id of the change request to be implemented by this deletion
    * @param organizationId The organization id that the user is in
    */
-  static async deleteWorkPackage(submitter: User, wbsNum: WbsNumber, organizationId: string): Promise<void> {
+  static async deleteWorkPackage(submitter: User, wbsNum: WbsNumber, crId: string, organizationId: string): Promise<void> {
     // Verify submitter is allowed to delete work packages
     if (!(await userHasPermission(submitter.userId, organizationId, isAdmin)))
       throw new AccessDeniedAdminOnlyException('delete work packages');
@@ -437,6 +438,17 @@ export default class WorkPackagesService {
 
     const { wbsElementId, id: workPackageId } = workPackage;
 
+    await validateChangeRequestAccepted(crId);
+
+    await prisma.change.create({
+      data: {
+        changeRequestId: crId,
+        implementerId: submitter.userId,
+        wbsElementId,
+        detail: 'Work Package Deleted'
+      }
+    });
+
     const dateDeleted = new Date();
     const deletedByUserId = submitter.userId;