Merge pull request #1616 from Northeastern-Electric-Racing/1307-change-requests-expire-5-days-after-implemented-instead-of-after-approved

#1307 : Changed dateReviewed to dateImplemented

Author: RChandler234

src/backend/src/transformers/change-requests.transformer.ts

@@ -5,6 +5,7 @@ import { wbsNumOf } from '../utils/utils';
 import { calculateChangeRequestStatus, convertCRScopeWhyType } from '../utils/change-requests.utils';
 import proposedSolutionTransformer from './proposed-solutions.transformer';
 import userTransformer from './user.transformer';
+import { getDateImplemented } from '../utils/change-requests.utils';
 
 const changeRequestTransformer = (
   changeRequest: Prisma.Change_RequestGetPayload<typeof changeRequestRelationArgs>
@@ -23,11 +24,7 @@ const changeRequestTransformer = (
     dateReviewed: changeRequest.dateReviewed ?? undefined,
     accepted: changeRequest.accepted ?? undefined,
     reviewNotes: changeRequest.reviewNotes ?? undefined,
-    dateImplemented: changeRequest.changes.reduce(
-      (res: Date | undefined, change) =>
-        !res || change.dateImplemented.valueOf() > res.valueOf() ? change.dateImplemented : res,
-      undefined
-    ),
+    dateImplemented: getDateImplemented(changeRequest),
     implementedChanges: changeRequest.changes.map((change) => ({
       wbsNum: wbsNumOf(change.wbsElement),
       changeId: change.changeId,

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

@@ -1,5 +1,5 @@
 import prisma from '../prisma/prisma';
-import { Scope_CR_Why_Type, Team, User, Prisma, Change_Request } from '@prisma/client';
+import { Scope_CR_Why_Type, Team, User, Prisma, Change_Request, Change } from '@prisma/client';
 import { addWeeksToDate, ChangeRequestReason } from 'shared';
 import { sendMessage } from '../integrations/slack';
 import { HttpException, NotFoundException } from './errors.utils';
@@ -134,15 +134,16 @@ export const updateBlocking = async (
  * @throws if the change request is unreviewed, denied, or deleted
  */
 export const validateChangeRequestAccepted = async (crId: number) => {
-  const changeRequest = await prisma.change_Request.findUnique({ where: { crId } });
+  const changeRequest = await prisma.change_Request.findUnique({ where: { crId }, include: { changes: true } });
   const currentDate = new Date();
 
   if (!changeRequest) throw new NotFoundException('Change Request', crId);
   if (changeRequest.dateDeleted) throw new HttpException(400, 'Cannot use a deleted change request!');
   if (changeRequest.accepted === null) throw new HttpException(400, 'Cannot implement an unreviewed change request');
   if (!changeRequest.accepted) throw new HttpException(400, 'Cannot implement a denied change request');
   if (!changeRequest.dateReviewed) throw new HttpException(400, 'Cannot use an unreviewed change request');
-  if (currentDate.getTime() - changeRequest.dateReviewed.getTime() > 1000 * 60 * 60 * 24 * 5)
+  const dateImplemented = getDateImplemented(changeRequest);
+  if (dateImplemented && currentDate.getTime() - dateImplemented.getTime() > 1000 * 60 * 60 * 24 * 5)
     throw new HttpException(400, 'Cannot tie changes to outdated change request');
 
   return changeRequest;
@@ -166,6 +167,14 @@ export const calculateChangeRequestStatus = (
   return ChangeRequestStatus.Open;
 };
 
+export const getDateImplemented = (changeRequest: Change_Request & { changes: Change[] }): Date | undefined => {
+  return changeRequest.changes.reduce(
+    (res: Date | undefined, change) =>
+      !res || change.dateImplemented.valueOf() < res.valueOf() ? change.dateImplemented : res,
+    undefined
+  );
+};
+
 /**
  * Determines whether all the change requests in an array of change requests have been reviewed
  * @param changeRequests the given array of change requests

src/backend/tests/projects.test.ts

@@ -23,7 +23,9 @@ const mockGetHighestProjectNumber = getHighestProjectNumber as jest.Mock<Promise
 
 describe('Projects', () => {
   beforeEach(() => {
-    vi.spyOn(changeRequestUtils, 'validateChangeRequestAccepted').mockImplementation(async (_crId) => prismaChangeRequest1);
+    vi.spyOn(changeRequestUtils, 'validateChangeRequestAccepted').mockImplementation(async (_crId) => {
+      return { ...prismaChangeRequest1, changes: [] };
+    });
     vi.spyOn(projectTransformer, 'default').mockReturnValue(sharedProject1);
     vi.spyOn(WorkPackagesService, 'deleteWorkPackage').mockImplementation(async (_user: User, _wbsNum: WbsNumber) => {});
   });

src/backend/tests/work-packages.test.ts

@@ -61,7 +61,7 @@ describe('Work Packages', () => {
 
   beforeEach(() => {
     vi.spyOn(changeRequestUtils, 'validateChangeRequestAccepted').mockImplementation(async (_crId) => {
-      return prismaChangeRequest1;
+      return { ...prismaChangeRequest1, changes: [] };
     });
 
     vi.spyOn(workPackageTransformer, 'default').mockReturnValue(sharedWorkPackage);

src/frontend/src/components/ChangeRequestDropdown.tsx

@@ -12,7 +12,7 @@ const getFilteredChangeRequests = (changeRequests: ChangeRequest[], user: Authen
   const fiveDaysAgo = subDays(today, 5);
 
   const filteredRequests = changeRequests.filter(
-    (cr) => cr.dateReviewed && cr.accepted && isWithinInterval(cr.dateReviewed, { start: fiveDaysAgo, end: today })
+    (cr) => cr.dateImplemented && cr.accepted && isWithinInterval(cr.dateImplemented, { start: fiveDaysAgo, end: today })
   );
 
   // The current user's CRs should be at the top