Merge pull request #2613 from Northeastern-Electric-Racing/Feature-Ve…

…rification

Feature verification

src/backend/index.ts

@@ -14,6 +14,7 @@ import reimbursementRequestsRouter from './src/routes/reimbursement-requests.rou
 import notificationsRouter from './src/routes/notifications.routes';
 import designReviewsRouter from './src/routes/design-reviews.routes';
 import workPackageTemplatesRouter from './src/routes/work-package-templates.routes';
+import carsRouter from './src/routes/cars.routes';
 
 const app = express();
 const port = process.env.PORT || 3001;
@@ -58,6 +59,7 @@ app.use('/reimbursement-requests', reimbursementRequestsRouter);
 app.use('/design-reviews', designReviewsRouter);
 app.use('/notifications', notificationsRouter);
 app.use('/templates', workPackageTemplatesRouter);
+app.use('/cars', carsRouter);
 app.use('/', (_req, res) => {
  res.json('Welcome to FinishLine');
 });

src/backend/src/controllers/cars.controllers.ts

@@ -0,0 +1,31 @@
+import { NextFunction, Request, Response } from 'express';
+import CarsService from '../services/car.services';
+import { getCurrentUser } from '../utils/auth.utils';
+import { getOrganizationId } from '../utils/utils';
+
+export default class CarsController {
+ static async getAllCars(req: Request, res: Response, next: NextFunction) {
+ try {
+ const organizationId = getOrganizationId(req.headers);
+ await getCurrentUser(res);
+ const cars = await CarsService.getAllCars(organizationId);
+
+ res.status(200).json(cars);
+ } catch (error: unknown) {
+ next(error);
+ }
+ }
+
+ static async createCar(req: Request, res: Response, next: NextFunction) {
+ try {
+ const organizationId = getOrganizationId(req.headers);
+ const user = await getCurrentUser(res);
+ const { name } = req.body;
+ const car = await CarsService.createCar(organizationId, user, name);
+
+ res.status(201).json(car);
+ } catch (error: unknown) {
+ next(error);
+ }
+ }
+}

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

