#1525 requested changes

Author: walker-sean

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

@@ -159,7 +159,7 @@ export default class ProjectsController {
       } = req.body;
       const creator = await getCurrentUser(res);
       const wbsNum = validateWBS(req.params.wbsNum);
-      const id = await ProjectsService.createMaterial(
+      const material = await ProjectsService.createMaterial(
         creator,
         name,
         status,
@@ -176,7 +176,7 @@ export default class ProjectsController {
         assemblyId,
         pdmFileName
       );
-      return res.status(200).json({ message: `Successfully created material with id #${id}` });
+      return material;
     } catch (error: unknown) {
       next(error);
     }

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

@@ -1,4 +1,4 @@
-import { Material_Type, User, Assembly, Material_Status } from '@prisma/client';
+import { Material_Type, User, Assembly, Material_Status, Material } 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';
@@ -609,20 +609,20 @@ export default class ProjectsService {
    * Creates a new Material
    * @param creator the user creating the material
    * @param name the name of the material
-   * @param assemblyId the id of the Assembly for the material
    * @param status the Material Status of the material
    * @param materialTypeName the name of the Material Type
    * @param manufacturerName the name of the material's manufacturer
    * @param manufacturerPartNumber the manufacturer part number for the material
-   * @param pdmFileName the name of the pdm file for the material
    * @param quantity the quantity of material as a number
    * @param unitName the name of the Quantity Unit the quantity is measured in
    * @param price the price of the material in whole cents
    * @param subtotal the subtotal of the price for the material in whole cents
    * @param linkUrl the url for the material's link as a string
    * @param notes any notes about the material as a string
    * @param wbsNumber the WBS number of the project associated with this material
-   * @returns the id of the created material
+   * @param assemblyId the id of the Assembly for the material
+   * @param pdmFileName the name of the pdm file for the material
+   * @returns the created material
    */
   static async createMaterial(
     creator: User,
@@ -640,7 +640,7 @@ export default class ProjectsService {
     wbsNumber: WbsNumber,
     assemblyId?: string,
     pdmFileName?: string
-  ): Promise<string> {
+  ): Promise<Material> {
     const project = await prisma.project.findFirst({
       where: {
         wbsElement: {
@@ -699,7 +699,7 @@ export default class ProjectsService {
       }
     });
 
-    return createdMaterial.materialId;
+    return createdMaterial;
   }
 
   /**

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

@@ -1,6 +1,5 @@
-import { Material_Status } from '@prisma/client';
 import { ValidationChain } from 'express-validator';
-import { ClubAccount } from 'shared';
+import { ClubAccount, MaterialStatus } from 'shared';
 import { TaskPriority, TaskStatus, WorkPackageStage, RoleEnum } from 'shared';
 
 export const intMinZero = (validationObject: ValidationChain): ValidationChain => {
@@ -47,7 +46,5 @@ export const isAccount = (validationObject: ValidationChain): ValidationChain =>
 };
 
 export const isMaterialStatus = (validationObject: ValidationChain): ValidationChain => {
-  return validationObject
-    .isString()
-    .isIn([Material_Status.ORDERED, Material_Status.RECEIVED, Material_Status.SHIPPED, Material_Status.UNORDERED]);
+  return validationObject.isString().isIn([MaterialStatus.Ordered, MaterialStatus.Received, MaterialStatus.Unordered]);
 };

src/shared/src/types/project-types.ts

@@ -95,3 +95,9 @@ export interface LinkCreateArgs {
   linkTypeName: string;
   url: string;
 }
+
+export enum MaterialStatus {
+  Ordered = 'ORDERED',
+  Received = 'RECEIVED',
+  Unordered = 'UNORDERED'
+}