Merge pull request #1718 from Northeastern-Electric-Racing/feature/Project-Form-Redesign

Feature/project form redesign

Author: RChandler234

src/backend/src/controllers/projects.controllers.ts

@@ -29,11 +29,38 @@ export default class ProjectsController {
   static async createProject(req: Request, res: Response, next: NextFunction) {
     try {
       const user: User = await getCurrentUser(res);
-      const { crId, carNumber, name, summary, teamId } = req.body;
+      const {
+        name,
+        crId,
+        carNumber,
+        teamIds,
+        budget,
+        summary,
+        projectLeadId,
+        projectManagerId,
+        links,
+        goals,
+        features,
+        otherConstraints,
+        rules
+      } = req.body;
 
-      const createdWbsNumber: WbsNumber = await ProjectsService.createProject(user, crId, carNumber, name, summary, [
-        teamId
-      ]);
+      const createdWbsNumber: WbsNumber = await ProjectsService.createProject(
+        user,
+        crId,
+        carNumber,
+        name,
+        summary,
+        teamIds,
+        budget,
+        links,
+        rules,
+        goals,
+        features,
+        otherConstraints,
+        projectLeadId,
+        projectManagerId
+      );
 
       return res.status(200).json(wbsPipe(createdWbsNumber));
     } catch (error: unknown) {

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

@@ -31,7 +31,28 @@ export const seedProject = async (
   projectLeadId: number | null,
   projectManagerId: number | null
 ): Promise<{ projectWbsNumber: WbsNumber; projectId: number }> => {
-  const projectWbsNumber = await ProjectsService.createProject(creator, changeRequestId, carNumber, name, summary, teamIds);
+  const projectWbsNumber = await ProjectsService.createProject(
+    creator,
+    changeRequestId,
+    carNumber,
+    name,
+    summary,
+    teamIds,
+    budget,
+    links,
+    rules,
+    goals.map((element) => {
+      return { id: -1, detail: element };
+    }),
+    features.map((element) => {
+      return { id: -1, detail: element };
+    }),
+    otherConstraints.map((element) => {
+      return { id: -1, detail: element };
+    }),
+    projectLeadId,
+    projectManagerId
+  );
 
   const { projectId } = await prisma.project.findFirstOrThrow({
     where: {

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

@@ -9,22 +9,10 @@ const projectRouter = express.Router();
 projectRouter.get('/', ProjectsController.getAllProjects);
 projectRouter.get('/link-types', ProjectsController.getAllLinkTypes);
 projectRouter.get('/:wbsNum', ProjectsController.getSingleProject);
-projectRouter.post(
-  '/create',
-  intMinZero(body('crId')),
-  nonEmptyString(body('name')),
-  intMinZero(body('carNumber')),
-  nonEmptyString(body('summary')),
-  validateInputs,
-  ProjectsController.createProject
-);
 
-projectRouter.post(
-  '/edit',
-  intMinZero(body('projectId')),
+const projectValidators = [
   intMinZero(body('crId')),
   nonEmptyString(body('name')),
-  intMinZero(body('budget')),
   nonEmptyString(body('summary')),
   body('rules').isArray(),
   nonEmptyString(body('rules.*')),
@@ -41,7 +29,24 @@ projectRouter.post(
   nonEmptyString(body('links.*.url')),
   nonEmptyString(body('links.*.linkTypeName')),
   intMinZero(body('projectLeadId').optional()),
-  intMinZero(body('projectManagerId').optional()),
+  intMinZero(body('projectManagerId').optional())
+];
+
+projectRouter.post(
+  '/create',
+  intMinZero(body('carNumber')),
+  body('teamIds').isArray(),
+  nonEmptyString(body('teamIds.*')),
+  body('budget').optional().isInt({ min: 0 }).default(0),
+  ...projectValidators,
+  validateInputs,
+  ProjectsController.createProject
+);
+projectRouter.post(
+  '/edit',
+  intMinZero(body('projectId')),
+  intMinZero(body('budget')),
+  ...projectValidators,
   validateInputs,
   ProjectsController.editProject
 );