@@ -428,13 +428,12 @@ export default class ProjectsController {
 
  static async editLinkType(req: Request, res: Response, next: NextFunction) {
  try {
- const { linkId } = req.params;
- const { iconName, required, linkTypeName } = req.body;
+ const { linkTypeName } = req.params;
+ const { iconName, required } = req.body;
  const submitter = await getCurrentUser(res);
  const organizationId = getOrganizationId(req.headers);
 
  const linkTypeUpdated = await ProjectsService.editLinkType(
- linkId,
  linkTypeName,
  iconName,
  required,

src/backend/src/controllers/users.controllers.ts

@@ -7,7 +7,7 @@ import { getOrganizationId } from '../utils/utils';
 export default class UsersController {
  static async getAllUsers(req: Request, res: Response, next: NextFunction) {
  try {
- const { organizationId } = req.headers as { organizationId?: string };
+ const organizationId = getOrganizationId(req.headers);
 
  const users = await UsersService.getAllUsers(organizationId);
 

src/backend/src/prisma-query-args/cars.query-args.ts

@@ -0,0 +1,27 @@
+import { Prisma } from '@prisma/client';
+import { getAssemblyQueryArgs, getMaterialQueryArgs } from './bom.query-args';
+import { getDescriptionBulletQueryArgs } from './description-bullets.query-args';
+import { getLinkQueryArgs } from './links.query-args';
+import { getUserQueryArgs } from './user.query-args';
+
+export type CarQueryArgs = ReturnType<typeof getCarQueryArgs>;
+
+export const getCarQueryArgs = (organizationId: string) =>
+ Prisma.validator<Prisma.CarDefaultArgs>()({
+ include: {
+ wbsElement: {
+ include: {
+ lead: getUserQueryArgs(organizationId),
+ descriptionBullets: getDescriptionBulletQueryArgs(organizationId),
+ manager: getUserQueryArgs(organizationId),
+ links: getLinkQueryArgs(organizationId),
+ changes: {
+ where: { changeRequest: { dateDeleted: null } },
+ include: { implementer: getUserQueryArgs(organizationId) }
+ },
+ materials: getMaterialQueryArgs(organizationId),
+ assemblies: getAssemblyQueryArgs(organizationId)
+ }
+ }
+ }
+ });

src/backend/src/prisma-query-args/change-requests.query-args.ts

@@ -17,8 +17,8 @@ export const getChangeRequestQueryArgs = (organizationId: string) =>
  teams: true
  }
  },
- descriptionBullets: true,
- links: true
+ descriptionBullets: { where: { dateDeleted: null } },
+ links: { where: { dateDeleted: null } }
  }
  },
  reviewer: getUserQueryArgs(organizationId),

src/backend/src/prisma-query-args/projects.query-args.ts

@@ -15,9 +15,9 @@ export const getProjectQueryArgs = (organizationId: string) =>
  include: {
  lead: getUserQueryArgs(organizationId),
  manager: getUserQueryArgs(organizationId),
- descriptionBullets: getDescriptionBulletQueryArgs(organizationId),
+ descriptionBullets: { where: { dateDeleted: null }, ...getDescriptionBulletQueryArgs(organizationId) },
  tasks: { where: { dateDeleted: null }, ...getTaskQueryArgs(organizationId) },
- links: getLinkQueryArgs(organizationId),
+ links: { where: { dateDeleted: null }, ...getLinkQueryArgs(organizationId) },
  changes: {
  where: { changeRequest: { dateDeleted: null } },
  include: { implementer: getUserQueryArgs(organizationId) }
@@ -43,15 +43,21 @@ export const getProjectQueryArgs = (organizationId: string) =>
  wbsElement: {
  include: {
  lead: getUserQueryArgs(organizationId),
- descriptionBullets: getDescriptionBulletQueryArgs(organizationId),
+ descriptionBullets: { where: { dateDeleted: null }, ...getDescriptionBulletQueryArgs(organizationId) },
  manager: getUserQueryArgs(organizationId),
- links: getLinkQueryArgs(organizationId),
+ links: { where: { dateDeleted: null }, ...getLinkQueryArgs(organizationId) },
  changes: {
  where: { changeRequest: { dateDeleted: null } },
  include: { implementer: getUserQueryArgs(organizationId) }
  },
- materials: getMaterialQueryArgs(organizationId),
- assemblies: getAssemblyQueryArgs(organizationId)
+ materials: {
+ where: { dateDeleted: null },
+ ...getMaterialQueryArgs(organizationId)
+ },
+ assemblies: {
+ where: { dateDeleted: null },
+ ...getAssemblyQueryArgs(organizationId)
+ }
  }
  },
  blockedBy: { where: { dateDeleted: null } }

src/backend/src/prisma-query-args/scope-change-requests.query-args.ts

@@ -7,7 +7,7 @@ import { getTeamQueryArgs } from './teams.query-args';
 
 export type ProjectProposedChangesQueryArgs = ReturnType<typeof getProjectProposedChangesQueryArgs>;
 
-export type WorkPackageProposedChangesQueryArgs = typeof workPackageProposedChangesQueryArgs;
+export type WorkPackageProposedChangesQueryArgs = ReturnType<typeof getWorkPackageProposedChangesQueryArgs>;
 
 export type WbsProposedChangeQueryArgs = ReturnType<typeof getWbsProposedChangeQueryArgs>;
 
@@ -17,6 +17,7 @@ const getProjectProposedChangesQueryArgs = (organizationId: string) =>
  Prisma.validator<Prisma.Project_Proposed_ChangesDefaultArgs>()({
  include: {
  teams: getTeamQueryArgs(organizationId),
+ workPackageProposedChanges: getWorkPackageProposedChangesQueryArgs(organizationId),
  car: {
  include: {
  wbsElement: true
@@ -25,17 +26,26 @@ const getProjectProposedChangesQueryArgs = (organizationId: string) =>
  }
  });
 
-export const workPackageProposedChangesQueryArgs = Prisma.validator<Prisma.Work_Package_Proposed_ChangesDefaultArgs>()({
- include: {
- blockedBy: true
- }
-});
+export const getWorkPackageProposedChangesQueryArgs = (organizationId: string) =>
+ Prisma.validator<Prisma.Work_Package_Proposed_ChangesDefaultArgs>()({
+ include: {
+ blockedBy: true,
+ wbsProposedChanges: {
+ include: {
+ links: getLinkQueryArgs(organizationId),
+ lead: getUserQueryArgs(organizationId),
+ manager: getUserQueryArgs(organizationId),
+ proposedDescriptionBulletChanges: getDescriptionBulletQueryArgs(organizationId)
+ }
+ }
+ }
+ });
 
 export const getWbsProposedChangeQueryArgs = (organizationId: string) =>
  Prisma.validator<Prisma.Wbs_Proposed_ChangesDefaultArgs>()({
  include: {
  projectProposedChanges: getProjectProposedChangesQueryArgs(organizationId),
- workPackageProposedChanges: workPackageProposedChangesQueryArgs,
+ workPackageProposedChanges: getWorkPackageProposedChangesQueryArgs(organizationId),
  links: getLinkQueryArgs(organizationId),
  lead: getUserQueryArgs(organizationId),
  manager: getUserQueryArgs(organizationId),

src/backend/src/prisma/migrations/20240527165314_add_work_package_proposed_solution_to_project_proposed_solution/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Work_Package_Proposed_Changes" ADD COLUMN "projectProposedChangesId" TEXT;
+
+-- AddForeignKey
+ALTER TABLE "Work_Package_Proposed_Changes" ADD CONSTRAINT "Work_Package_Proposed_Changes_projectProposedChangesId_fkey" FOREIGN KEY ("projectProposedChangesId") REFERENCES "Project_Proposed_Changes"("projectProposedChangesId") ON DELETE SET NULL ON UPDATE CASCADE;

src/backend/src/prisma/schema.prisma

@@ -780,18 +780,22 @@ model Project_Proposed_Changes {
  teams Team[] @relation(name: "proposedProjectTeams")
  wbsProposedChanges Wbs_Proposed_Changes @relation(name: "projectProposedChanges", fields: [wbsProposedChangesId], references: [wbsProposedChangesId])
  wbsProposedChangesId String @unique
- carId String?
- car Car? @relation(fields: [carId], references: [carId])
+
+ workPackageProposedChanges Work_Package_Proposed_Changes[]
+ carId String?
+ car Car? @relation(fields: [carId], references: [carId])
 }
 
 model Work_Package_Proposed_Changes {
- workPackageProposedChangesId String @id @default(uuid())
- startDate DateTime @db.Date
+ workPackageProposedChangesId String  @id @default(uuid())
+ startDate DateTime  @db.Date
  duration Int
- blockedBy WBS_Element[] @relation(name: "proposedBlockedBy")
+ blockedBy WBS_Element[]  @relation(name: "proposedBlockedBy")
  stage Work_Package_Stage?
- wbsProposedChanges Wbs_Proposed_Changes @relation(name: "wpProposedChanges", fields: [wbsProposedChangesId], references: [wbsProposedChangesId])
- wbsProposedChangesId String @unique
+ wbsProposedChanges Wbs_Proposed_Changes @relation(name: "wpProposedChanges", fields: [wbsProposedChangesId], references: [wbsProposedChangesId])
+ wbsProposedChangesId String @unique
+ projectProposedChanges Project_Proposed_Changes? @relation(fields: [projectProposedChangesId], references: [projectProposedChangesId])
+ projectProposedChangesId String?
 }
 
 model Work_Package_Template {

src/backend/src/prisma/seed.ts

@@ -39,11 +39,6 @@ const performSeed: () => Promise<void> = async () => {
  include: { userSettings: true, userSecureSettings: true }
  });
 
- const regina = await prisma.user.create({
- data: dbSeedAllUsers.regina,
- include: { userSettings: true, userSecureSettings: true }
- });
-
  const ner = await prisma.organization.create({
  data: {
  name: 'NER',
@@ -180,6 +175,7 @@ const performSeed: () => Promise<void> = async () => {
  const norbury = await createUser(dbSeedAllUsers.norbury, RoleEnum.LEADERSHIP, organizationId);
  const carr = await createUser(dbSeedAllUsers.carr, RoleEnum.LEADERSHIP, organizationId);
  const trang = await createUser(dbSeedAllUsers.trang, RoleEnum.LEADERSHIP, organizationId);
+ const regina = await createUser(dbSeedAllUsers.regina, RoleEnum.LEADERSHIP, organizationId);
 
  await UsersService.updateUserRole(cyborg.userId, thomasEmrax, 'APP_ADMIN', organizationId);
 
@@ -403,11 +399,11 @@ const performSeed: () => Promise<void> = async () => {
  );
 
  /** Link Types */
- const confluenceLinkType = await ProjectsService.createLinkType(batman, 'Confluence', 'doc', true, organizationId);
+ const confluenceLinkType = await ProjectsService.createLinkType(batman, 'Confluence', 'description', true, organizationId);
 
- const bomLinkType = await ProjectsService.createLinkType(batman, 'Bill of Materials', 'doc', true, organizationId);
+ const bomLinkType = await ProjectsService.createLinkType(batman, 'Bill of Materials', 'bar_chart', true, organizationId);
 
- await ProjectsService.createLinkType(batman, 'Google Drive', 'doc', true, organizationId);
+ await ProjectsService.createLinkType(batman, 'Google Drive', 'folder', true, organizationId);
 
  /**
  * Projects

src/backend/src/routes/cars.routes.ts

@@ -0,0 +1,10 @@
+import express from 'express';
+import CarsController from '../controllers/cars.controllers';
+
+const carsRouter = express.Router();
+
+carsRouter.get('/', CarsController.getAllCars);
+
+carsRouter.post('/create', CarsController.createCar);
+
+export default carsRouter;

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

@@ -73,7 +73,7 @@ changeRequestsRouter.post(
  body('proposedSolutions.*.timelineImpact').isInt(),
  body('proposedSolutions.*.budgetImpact').isInt(),
  ...projectProposedChangesValidators,
- ...workPackageProposedChangesValidators,
+ ...workPackageProposedChangesValidators('workPackageProposedChanges'),
  validateInputs,
  ChangeRequestsController.createStandardChangeRequest
 );

src/backend/src/services/car.services.ts

@@ -0,0 +1,66 @@
+import { User } from '@prisma/client';
+import { isAdmin } from 'shared';
+import { getCarQueryArgs } from '../prisma-query-args/cars.query-args';
+import prisma from '../prisma/prisma';
+import { carTransformer } from '../transformers/cars.transformer';
+import { AccessDeniedAdminOnlyException, NotFoundException } from '../utils/errors.utils';
+import { userHasPermission } from '../utils/users.utils';
+
+export default class CarsService {
+ static async getAllCars(organizationId: string) {
+ const cars = await prisma.car.findMany({
+ where: {
+ wbsElement: {
+ organizationId
+ }
+ },
+ ...getCarQueryArgs(organizationId)
+ });
+
+ return cars.map(carTransformer);
+ }
+
+ static async createCar(organizationId: string, user: User, name: string) {
+ if (!(await userHasPermission(user.userId, organizationId, isAdmin)))
+ throw new AccessDeniedAdminOnlyException('create a car');
+
+ const organization = await prisma.organization.findUnique({
+ where: {
+ organizationId
+ }
+ });
+
+ if (!organization) {
+ throw new NotFoundException('Organization', organizationId);
+ }
+
+ const numExistingCars = await prisma.car.count({
+ where: {
+ wbsElement: {
+ organizationId
+ }
+ }
+ });
+
+ const car = await prisma.car.create({
+ data: {
+ wbsElement: {
+ create: {
+ name,
+ carNumber: numExistingCars,
+ projectNumber: 0,
+ workPackageNumber: 0,
+ organization: {
+ connect: {
+ organizationId
+ }
+ }
+ }
+ }
+ },
+ ...getCarQueryArgs(organizationId)
+ });
+
+ return carTransformer(car);
+ }
+}