#3887 resolved merge conflicts

Author: rbessin

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
       );
@@ -236,6 +236,22 @@ export default class ProjectsController {
     }
   }
 
+  static async copyMaterialsToProject(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { materialIds, destinationWbsNum } = req.body;
+
+      const newMaterialIds = await BillOfMaterialsService.copyMaterialsToProject(
+        req.currentUser,
+        materialIds,
+        destinationWbsNum,
+        req.organization
+      );
+      res.status(200).json(newMaterialIds);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createManufacturer(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;
@@ -379,17 +395,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,
+      reimbursementProducts: false,
       reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
     }
   });
@@ -37,6 +38,7 @@ export const getMaterialPreviewQueryArgs = (organizationId: string) =>
       unit: true,
       manufacturer: true,
       materialType: true,
+      reimbursementProducts: 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/20260116225351_bom_improvements/migration.sql

@@ -0,0 +1,88 @@
+-- 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" ALTER COLUMN "name" DROP NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Reimbursement_Product" ADD COLUMN     "materialId" TEXT;
+
+-- 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;
+
+DO $$
+DECLARE
+  material_record RECORD;
+  new_reason_id TEXT;
+BEGIN
+  -- Loop through all materials that are linked to RRs but don't have products yet
+  FOR material_record IN 
+    SELECT 
+      m."materialId",
+      m."name",
+      m."subtotal",
+      m."wbsElementId",
+      m."reimbursementRequestId"
+    FROM "Material" m
+    WHERE m."reimbursementRequestId" IS NOT NULL
+      AND m."dateDeleted" IS NULL
+      AND EXISTS (
+        -- Only migrate if the RR isn't deleted
+        SELECT 1 FROM "Reimbursement_Request" rr
+        WHERE rr."reimbursementRequestId" = m."reimbursementRequestId"
+          AND rr."dateDeleted" IS NULL
+      )
+      AND EXISTS (
+        -- Only migrate if the WBS element isn't deleted
+        SELECT 1 FROM "WBS_Element" wbs
+        WHERE wbs."wbsElementId" = m."wbsElementId"
+          AND wbs."dateDeleted" IS NULL
+      )
+      AND NOT EXISTS (
+        -- Skip if a product already links to this material for this RR
+        SELECT 1 FROM "Reimbursement_Product" rp
+        WHERE rp."materialId" = m."materialId"
+          AND rp."reimbursementRequestId" = m."reimbursementRequestId"
+      )
+  LOOP
+    -- Create a new reason for this material (can't reuse due to @unique and one to one relation)
+    INSERT INTO "Reimbursement_Product_Reason" (
+      "reimbursementProductReasonId",
+      "wbsElementId"
+    ) VALUES (
+      gen_random_uuid(),
+      material_record."wbsElementId"
+    )
+    RETURNING "reimbursementProductReasonId" INTO new_reason_id;
+    
+    -- Create the product linked to the material
+    INSERT INTO "Reimbursement_Product" (
+      "reimbursementProductId",
+      "name",
+      "cost",
+      "materialId",
+      "reimbursementProductReasonId",
+      "reimbursementRequestId"
+    ) VALUES (
+      gen_random_uuid(),
+      material_record."name",
+      COALESCE(material_record."subtotal", 0),
+      material_record."materialId",
+      new_reason_id,
+      material_record."reimbursementRequestId"
+    );
+  END LOOP;
+END $$;

src/backend/src/prisma/schema.prisma

@@ -745,9 +745,11 @@ model Reimbursement_Product_Reason {
 
 model Reimbursement_Product {
   reimbursementProductId       String                       @id @default(uuid())
-  name                         String
+  name                         String?
   dateDeleted                  DateTime?
   cost                         Int
+  material                     Material?                    @relation(fields: [materialId], references: [materialId])
+  materialId                   String?
   reimbursementProductReasonId String                       @unique
   reimbursementProductReason   Reimbursement_Product_Reason @relation(fields: [reimbursementProductReasonId], references: [reimbursementProductReasonId])
   reimbursementRequestId       String
@@ -756,6 +758,7 @@ model Reimbursement_Product {
 
   @@index([reimbursementRequestId])
   @@index([reimbursementProductReasonId])
+  @@index([materialId])
 }
 
 model Refund_Source {
@@ -907,34 +910,35 @@ model Assembly {
 }
 
 model Material {
-  materialId             String                 @id @default(uuid())
-  assembly               Assembly?              @relation(fields: [assemblyId], references: [assemblyId])
+  materialId             String                  @id @default(uuid())
+  assembly               Assembly?               @relation(fields: [assemblyId], references: [assemblyId])
   assemblyId             String?
   name                   String
-  wbsElement             WBS_Element            @relation(fields: [wbsElementId], references: [wbsElementId])
+  wbsElement             WBS_Element             @relation(fields: [wbsElementId], references: [wbsElementId])
   wbsElementId           String
   dateDeleted            DateTime?
-  userDeleted            User?                  @relation(fields: [userDeletedId], references: [userId], name: "materialDeleter")
+  userDeleted            User?                   @relation(fields: [userDeletedId], references: [userId], name: "materialDeleter")
   userDeletedId          String?
   dateCreated            DateTime
-  userCreated            User                   @relation(fields: [userCreatedId], references: [userId], name: "materialCreator")
+  userCreated            User                    @relation(fields: [userCreatedId], references: [userId], name: "materialCreator")
   userCreatedId          String
   status                 Material_Status
-  materialType           Material_Type          @relation(fields: [materialTypeId], references: [id])
+  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
-  unit                   Unit?                  @relation(fields: [unitId], references: [id])
+  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])
+  reimbursementRequest   Reimbursement_Request?  @relation(fields: [reimbursementRequestId], references: [reimbursementRequestId])
   reimbursementRequestId String?
+  reimbursementProducts  Reimbursement_Product[]
 
   @@index([assemblyId])
   @@index([materialTypeId])

src/backend/src/prisma/seed.ts

@@ -2280,58 +2280,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/routes/projects.routes.ts

@@ -7,6 +7,7 @@ import {
   validateInputs,
   materialValidators
 } from '../utils/validation.utils.js';
+import { validateWBS } from 'shared';
 import ProjectsController from '../controllers/projects.controllers.js';
 
 const projectRouter = express.Router();
@@ -93,6 +94,16 @@ projectRouter.post(
 );
 projectRouter.post('/bom/material/:wbsNum/create', ...materialValidators, validateInputs, ProjectsController.createMaterial);
 projectRouter.post('/bom/material/:materialId/edit', ...materialValidators, validateInputs, ProjectsController.editMaterial);
+projectRouter.post(
+  '/bom/material/copy',
+  body('materialIds').isArray({ min: 1 }),
+  nonEmptyString(body('materialIds.*')),
+  body('destinationWbsNum').customSanitizer((value) => {
+    return validateWBS(value);
+  }),
+  validateInputs,
+  ProjectsController.copyMaterialsToProject
+);
 
 projectRouter.post(
   '/bom/assembly/:assemblyId/edit',

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

@@ -11,7 +11,8 @@ import {
   isOptionalDate,
   nonEmptyString,
   validateInputs,
-  validateReimbursementProducts
+  validateReimbursementProducts,
+  validateReimbursementProductsForEdit
 } from '../utils/validation.utils.js';
 import ReimbursementRequestController from '../controllers/reimbursement-requests.controllers.js';
 import multer, { memoryStorage } from 'multer';
@@ -139,7 +140,7 @@ reimbursementRequestsRouter.post(
   nonEmptyString(body('receiptPictures.*.googleFileId')),
   nonEmptyString(body('accountCodeId')),
   intMinZero(body('totalCost')),
-  validateReimbursementProducts(),
+  validateReimbursementProductsForEdit(),
   validateInputs,
   ReimbursementRequestController.editReimbursementRequest
 );