#4107 removed subtotal from backend

Author: cielbellerose

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

@@ -220,7 +220,6 @@ export default class ProjectsController {
         quantity,
         unitName,
         price,
-        subtotal,
         linkUrl,
         notes
       } = req.body;
@@ -237,7 +236,6 @@ export default class ProjectsController {
         manufacturerPartNumber,
         quantity,
         price,
-        subtotal,
         notes,
         assemblyId,
         pdmFileName,

src/backend/src/prisma/seed.ts

@@ -3529,7 +3529,6 @@ const performSeed: () => Promise<void> = async () => {
     'abcdef',
     new Decimal(20),
     30,
-    600,
     'Here are some notes',
     assembly1.assemblyId,
     undefined,
@@ -3552,7 +3551,6 @@ const performSeed: () => Promise<void> = async () => {
     'bacfed',
     new Decimal(10),
     7,
-    70,
     'Here are some more notes',
     undefined,
     undefined,
@@ -3575,7 +3573,6 @@ const performSeed: () => Promise<void> = async () => {
     'lalsd',
     new Decimal(5),
     10,
-    50,
     undefined,
     undefined,
     undefined

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

@@ -56,7 +56,6 @@ export default class BillOfMaterialsService {
    * @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)
@@ -75,7 +74,6 @@ export default class BillOfMaterialsService {
     manufacturerPartNumber?: string,
     quantity?: Decimal,
     price?: number,
-    subtotal?: number,
     notes?: string,
     assemblyId?: string,
     pdmFileName?: string,
@@ -119,6 +117,9 @@ export default class BillOfMaterialsService {
 
     if (!perms) throw new AccessDeniedException('create materials');
 
+    const computedSubtotal =
+      price !== undefined && quantity !== undefined ? Math.round(price * Number(quantity)) : undefined;
+
     const createdMaterial = await prisma.material.create({
       data: {
         userCreatedId: creator.userId,
@@ -132,7 +133,7 @@ export default class BillOfMaterialsService {
         quantity,
         unitId: unit ? unit.id : null,
         price,
-        subtotal,
+        subtotal: computedSubtotal,
         linkUrl,
         notes,
         dateCreated: new Date(),
@@ -611,7 +612,6 @@ export default class BillOfMaterialsService {
    * @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)

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

@@ -284,7 +284,6 @@ export const materialValidators = [
   decimalMinZero(body('quantity')).optional(),
   nonEmptyString(body('unitName')).optional(),
   intMinZero(body('price')).optional(), // in cents
-  intMinZero(body('subtotal')).optional(), // in cents
   body('linkUrl').optional().isString(),
   body('notes').isString().optional()
 ];

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/BOMTableWrapper.tsx

@@ -129,34 +129,34 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
 
   const processRowUpdate = async (newRow: BomRow, oldRow: BomRow): Promise<BomRow> => {
     // assemblies are not editable
-    if (String(newRow.id).startsWith('assembly')) return newRow;
+    if (newRow.id.startsWith('assembly')) return newRow;
 
     const material = materials.find((m) => m.materialId === newRow.materialId);
     if (!material) return newRow;
 
-    const newQuantity = typeof newRow.quantity === 'number' ? (newRow.quantity as number) : null;
-    const newPriceDollars = typeof newRow.price === 'number' ? (newRow.price as number) : null;
+    const quantityChanged = newRow.quantityRaw !== oldRow.quantityRaw;
+    const priceChanged = newRow.priceRaw !== oldRow.priceRaw;
 
     if (
       newRow.name === oldRow.name &&
       newRow.type === oldRow.type &&
       newRow.manufacturer === oldRow.manufacturer &&
       newRow.manufacturerPN === oldRow.manufacturerPN &&
       newRow.pdmFileName === oldRow.pdmFileName &&
-      newQuantity === null &&
-      newPriceDollars === null
+      !quantityChanged &&
+      !priceChanged
     )
       return newRow;
 
     if (newRow.name !== undefined && !newRow.name.trim()) {
       toast.error('Name cannot be empty');
       return oldRow;
     }
-    if (newQuantity !== null && (isNaN(newQuantity) || newQuantity <= 0)) {
+    if (quantityChanged && newRow.quantityRaw !== undefined && (isNaN(newRow.quantityRaw) || newRow.quantityRaw <= 0)) {
       toast.error('Quantity must be a positive number');
       return oldRow;
     }
-    if (newPriceDollars !== null && (isNaN(newPriceDollars) || newPriceDollars < 0)) {
+    if (priceChanged && newRow.priceRaw !== undefined && (isNaN(newRow.priceRaw) || newRow.priceRaw < 0)) {
       toast.error('Price must be a non-negative number');
       return oldRow;
     }
@@ -167,11 +167,12 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
     if (newRow.manufacturer !== oldRow.manufacturer) changedFields.push('Manufacturer');
     if (newRow.manufacturerPN !== oldRow.manufacturerPN) changedFields.push('Manufacturer PN');
     if (newRow.pdmFileName !== oldRow.pdmFileName) changedFields.push('PDM File Name');
-    if (newQuantity !== null) changedFields.push('Quantity');
-    if (newPriceDollars !== null) changedFields.push('Price');
+    if (quantityChanged) changedFields.push('Quantity');
+    if (priceChanged) changedFields.push('Price');
 
-    const priceInCents = newPriceDollars !== null ? Math.round(newPriceDollars * 100) : material.price;
-    const quantityValue = newQuantity !== null ? newQuantity : Number(material.quantity);
+    const priceInCents = priceChanged && newRow.priceRaw !== undefined ? Math.round(newRow.priceRaw * 100) : material.price;
+    const quantityValue =
+      quantityChanged && newRow.quantityRaw != null ? new Decimal(newRow.quantityRaw) : material.quantity;
 
     try {
       await editMaterial({
@@ -183,8 +184,8 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
           manufacturerName: newRow.manufacturer || undefined,
           manufacturerPartNumber: newRow.manufacturerPN || undefined,
           pdmFileName: newRow.pdmFileName,
-          price: priceInCents,
-          quantity: new Decimal(quantityValue),
+          price: priceInCents, 
+          quantity: quantityValue,
           unitName: material.unitName,
           linkUrl: material.linkUrl,
           notes: material.notes,
@@ -195,7 +196,6 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
       return {
         ...newRow,
         quantity: material.unitName ? `${quantityValue} ${material.unitName}` : `${quantityValue}`,
-        quantityRaw: quantityValue,
         price: priceInCents !== undefined ? `$${centsToDollar(priceInCents)}` : newRow.price,
         priceRaw: priceInCents !== undefined ? priceInCents / 100 : newRow.priceRaw
       };
@@ -209,7 +209,7 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
 
   const getActions = (params: GridRowParams) => {
     const actions: JSX.Element[] = [];
-    const rowId = String(params.row.id);
+    const rowId = params.row.id;
     const material = materials.find((mat) => mat.materialId === params.row.materialId);
     const shouldShowInMenu = windowWidth < 1000;
 
@@ -371,7 +371,7 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
       headerName: 'Status',
       renderCell: (params) => {
         // assemblies are not editable
-        if (!params.value || String(params.row.id).startsWith('assembly')) return null;
+        if (!params.value || params.row.id.startsWith('assembly')) return null;
         const material = materials.find((m) => m.materialId === params.row.materialId);
         if (!material) return null;
         return (
@@ -483,23 +483,21 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
     },
     {
       ...bomBaseColDef,
-      field: 'quantity',
+      field: 'quantityRaw',
       headerName: 'Quantity',
       type: 'number',
       editable: editPerms,
-      valueGetter: (params) => params.row.quantityRaw,
       renderCell: (params) => params.row.quantity,
       sortable: false,
       filterable: false,
       hide: hideColumn[7]
     },
     {
       ...bomBaseColDef,
-      field: 'price',
+      field: 'priceRaw',
       headerName: 'Price per Unit',
       type: 'number',
       editable: editPerms,
-      valueGetter: (params) => params.row.priceRaw,
       renderCell: (params) => params.row.price,
       sortable: false,
       filterable: false,

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/ImportBOMModal.tsx

@@ -350,7 +350,6 @@ const ImportBOMModal: React.FC<ImportBOMModalProps> = ({ open, onHide, wbsNum, a
             manufacturerPartNumber: material.manufacturerPartNumber || undefined,
             quantity: new Decimal(material.quantity),
             price: material.unitPrice,
-            subtotal: material.subtotal,
             unitName: material.unit || undefined,
             assemblyId: material.assemblyId || undefined,
             linkUrl: '',

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/MaterialForm/MaterialForm.tsx

@@ -60,7 +60,6 @@ export interface MaterialDataSubmission {
   linkUrl?: string;
   notes?: string;
   assemblyId?: string;
-  subtotal?: number;
 }
 
 export interface MaterialFormProps {
@@ -124,8 +123,7 @@ const MaterialForm: React.FC<MaterialFormProps> = ({
 
   const onSubmitWrapper = (data: MaterialFormInput): void => {
     const price = data.price != null ? Math.round(data.price * 100) : undefined;
-    const subtotal = price != null && data.quantity != null ? parseFloat((data.quantity * price).toFixed(2)) : undefined;
-    onSubmit({ ...data, subtotal, price, quantity: data.quantity != null ? new Decimal(data.quantity) : undefined });
+    onSubmit({ ...data, price, quantity: data.quantity != null ? new Decimal(data.quantity) : undefined });
   };
 
   const createManufacturerWrapper = async (manufacturerName: string): Promise<void> => {