moved validation + removed redundant id checks

Author: rbessin

src/backend/src/routes/projects.routes.ts

@@ -5,9 +5,9 @@ import {
   nonEmptyString,
   projectValidators,
   validateInputs,
-  materialValidators,
-  copyMaterialsValidators
+  materialValidators
 } from '../utils/validation.utils.js';
+import { validateWBS } from 'shared';
 import ProjectsController from '../controllers/projects.controllers.js';
 
 const projectRouter = express.Router();
@@ -96,7 +96,11 @@ projectRouter.post('/bom/material/:wbsNum/create', ...materialValidators, valida
 projectRouter.post('/bom/material/:materialId/edit', ...materialValidators, validateInputs, ProjectsController.editMaterial);
 projectRouter.post(
   '/bom/material/copy',
-  ...copyMaterialsValidators,
+  body('materialIds').isArray({ min: 1 }),
+  nonEmptyString(body('materialIds.*')),
+  body('destinationWbsNum').customSanitizer((value) => {
+    return validateWBS(value);
+  }),
   validateInputs,
   ProjectsController.copyMaterialsToProject
 );

src/backend/src/services/boms.services.ts

@@ -200,27 +200,6 @@ export default class BillOfMaterialsService {
       const newMaterialIds: string[] = [];
 
       for (const material of materials) {
-        const materialType = await tx.material_Type.findUnique({
-          where: { id: material.materialTypeId }
-        });
-        if (!materialType) throw new NotFoundException('Material Type', material.materialTypeId);
-        if (materialType.dateDeleted) throw new DeletedException('Material Type', materialType.name);
-
-        if (material.manufacturerId) {
-          const manufacturer = await tx.manufacturer.findUnique({
-            where: { id: material.manufacturerId }
-          });
-          if (!manufacturer) throw new NotFoundException('Manufacturer', material.manufacturerId);
-          if (manufacturer.dateDeleted) throw new DeletedException('Manufacturer', manufacturer.name);
-        }
-
-        if (material.unitId) {
-          const unit = await tx.unit.findUnique({
-            where: { id: material.unitId }
-          });
-          if (!unit) throw new NotFoundException('Unit', material.unitId);
-        }
-
         const newMaterial = await tx.material.create({
           data: {
             name: material.name,

src/backend/src/utils/validation.utils.ts

@@ -209,13 +209,6 @@ export const materialValidators = [
   nonEmptyString(body('reimbursementRequestId')).optional(),
   body('notes').isString().optional()
 ];
-export const copyMaterialsValidators = [
-  body('materialIds').isArray({ min: 1 }),
-  nonEmptyString(body('materialIds.*')),
-  body('destinationWbsNum').customSanitizer((value) => {
-    return validateWBS(value);
-  })
-];
 export const validateInputs = (req: Request, res: Response, next: Function): void => {
   const errors = validationResult(req);
   if (!errors.isEmpty()) {