#3867 first round of changes

Author: wavehassman

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

@@ -216,17 +216,17 @@ export default class ProjectsController {
         name,
         status,
         materialTypeName,
+        linkUrl,
+        wbsNum,
+        req.organization,
         manufacturerName,
         manufacturerPartNumber,
         quantity,
         price,
         subtotal,
-        linkUrl,
-        wbsNum,
-        req.organization,
         notes,
         assemblyId,
-        pdmFileName === '' ? undefined : pdmFileName,
+        pdmFileName,
         unitName,
         reimbursementRequestId
       );
@@ -379,17 +379,17 @@ export default class ProjectsController {
         name,
         status,
         materialTypeName,
+        linkUrl,
+        req.organization,
         manufacturerName,
         manufacturerPartNumber,
         quantity,
         price,
         subtotal,
-        linkUrl,
-        req.organization,
         notes,
         unitName,
         assemblyId,
-        pdmFileName === '' ? undefined : pdmFileName,
+        pdmFileName,
         reimbursementRequestId
       );
       res.status(200).json(updatedMaterial);

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

@@ -25,6 +25,7 @@ export const getMaterialQueryArgs = (organizationId: string) =>
       materialType: true,
       unit: true,
       manufacturer: true,
+      reimbursementProduct: false,
       reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
     }
   });
@@ -37,6 +38,7 @@ export const getMaterialPreviewQueryArgs = (organizationId: string) =>
       unit: true,
       manufacturer: true,
       materialType: true,
+      reimbursementProduct: false,
       reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
     }
   });

src/backend/src/prisma-query-args/reimbursement-products.query-args.ts

@@ -25,6 +25,7 @@ export const getReimbursementProductQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.Reimbursement_ProductDefaultArgs>()({
     include: {
       refundSources: getRefundSourceQueryArgs(organizationId),
-      reimbursementProductReason: getReimbursementProductReasonQueryArgs(organizationId)
+      reimbursementProductReason: getReimbursementProductReasonQueryArgs(organizationId),
+      material: true
     }
   });

src/backend/src/prisma/migrations/20260115203541_bom_improvements/migration.sql

