merge into final changes branch

Author: chpy04

src/backend/src/controllers/part-review.controllers.ts

@@ -9,7 +9,7 @@ export default class PartReviewController {
       const { wbsNum, indexNum } = req.params;
 
       const wbsNumber: WbsNumber = validateWBS(wbsNum);
-      const part = await PartReviewService.getPart(req.organization, wbsNumber, indexNum);
+      const part = await PartReviewService.getPart(req.organization, req.currentUser, wbsNumber, indexNum);
       res.status(200).json(part);
     } catch (error: unknown) {
       next(error);
@@ -83,7 +83,7 @@ export default class PartReviewController {
 
   static async updatePart(req: Request, res: Response, next: NextFunction) {
     try {
-      const { index, commonName, description, reviewStatus, tagIds, assigneeIds } = req.body;
+      const { index, commonName, description, reviewStatus, tagIds, assigneeIds, reviewerIds } = req.body;
       const { partId } = req.params;
       const part = await PartReviewService.updatePart(
         req.organization.organizationId,
@@ -94,7 +94,8 @@ export default class PartReviewController {
         description,
         reviewStatus,
         tagIds,
-        assigneeIds
+        assigneeIds,
+        reviewerIds
       );
       res.status(200).json(part);
     } catch (error: unknown) {
@@ -147,6 +148,16 @@ export default class PartReviewController {
     }
   }
 
+  static async deleteReview(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { reviewId } = req.params;
+      await PartReviewService.deleteReview(reviewId, req.currentUser, req.organization.organizationId);
+      res.status(200).json({ message: 'Successfully deleted review' });
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createSubmission(req: Request, res: Response, next: NextFunction) {
     try {
       const { partId, name, fileIds, notes } = req.body;

src/backend/src/prisma/seed-data/parts.seed.ts

@@ -11,7 +11,6 @@ const basicPart = (projectId: string, userCreatedId: string, assigneeIds: string
       index: 1,
       commonName: 'Basic Part',
       description: 'Basic part with all fields populated',
-      previewImageId: 'https://NER.com/basicpart.jpg',
       status: 'IN_PROGRESS',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -32,7 +31,6 @@ const partWithoutDescription = (projectId: string, userCreatedId: string, assign
     data: {
       index: 2,
       commonName: 'Part without description',
-      previewImageId: 'https://NER.com/partwithoutdes.jpg',
       status: 'IN_PROGRESS',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -74,7 +72,6 @@ const partWithEmptyHistory = (projectId: string, userCreatedId: string, assignee
       index: 4,
       commonName: 'Part with empty history',
       description: 'Basic part but with empty history',
-      previewImageId: 'https://NER.com/partemptyhistory.jpg',
       status: 'IN_PROGRESS',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -95,7 +92,6 @@ const partWithLongName = (projectId: string, userCreatedId: string, assigneeIds:
       index: 5,
       commonName: 'ThisPartHasANameThatIsWayTooLongAndMightCauseProblemsWithVisibilityOnTheWebsiteMaybeIDK',
       description: 'part with super long name',
-      previewImageId: 'https://NER.com/partwithlongname.jpg',
       status: 'IN_PROGRESS',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -116,7 +112,6 @@ const partIndexNegative = (projectId: string, userCreatedId: string, assigneeIds
       index: -1,
       commonName: 'Part with negative index',
       description: 'This parts index is negative',
-      previewImageId: 'https://NER.com/negativeindexpart.jpg',
       status: 'IN_PROGRESS',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -137,7 +132,6 @@ const partIndexZero = (projectId: string, userCreatedId: string, assigneeIds: st
       index: 0,
       commonName: 'Part with index 0',
       description: 'This parts index is 0',
-      previewImageId: 'https://NER.com/zeroindexpart.jpg',
       status: 'IN_PROGRESS',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -158,7 +152,6 @@ const partIndexLarge = (projectId: string, userCreatedId: string, assigneeIds: s
       index: 99999999,
       commonName: 'Part with very large index',
       description: 'This part index is very large',
-      previewImageId: 'https://NER.com/largeindexpart.jpg',
       status: 'IN_PROGRESS',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -179,7 +172,6 @@ const partReadyForReview = (projectId: string, userCreatedId: string, assigneeId
       index: 9,
       commonName: 'Part with READY_FOR_REVIEW status',
       description: 'This part is ready for review',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'READY_FOR_REVIEW',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -200,7 +192,6 @@ const partInReview = (projectId: string, userCreatedId: string, assigneeIds: str
       index: 10,
       commonName: 'Part with IN_REVIEW status',
       description: 'This part is in review',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'IN_REVIEW',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -221,7 +212,6 @@ const partReviewed = (projectId: string, userCreatedId: string, assigneeIds: str
       index: 11,
       commonName: 'Part with REVIEWED status',
       description: 'This part is reviewed.',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'REVIEWED',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -242,7 +232,6 @@ const partApproved = (projectId: string, userCreatedId: string, assigneeIds: str
       index: 12,
       commonName: 'Part with APPROVED status',
       description: 'This part is approved.',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'APPROVED',
       createdAt: new Date('2025-01-01T10:00:00Z'),
       project: {
@@ -263,7 +252,6 @@ const partCurrentDate = (projectId: string, userCreatedId: string, assigneeIds:
       index: 13,
       commonName: 'Part with current date',
       description: 'This part has the current date.',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'APPROVED',
       createdAt: new Date(),
       project: {
@@ -284,7 +272,6 @@ const partPastDate = (projectId: string, userCreatedId: string, assigneeIds: str
       index: 14,
       commonName: 'Part with past date',
       description: 'This part is old.',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'APPROVED',
       createdAt: new Date('2000-01-01T00:00:00Z'),
       project: {
@@ -305,7 +292,6 @@ const partUnixEpochDate = (projectId: string, userCreatedId: string, assigneeIds
       index: 15,
       commonName: 'Part with date of Unix Epoch',
       description: 'This part is was made at the unix epoch.',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'APPROVED',
       createdAt: new Date('1970-01-01T00:00:00Z'),
       project: {
@@ -326,7 +312,6 @@ const partFutureDate = (projectId: string, userCreatedId: string, assigneeIds: s
       index: 16,
       commonName: 'Part with date of future',
       description: 'This part is was made in the future.',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'APPROVED',
       createdAt: new Date('2100-12-31T23:59:59Z'),
       project: {
@@ -347,7 +332,6 @@ const partLeapYearDate = (projectId: string, userCreatedId: string, assigneeIds:
       index: 17,
       commonName: 'Part with date with a leap year',
       description: 'This part is was during a leap year.',
-      previewImageId: 'https://NER.com/testimage.jpg',
       status: 'APPROVED',
       createdAt: new Date('2024-02-29T12:00:00Z'),
       project: {

src/backend/src/routes/parts.routes.ts

@@ -51,6 +51,8 @@ partsRouter.post(
   PartReviewController.updateReview
 );
 
+partsRouter.post('/review/:reviewId/delete', PartReviewController.deleteReview);
+
 partsRouter.post(
   '/submission/create',
   nonEmptyString(body('partId')),
@@ -61,6 +63,14 @@ partsRouter.post(
   PartReviewController.createSubmission
 );
 
+partsRouter.post(
+  '/submission/:submissionId/update',
+  nonEmptyString(body('name')),
+  body('notes').optional().isString(),
+  validateInputs,
+  PartReviewController.updateSubmission
+);
+
 partsRouter.get('/tags', PartReviewController.getAllPartTags);
 partsRouter.get('/faqs', PartReviewController.getAllPartReviewFAQS);
 

src/backend/src/services/part-review.services.ts

@@ -47,11 +47,13 @@ import { sendPartAssignmentPopUp, sendPartReviewRequestPopUp } from '../utils/po
 export default class PartReviewService {
   /**
    * Uses the given partId to get the specific part and all of its constituent data
+   * @param organization the organization to get the part for
+   * @param user the user requesting the part
    * @param wbsNumber the wbsNum of the project this part is under
    * @param indexNum the index number of the part on this project
    * @returns a single Part
    */
-  static async getPart(organization: Organization, wbsNumber: WbsNumber, indexNum: string) {
+  static async getPart(organization: Organization, user: User, wbsNumber: WbsNumber, indexNum: string) {
     const project: Project = await ProjectsService.getSingleProject(wbsNumber, organization);
     const index = Number(indexNum);
     const part = await prisma.part.findUnique({
@@ -67,6 +69,12 @@ export default class PartReviewService {
 
     if (!part) throw new NotFoundException('Part', `projectId: ${project.id} and index number: ${indexNum}`);
 
+    part.submissions.forEach((submission) => {
+      submission.reviews = submission.reviews.filter((review) => {
+        return review.completedAt || user.userId === review.userCreatedId;
+      });
+    });
+
     return partTransformer(part);
   }
   /**
@@ -232,7 +240,8 @@ export default class PartReviewService {
     description: string,
     reviewStatus: Review_Status,
     tagIds: string[],
-    assigneeIds: string[]
+    assigneeIds: string[],
+    reviewerIds: string[]
   ) {
     const part = await prisma.part.findUnique({
       where: { partId },
@@ -248,24 +257,63 @@ export default class PartReviewService {
 
     if (!hasPermission) throw new AccessDeniedException('Only leadership and the part creator can update part data');
 
-    const updatedPart = await prisma.part.update({
-      where: { partId },
-      data: {
-        index,
-        commonName,
-        description,
-        status: reviewStatus,
-        tags: {
-          set: tagIds.map((partTagId) => ({ partTagId }))
+    const editedPart = await prisma.$transaction(async (tx) => {
+      const editedPart = await tx.part.update({
+        where: { partId },
+        data: {
+          index,
+          commonName,
+          description,
+          status: reviewStatus,
+          tags: {
+            set: tagIds.map((partTagId) => ({ partTagId }))
+          },
+          assignees: {
+            set: assigneeIds.map((userId) => ({ userId }))
+          }
         },
-        assignees: {
-          set: assigneeIds.map((userId) => ({ userId }))
-        }
-      },
-      ...getPartQueryArgs(organizationId)
+        ...getPartQueryArgs(organizationId)
+      });
+
+      const reviewersToAdd = reviewerIds.filter(
+        (id) => !editedPart.reviewRequests.some((reviewReq) => reviewReq.reviewerRequested.userId === id)
+      );
+
+      await Promise.all(
+        reviewersToAdd.map(async (id) => {
+          return tx.partReviewRequest.create({
+            data: {
+              part: {
+                connect: {
+                  partId: editedPart.partId
+                }
+              },
+              requester: { connect: { userId: updater.userId } },
+              reviewerRequested: { connect: { userId: id } }
+            }
+          });
+        })
+      );
+
+      const reviewRequestsToRemove = editedPart.reviewRequests.filter(
+        (reviewReq) => !reviewerIds.includes(reviewReq.reviewerRequested.userId)
+      );
+
+      await Promise.all(
+        reviewRequestsToRemove.map(async (reviewReq) => {
+          return tx.partReviewRequest.update({
+            where: { partReviewRequestId: reviewReq.partReviewRequestId },
+            data: {
+              dateDeleted: new Date()
+            }
+          });
+        })
+      );
+
+      return editedPart;
     });
 
-    return partTransformer(updatedPart);
+    return partTransformer(editedPart);
   }
 
   static async deletePart(partId: string, deleter: User, organizationId: string) {
@@ -415,6 +463,37 @@ export default class PartReviewService {
     return partReviewTransformer(updatedReview);
   }
 
+  /**
+   * Deletes a review
+   * @param reviewId the review being deleted
+   * @param deleter the user deleting (must be creator)
+   * @param organizationId the organization
+   */
+  static async deleteReview(reviewId: string, deleter: User, organizationId: string) {
+    const review = await prisma.partReview.findUnique({
+      where: { partReviewId: reviewId }
+    });
+
+    if (!review) throw new NotFoundException('Part Review', reviewId);
+    if (review.dateDeleted) throw new DeletedException('Part Review', reviewId);
+    if (review.completedAt) throw new HttpException(409, 'Cannot delete a completed review');
+
+    if (deleter.userId !== review.userCreatedId) throw new AccessDeniedException('only review creators can delete reviews');
+
+    await prisma.partReview.update({
+      where: { partReviewId: reviewId },
+      data: {
+        dateDeleted: new Date(),
+        userDeleted: {
+          connect: {
+            userId: deleter.userId
+          }
+        }
+      },
+      ...getPartReviewQueryArgs(organizationId)
+    });
+  }
+
   /**
    * Creates a submission for a given part
    * @param partId the part that the submission will be added to
@@ -456,6 +535,22 @@ export default class PartReviewService {
       ...getPartSubmissionQueryArgs(organizationId)
     });
 
+    await prisma.part.update({
+      where: { partId },
+      data: { status: Review_Status.READY_FOR_REVIEW }
+    });
+
+    if (!part.previewImageId && fileIds.length > 0) {
+      await prisma.part.update({
+        where: {
+          partId: part.partId
+        },
+        data: {
+          previewImageId: fileIds[0]
+        }
+      });
+    }
+
     return partSubmissionTransformer(submission);
   }
 

src/backend/src/utils/datetime.utils.ts

@@ -10,6 +10,6 @@
  */
 export const transformDate = (date: Date) => {
   const month = date.getMonth() + 1 < 10 ? `0${date.getMonth() + 1}` : (date.getMonth() + 1).toString();
-  const day = date.getDate() + 1 < 10 ? `0${date.getDate() + 1}` : (date.getDate() + 1).toString();
+  const day = date.getDate() < 10 ? `0${date.getDate()}` : date.getDate().toString();
   return `${date.getFullYear().toString()}-${month}-${day}`;
 };