Merge branch 'develop' into #1668-VidyuthRamkumar-credits

Author: RChandler234

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

@@ -128,6 +128,18 @@ export default class ProjectsController {
     }
   }
 
+  static async createAssembly(req: Request, res: Response, next: NextFunction) {
+    try {
+      const user: User = await getCurrentUser(res);
+      const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
+      const { name, pdmFileName } = req.body;
+      const createAssembly = await ProjectsService.createAssembly(name, user, wbsNum, pdmFileName);
+      res.status(200).json(createAssembly);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createManufacturer(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;

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

@@ -72,8 +72,8 @@ export default class WorkPackagesController {
         blockedBy,
         expectedActivities,
         deliverables,
-        projectLead,
-        projectManager
+        projectLeadId,
+        projectManagerId
       } = req.body;
 
       let { stage } = req.body;
@@ -94,8 +94,8 @@ export default class WorkPackagesController {
         blockedBy,
         expectedActivities,
         deliverables,
-        projectLead,
-        projectManager
+        projectLeadId,
+        projectManagerId
       );
       return res.status(200).json({ message: 'Work package updated successfully' });
     } catch (error: unknown) {

…ons/20231019013832_add_bom/migration.sql …ons/20231024124220_add_bom/migration.sqlsrc/backend/src/prisma/migrations/20231019013832_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql src/backend/src/prisma/migrations/20231019013832_add_bom/migration.sql renamed to src/backend/src/prisma/migrations/20231024124220_add_bom/migration.sql

@@ -12,7 +12,7 @@ CREATE TABLE "Unit" (
 CREATE TABLE "Assembly" (
     "assemblyId" TEXT NOT NULL,
     "name" TEXT NOT NULL,
-    "pdmFileName" TEXT NOT NULL,
+    "pdmFileName" TEXT,
     "dateDeleted" TIMESTAMP(3),
     "userDeletedId" INTEGER,
     "dateCreated" TIMESTAMP(3) NOT NULL,

src/backend/src/prisma/schema.prisma

@@ -474,7 +474,7 @@ model Unit {
 model Assembly {
   assemblyId    String      @id @default(uuid())
   name          String      @unique
-  pdmFileName   String
+  pdmFileName   String?
   dateDeleted   DateTime?
   userDeleted   User?       @relation(fields: [userDeletedId], references: [userId], name: "assemblyDeleter")
   userDeletedId Int?

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

@@ -48,6 +48,16 @@ const justiceLeague = (headId: number): Prisma.TeamCreateArgs => {
   };
 };
 
+const plLegends = (headId: number): Prisma.TeamCreateArgs => {
+  return {
+    data: {
+      teamName: 'PlTeams',
+      slackId: 'Pl',
+      headId
+    }
+  };
+};
+
 const huskies = (headId: number): Prisma.TeamCreateArgs => {
   return {
     data: {
@@ -60,4 +70,4 @@ const huskies = (headId: number): Prisma.TeamCreateArgs => {
   };
 };
 
-export const dbSeedAllTeams = { ravens, orioles, justiceLeague, huskies };
+export const dbSeedAllTeams = { ravens, orioles, justiceLeague, huskies, plLegends };

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

@@ -308,6 +308,102 @@ const reidChandler: Prisma.UserCreateInput = {
   role: Role.HEAD
 };
 
+const cristianoRonaldo: Prisma.UserCreateInput = {
+  firstName: 'Cristiano',
+  lastName: 'Ronaldo',
+  email: 'cronaldo@united.com',
+  googleAuthId: 'Winger',
+  role: Role.HEAD
+};
+
+const thierryHenry: Prisma.UserCreateInput = {
+  firstName: 'Thierry',
+  lastName: 'Henry',
+  email: 'thenry@arsenal.com',
+  googleAuthId: 'InvincibleStriker',
+  role: Role.MEMBER
+};
+
+const frankLampard: Prisma.UserCreateInput = {
+  firstName: 'Frank',
+  lastName: 'Lampard',
+  email: 'flampard@chelsea.com',
+  googleAuthId: 'MidfieldMaestro',
+  role: Role.MEMBER
+};
+
+const stevenGerrard: Prisma.UserCreateInput = {
+  firstName: 'Steven',
+  lastName: 'Gerrard',
+  email: 'sgerrard@liverpool.com',
+  googleAuthId: 'RedCaptain',
+  role: Role.MEMBER
+};
+
+const ryanGiggs: Prisma.UserCreateInput = {
+  firstName: 'Ryan',
+  lastName: 'Giggs',
+  email: 'rgiggs@united.com',
+  googleAuthId: 'WingWizard',
+  role: Role.MEMBER
+};
+
+const alanShearer: Prisma.UserCreateInput = {
+  firstName: 'Alan',
+  lastName: 'Shearer',
+  email: 'ashearer@blackburn.com',
+  googleAuthId: 'GoalMachine',
+  role: Role.MEMBER
+};
+
+const paulScholes: Prisma.UserCreateInput = {
+  firstName: 'Paul',
+  lastName: 'Scholes',
+  email: 'pscholes@united.com',
+  googleAuthId: 'PassMaster',
+  role: Role.MEMBER
+};
+
+const ericCantona: Prisma.UserCreateInput = {
+  firstName: 'Eric',
+  lastName: 'Cantona',
+  email: 'ecantona@united.com',
+  googleAuthId: 'KingEric',
+  role: Role.MEMBER
+};
+
+const didierDrogba: Prisma.UserCreateInput = {
+  firstName: 'Didier',
+  lastName: 'Drogba',
+  email: 'ddrogba@chelsea.com',
+  googleAuthId: 'ClutchStriker',
+  role: Role.MEMBER
+};
+
+const patrickVieira: Prisma.UserCreateInput = {
+  firstName: 'Patrick',
+  lastName: 'Vieira',
+  email: 'pvieira@arsenal.com',
+  googleAuthId: 'MidfieldAnchor',
+  role: Role.MEMBER
+};
+
+const johnTerry: Prisma.UserCreateInput = {
+  firstName: 'John',
+  lastName: 'Terry',
+  email: 'jterry@chelsea.com',
+  googleAuthId: 'DefensiveRock',
+  role: Role.MEMBER
+};
+
+const dennisBergkamp: Prisma.UserCreateInput = {
+  firstName: 'Dennis',
+  lastName: 'Bergkamp',
+  email: 'dbergkamp@arsenal.com',
+  googleAuthId: 'DutchMaster',
+  role: Role.MEMBER
+};
+
 const brooksRobinson: Prisma.UserCreateInput = {
   firstName: 'Brooks',
   lastName: 'Robinson',
@@ -405,6 +501,18 @@ export const dbSeedAllUsers = {
   ryanHowe,
   anthonyBernardi,
   reidChandler,
+  cristianoRonaldo,
+  thierryHenry,
+  frankLampard,
+  stevenGerrard,
+  ryanGiggs,
+  paulScholes,
+  alanShearer,
+  ericCantona,
+  patrickVieira,
+  didierDrogba,
+  johnTerry,
+  dennisBergkamp,
   jkDobbins,
   davidOjabo,
   markAndrews,

src/backend/src/prisma/seed.ts

@@ -60,6 +60,18 @@ const performSeed: () => Promise<void> = async () => {
   const ryanHowe = await prisma.user.create({ data: dbSeedAllUsers.ryanHowe });
   const anthonyBernardi = await prisma.user.create({ data: dbSeedAllUsers.anthonyBernardi });
   const reidChandler = await prisma.user.create({ data: dbSeedAllUsers.reidChandler });
+  const cristianoRonaldo = await prisma.user.create({ data: dbSeedAllUsers.cristianoRonaldo });
+  const thierryHenry = await prisma.user.create({ data: dbSeedAllUsers.thierryHenry });
+  const frankLampard = await prisma.user.create({ data: dbSeedAllUsers.frankLampard });
+  const stevenGerrard = await prisma.user.create({ data: dbSeedAllUsers.stevenGerrard });
+  const ryanGiggs = await prisma.user.create({ data: dbSeedAllUsers.ryanGiggs });
+  const paulScholes = await prisma.user.create({ data: dbSeedAllUsers.paulScholes });
+  const alanShearer = await prisma.user.create({ data: dbSeedAllUsers.alanShearer });
+  const ericCantona = await prisma.user.create({ data: dbSeedAllUsers.ericCantona });
+  const patrickVieira = await prisma.user.create({ data: dbSeedAllUsers.patrickVieira });
+  const didierDrogba = await prisma.user.create({ data: dbSeedAllUsers.didierDrogba });
+  const johnTerry = await prisma.user.create({ data: dbSeedAllUsers.johnTerry });
+  const dennisBergkamp = await prisma.user.create({ data: dbSeedAllUsers.dennisBergkamp });
   const jkDobbins = await prisma.user.create({ data: dbSeedAllUsers.jkDobbins });
   const davidOjabo = await prisma.user.create({ data: dbSeedAllUsers.davidOjabo });
   const markAndrews = await prisma.user.create({ data: dbSeedAllUsers.markAndrews });
@@ -141,6 +153,7 @@ const performSeed: () => Promise<void> = async () => {
   const ravens: Team = await prisma.team.create(dbSeedAllTeams.ravens(johnHarbaugh.userId));
   const orioles: Team = await prisma.team.create(dbSeedAllTeams.orioles(brandonHyde.userId));
   const huskies: Team = await prisma.team.create(dbSeedAllTeams.huskies(thomasEmrax.userId));
+  const plLegends: Team = await prisma.team.create(dbSeedAllTeams.plLegends(cristianoRonaldo.userId));
 
   /** Write to .env file the FINANCE_TEAM_ID as the justiceLeague TeamId */
   const financeTeamId = justiceLeague.teamId;
@@ -206,6 +219,24 @@ const performSeed: () => Promise<void> = async () => {
     [joeShmoe, joeBlow, reidChandler, nightwing].map((user) => user.userId)
   );
 
+  await TeamsService.setTeamMembers(
+    cristianoRonaldo,
+    plLegends.teamId,
+    [
+      thierryHenry,
+      frankLampard,
+      stevenGerrard,
+      ryanGiggs,
+      paulScholes,
+      alanShearer,
+      ericCantona,
+      patrickVieira,
+      didierDrogba,
+      johnTerry,
+      dennisBergkamp
+    ].map((user) => user.userId)
+  );
+
   /**
    * Projects
    */

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

@@ -56,5 +56,11 @@ projectRouter.post(
   ProjectsController.createManufacturer
 );
 projectRouter.post('/bom/material-type/create', nonEmptyString(body('name')), ProjectsController.createMaterialType);
+projectRouter.post(
+  '/bom/assembly/:wbsNum/create',
+  nonEmptyString(body('name')),
+  nonEmptyString(body('pdmFileName')).optional(),
+  ProjectsController.createAssembly
+);
 
 export default projectRouter;

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

@@ -44,8 +44,8 @@ workPackagesRouter.post(
   body('deliverables').isArray(),
   body('deliverables.*.id').isInt({ min: -1 }).not().isString(),
   nonEmptyString(body('deliverables.*.detail')),
-  intMinZero(body('projectLead').optional()),
-  intMinZero(body('projectManager').optional()),
+  intMinZero(body('projectLeadId').optional()),
+  intMinZero(body('projectManagerId').optional()),
   validateInputs,
   WorkPackagesController.editWorkPackage
 );

src/backend/src/services/projects.services.ts

@@ -1,4 +1,4 @@
-import { Material_Type, User } from '@prisma/client';
+import { Material_Type, User, Assembly } from '@prisma/client';
 import { isAdmin, isGuest, isLeadership, isProject, LinkCreateArgs, LinkType, Project, WbsNumber, wbsPipe } from 'shared';
 import projectQueryArgs from '../prisma-query-args/projects.query-args';
 import prisma from '../prisma/prisma';
@@ -30,6 +30,7 @@ import linkQueryArgs from '../prisma-query-args/links.query-args';
 import linkTypeQueryArgs from '../prisma-query-args/link-types.query-args';
 import { linkTypeTransformer } from '../transformers/links.transformer';
 import { updateLinks, linkToChangeListValue } from '../utils/links.utils';
+import { isUserPartOfTeams } from '../utils/teams.utils';
 
 export default class ProjectsService {
   /**
@@ -605,6 +606,62 @@ export default class ProjectsService {
   }
 
   /**
+   * Create an assembly
+   * @param name The name of the assembly to be created
+   * @param userCreated The user creating the assembly
+   * @param wbsElementId The
+   * @param pdmFileName optional - The name of the file holding the assembly
+   * @returns the project that the user has favorited/unfavorited
+   * @throws if the project wbs doesn't exist or is not corresponding to a project
+   */
+  static async createAssembly(
+    name: string,
+    userCreated: User,
+    wbsNumber: WbsNumber,
+    pdmFileName?: string
+  ): Promise<Assembly> {
+    if (!isProject(wbsNumber)) throw new HttpException(400, `${wbsPipe(wbsNumber)} is not a valid project WBS #!`);
+    const { carNumber, projectNumber, workPackageNumber } = wbsNumber;
+
+    const project = await prisma.project.findFirst({
+      where: {
+        wbsElement: {
+          carNumber,
+          projectNumber,
+          workPackageNumber
+        }
+      },
+      ...projectQueryArgs
+    });
+
+    if (!project) throw new NotFoundException('Project', wbsPipe(wbsNumber));
+    if (project.wbsElement.dateDeleted) throw new DeletedException('Project', project.projectId);
+
+    const checkAssembly = await prisma.assembly.findUnique({ where: { name } });
+
+    if (checkAssembly) throw new HttpException(400, `${name} already exists as an assembly!`);
+
+    const { teams, wbsElementId } = project;
+
+    if (!isAdmin(userCreated.role) && !isUserPartOfTeams(teams, userCreated))
+      throw new AccessDeniedException('Users must be admin, or assigned to the team to create assemblies');
+
+    const userCreatedId = userCreated.userId;
+
+    const assembly = await prisma.assembly.create({
+      data: {
+        name,
+        dateCreated: new Date(),
+        userCreatedId,
+        wbsElementId,
+        pdmFileName
+      }
+    });
+
+    return assembly;
+  }
+
+  /*
    * Creates a new Manufacturer
    * @param submitter the user who's creating the manufacturer
    * @param name the name of the manufacturer