@@ -0,0 +1,30 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[materialId]` on the table `Reimbursement_Product` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Material" DROP CONSTRAINT "Material_manufacturerId_fkey";
+
+-- AlterTable
+ALTER TABLE "Material" ALTER COLUMN "manufacturerId" DROP NOT NULL,
+ALTER COLUMN "manufacturerPartNumber" DROP NOT NULL,
+ALTER COLUMN "quantity" DROP NOT NULL,
+ALTER COLUMN "price" DROP NOT NULL,
+ALTER COLUMN "subtotal" DROP NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Reimbursement_Product" ADD COLUMN     "materialId" TEXT;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Reimbursement_Product_materialId_key" ON "Reimbursement_Product"("materialId");
+
+-- CreateIndex
+CREATE INDEX "Reimbursement_Product_materialId_idx" ON "Reimbursement_Product"("materialId");
+
+-- AddForeignKey
+ALTER TABLE "Reimbursement_Product" ADD CONSTRAINT "Reimbursement_Product_materialId_fkey" FOREIGN KEY ("materialId") REFERENCES "Material"("materialId") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Material" ADD CONSTRAINT "Material_manufacturerId_fkey" FOREIGN KEY ("manufacturerId") REFERENCES "Manufacturer"("id") ON DELETE SET NULL ON UPDATE CASCADE;

src/backend/src/prisma/schema.prisma

@@ -736,6 +736,8 @@ model Reimbursement_Product {
   name                         String
   dateDeleted                  DateTime?
   cost                         Int
+  material                     Material?                    @relation(fields: [materialId], references: [materialId])
+  materialId                   String?                      @unique
   reimbursementProductReasonId String                       @unique
   reimbursementProductReason   Reimbursement_Product_Reason @relation(fields: [reimbursementProductReasonId], references: [reimbursementProductReasonId])
   reimbursementRequestId       String
@@ -744,6 +746,7 @@ model Reimbursement_Product {
 
   @@index([reimbursementRequestId])
   @@index([reimbursementProductReasonId])
+  @@index([materialId])
 }
 
 model Refund_Source {
@@ -908,19 +911,20 @@ model Material {
   status                 Material_Status
   materialType           Material_Type          @relation(fields: [materialTypeId], references: [id])
   materialTypeId         String
-  manufacturer           Manufacturer           @relation(fields: [manufacturerId], references: [id])
-  manufacturerId         String
-  manufacturerPartNumber String
+  manufacturer           Manufacturer?          @relation(fields: [manufacturerId], references: [id])
+  manufacturerId         String?
+  manufacturerPartNumber String?
   pdmFileName            String?
-  quantity               Decimal
+  quantity               Decimal?
   unit                   Unit?                  @relation(fields: [unitId], references: [id])
   unitId                 String?
-  price                  Int
-  subtotal               Int
+  price                  Int?
+  subtotal               Int?
   linkUrl                String
   notes                  String?
   reimbursementRequest   Reimbursement_Request? @relation(fields: [reimbursementRequestId], references: [reimbursementRequestId])
   reimbursementRequestId String?
+  reimbursementProduct   Reimbursement_Product?
 
   @@index([assemblyId])
   @@index([materialTypeId])

src/backend/src/prisma/seed.ts

@@ -2289,58 +2289,66 @@ const performSeed: () => Promise<void> = async () => {
     '10k Resistor',
     MaterialStatus.Ordered,
     'Resistor',
-    'Digikey',
-    'abcdef',
-    new Decimal(20),
-    30,
-    600,
     'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
     {
       carNumber: 0,
       projectNumber: 1,
       workPackageNumber: 0
     },
     ner,
-    'Here are some notes'
+    'Digikey',
+    'abcdef',
+    new Decimal(20),
+    30,
+    600,
+    'Here are some notes',
+    assembly1.assemblyId,
+    undefined,
+    undefined,
+    undefined
   );
 
   await BillOfMaterialsService.createMaterial(
     thomasEmrax,
     '20k Resistor',
     MaterialStatus.Ordered,
     'Resistor',
-    'Digikey',
-    'bacfed',
-    new Decimal(10),
-    7,
-    70,
     'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
     {
       carNumber: 0,
       projectNumber: 1,
       workPackageNumber: 0
     },
     ner,
-    'Here are some more notes'
+    'Digikey',
+    'bacfed',
+    new Decimal(10),
+    7,
+    70,
+    'Here are some more notes',
+    undefined,
+    undefined,
+    undefined,
+    undefined
   );
 
   await BillOfMaterialsService.createMaterial(
     thomasEmrax,
     '100k Resistor',
     MaterialStatus.ReadyToOrder,
     'Resistor',
-    'Digikey',
-    'lalsd',
-    new Decimal(5),
-    10,
-    50,
     'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
     {
       carNumber: 0,
       projectNumber: 1,
       workPackageNumber: 0
     },
     ner,
+    'Digikey',
+    'lalsd',
+    new Decimal(5),
+    10,
+    50,
     undefined,
     undefined,
     undefined,

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

@@ -49,34 +49,34 @@ export default class BillOfMaterialsService {
    * @param name the name of 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 quantity the quantity of material as a number
-   * @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
-   * @param organizationId the id of the organization the user is currently in
-   * @param assemblyId the id of the Assembly for the material
-   * @param pdmFileName the name of the pdm file for the material
-   * @param unitName the name of the Quantity Unit the quantity is measured in
-   * @param reimbursementRequestId the id of the Reimbursement Request for the material
+   * @param organization the organization the user is currently in
+   * @param manufacturerName the name of the material's manufacturer (optional)
+   * @param manufacturerPartNumber the manufacturer part number for the material (optional)
+   * @param quantity the quantity of material as a number (optional)
+   * @param price the price of the material in whole cents (optional)
+   * @param subtotal the subtotal of the price for the material in whole cents (optional)
+   * @param notes any notes about the material as a string (optional)
+   * @param assemblyId the id of the Assembly for the material (optional)
+   * @param pdmFileName the name of the pdm file for the material (optional)
+   * @param unitName the name of the Quantity Unit the quantity is measured in (optional)
+   * @param reimbursementRequestId the id of the Reimbursement Request for the material (optional)
    * @returns the created material
    */
   static async createMaterial(
     creator: User,
     name: string,
     status: Material_Status,
     materialTypeName: string,
-    manufacturerName: string,
-    manufacturerPartNumber: string,
-    quantity: Decimal,
-    price: number,
-    subtotal: number,
     linkUrl: string,
     wbsNumber: WbsNumber,
     organization: Organization,
+    manufacturerName?: string,
+    manufacturerPartNumber?: string,
+    quantity?: Decimal,
+    price?: number,
+    subtotal?: number,
     notes?: string,
     assemblyId?: string,
     pdmFileName?: string,
@@ -98,11 +98,14 @@ export default class BillOfMaterialsService {
     if (!materialType) throw new NotFoundException('Material Type', materialTypeName);
     if (materialType.dateDeleted) throw new DeletedException('Material Type', materialTypeName);
 
-    const manufacturer = await prisma.manufacturer.findUnique({
-      where: { uniqueManufacturer: { name: manufacturerName, organizationId: organization.organizationId } }
-    });
-    if (!manufacturer) throw new NotFoundException('Manufacturer', manufacturerName);
-    if (manufacturer.dateDeleted) throw new DeletedException('Manufacturer', manufacturerName);
+    let manufacturer = null;
+    if (manufacturerName) {
+      manufacturer = await prisma.manufacturer.findUnique({
+        where: { uniqueManufacturer: { name: manufacturerName, organizationId: organization.organizationId } }
+      });
+      if (!manufacturer) throw new NotFoundException('Manufacturer', manufacturerName);
+      if (manufacturer.dateDeleted) throw new DeletedException('Manufacturer', manufacturerName);
+    }
 
     let unit = null;
     if (unitName) {
@@ -135,7 +138,7 @@ export default class BillOfMaterialsService {
         assemblyId,
         status,
         materialTypeId: materialType.id,
-        manufacturerId: manufacturer.id,
+        manufacturerId: manufacturer ? manufacturer.id : null,
         manufacturerPartNumber,
         pdmFileName,
         quantity,
@@ -542,18 +545,18 @@ export default class BillOfMaterialsService {
    * @param name the name of the edited material
    * @param status the status of the edited material
    * @param materialTypeName the material type of the edited material
-   * @param manufacturerName the manufacturerName of the edited material
-   * @param manufacturerPartNumber the manufacturerPartNumber of the edited material
-   * @param quantity the quantity of the edited material
-   * @param price the price of the edited material
-   * @param subtotal the subtotal of the edited material
    * @param linkUrl the linkUrl of the edited material
-   * @param organizationId the organization the user is currently in
-   * @param notes the notes of the edited material
-   * @param unitName the unit name of the edited material
-   * @param assemblyId the assembly id of the edited material
-   * @param pdmFileName the pdm file name of the edited material
-   * @param reimbursementRequestId the id of the Reimbursement Request for the material
+   * @param organization the organization the user is currently in
+   * @param manufacturerName the manufacturerName of the edited material (optional)
+   * @param manufacturerPartNumber the manufacturerPartNumber of the edited material (optional)
+   * @param quantity the quantity of the edited material (optional)
+   * @param price the price of the edited material (optional)
+   * @param subtotal the subtotal of the edited material (optional)
+   * @param notes the notes of the edited material (optional)
+   * @param unitName the unit name of the edited material (optional)
+   * @param assemblyId the assembly id of the edited material (optional)
+   * @param pdmFileName the pdm file name of the edited material (optional)
+   * @param reimbursementRequestId the id of the Reimbursement Request for the material (optional)
    * @throws if permission denied or material's wbsElement is undefined/deleted
    * @returns the updated material
    */
@@ -563,13 +566,13 @@ export default class BillOfMaterialsService {
     name: string,
     status: Material_Status,
     materialTypeName: string,
-    manufacturerName: string,
-    manufacturerPartNumber: string,
-    quantity: Decimal,
-    price: number,
-    subtotal: number,
     linkUrl: string,
     organization: Organization,
+    manufacturerName?: string,
+    manufacturerPartNumber?: string,
+    quantity?: Decimal,
+    price?: number,
+    subtotal?: number,
     notes?: string,
     unitName?: string,
     assemblyId?: string,
@@ -614,15 +617,18 @@ export default class BillOfMaterialsService {
       }
     }
 
-    const manufacturer = await BillOfMaterialsService.getSingleManufacturerWithQueryArgs(manufacturerName, organization);
+    let manufacturer = null;
+    if (manufacturerName) {
+      manufacturer = await BillOfMaterialsService.getSingleManufacturerWithQueryArgs(manufacturerName, organization);
+    }
 
     const updatedMaterial = await prisma.material.update({
       where: { materialId },
       data: {
         name,
         status,
         materialTypeId: materialType.id,
-        manufacturerId: manufacturer.id,
+        manufacturerId: manufacturer ? manufacturer.id : null,
         manufacturerPartNumber,
         quantity,
         unitId: unit ? unit.id : null,