#1417 - controller, route, service, transformer

Author: LOTaher

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

@@ -31,7 +31,7 @@ export default class WorkPackagesController {
 
   static async getManyWorkPackages(req: Request, res: Response, next: NextFunction) {
     try {
-      const wbsNums: WbsNumber[] = req.body.wbsNums.map((wbsNum: string) => validateWBS(wbsNum));
+      const { wbsNums } = req.body;
       const workPackages: WorkPackage[] = await WorkPackagesService.getManyWorkPackages(wbsNums);
       res.status(200).json(workPackages);
     } catch (error: unknown) {

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

@@ -6,15 +6,16 @@ import { intMinZero, isDate, isWorkPackageStageOrNone, nonEmptyString } from '..
 const workPackagesRouter = express.Router();
 
 workPackagesRouter.get('/', WorkPackagesController.getAllWorkPackages);
-workPackagesRouter.get('/:wbsNum', WorkPackagesController.getSingleWorkPackage);
-workPackagesRouter.post(
+workPackagesRouter.get(
   '/get-many',
   body('wbsNums').exists().isArray(),
-  body('wbsNums.*.carNumber').exists().isNumeric(),
-  body('wbsNums.*.projectNumber').exists().isNumeric(),
-  body('wbsNums.*.workPackageNumber').exists().isNumeric(),
+  intMinZero(body('wbsNums.*.carNumber')),
+  intMinZero(body('wbsNums.*.projectNumber')),
+  intMinZero(body('wbsNums.*.workPackageNumber')),
+  validateInputs,
   WorkPackagesController.getManyWorkPackages
 );
+workPackagesRouter.get('/:wbsNum', WorkPackagesController.getSingleWorkPackage);
 workPackagesRouter.post(
   '/create',
   intMinZero(body('crId')),

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

@@ -125,7 +125,7 @@ export default class WorkPackagesService {
     }
 
     const workPackagePromises = wbsNums.map(async (wbsNum) => {
-      const workPackages = await prisma.work_Package.findMany({
+      const workPackage = await prisma.work_Package.findFirst({
         where: {
           AND: [
             {
@@ -145,11 +145,12 @@ export default class WorkPackagesService {
         ...workPackageQueryArgs
       });
 
-      if (!workPackages || workPackages.length !== 1) {
+      console.log(workPackage);
+
+      if (!workPackage) {
         throw new NotFoundException('Work Package', wbsPipe(wbsNum));
       }
-
-      return workPackageTransformer(workPackages[0]);
+      return workPackageTransformer(workPackage);
     });
 
     const resolvedWorkPackages = await Promise.all(workPackagePromises);

src/backend/src/transformers/work-packages.transformer.ts

@@ -6,7 +6,7 @@ import { convertStatus, wbsNumOf } from '../utils/utils';
 import { calculateWorkPackageProgress } from '../utils/work-packages.utils';
 import userTransformer from './user.transformer';
 
-const workPackageTransformer = (wpInput: Prisma.Work_PackageGetPayload<typeof workPackageQueryArgs>) => {
+const workPackageTransformer = (wpInput: Prisma.Work_PackageGetPayload<typeof workPackageQueryArgs>): WorkPackage => {
   const expectedProgress = calculatePercentExpectedProgress(wpInput.startDate, wpInput.duration, wpInput.wbsElement.status);
   const wbsNum = wbsNumOf(wpInput.wbsElement);
   const progress = calculateWorkPackageProgress(wpInput.deliverables, wpInput.expectedActivities);

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

@@ -293,37 +293,6 @@ describe('Work Packages', () => {
   });
 
   describe('getManyWorkPackages', () => {
-    test('should retrieve work packages for valid WBS numbers', async () => {
-      const wbsNums = [
-        { carNumber: 1, projectNumber: 1, workPackageNumber: 1 },
-        { carNumber: 1, projectNumber: 1, workPackageNumber: 1 }
-      ];
-
-      vi.spyOn(prisma.work_Package, 'findMany').mockResolvedValue([prismaWorkPackage1, prismaWorkPackage1]);
-
-      const result = await WorkPackageService.getManyWorkPackages(wbsNums);
-
-      expect(result).toStrictEqual([sharedWorkPackage, sharedWorkPackage]);
-    });
-
-    test('should throw an error for a project WBS number', async () => {
-      const wbsNums = [{ carNumber: 1, projectNumber: 1, workPackageNumber: 0 }];
-
-      await expect(async () => await WorkPackageService.getManyWorkPackages(wbsNums)).rejects.toThrow(
-        new HttpException(404, 'WBS Number 1.1.0 is a project WBS#, not a Work Package WBS#')
-      );
-    });
-
-    test('should throw an error for non-existent WBS numbers', async () => {
-      const wbsNums = [{ carNumber: 9, projectNumber: 9, workPackageNumber: 9 }];
-
-      vi.spyOn(prisma.work_Package, 'findMany').mockResolvedValue([]);
-
-      await expect(async () => await WorkPackageService.getManyWorkPackages(wbsNums)).rejects.toThrow(
-        new NotFoundException('Work Package', '9.9.9')
-      );
-    });
-
     test('should retrieve an empty array for an empty WBS numbers array', async () => {
       const wbsNums: WbsNumber[] = [];