Changeset e03e6fb for database/drizzle/queries/components.ts

Timestamp:

01/28/26 12:12:43 (5 months ago)

Author:

Tome <gjorgievtome@…>

Branches:

main

Children:

a744c90

Parents:

ad211d1

Message:

Fix missing attribute in buildComponents relation

File:

• database/drizzle/queries/components.ts (modified) (14 diffs)

database/drizzle/queries/components.ts

@@ -196 +196 @@
             id: componentsTable.id,
             type: componentsTable.type,
+            quantity: buildComponentsTable.numComponents
         })
         .from(buildComponentsTable)
@@ -231 +232 @@
         componentsDetails.push({
             ...comp,
+            quantity: comp.quantity,
             details: details
         });
@@ -256 +258 @@
 
     if(!existingComponents) return null;
-
-
 
     const existing = {
@@ -278 +278 @@
         ...existing.networkAdapters,
         ...existing.soundCards
-    ].filter(Boolean).length;
+    ].reduce((sum: number, c: any) => {
+        if (!c) return sum;
+        return sum + (c.quantity || 1);
+    }, 0);
 
     const existingTDP = existingComponents.reduce((sum, c) => {
         const tdp = c.details?.tdp ? Number(c.details.tdp) : 0;
-        return sum + tdp;
+        return sum + (tdp * (c.quantity || 1));
     }, 0);
 
@@ -456 +459 @@
         if (existing.memory.length > 0) {
             const totalModules = existing.memory.reduce((sum: number, m: any) =>
-                sum + Number(m.details.modules), 0
+                sum + (Number(m.details.modules) * m.quantity), 0
             );
             const totalCapacity = existing.memory.reduce((sum: number, m: any) =>
-                sum + Number(m.details.capacity), 0
+                sum + (Number(m.details.capacity) * m.quantity), 0
             );
 
@@ -704 +707 @@
             if (!caseStorageFormFactor) return false;
 
-            const usedSlots = existing.storage.filter(
-                (s: any) => s.details.formFactor === stor.formFactor
-            ).length;
+            const usedSlots = existing.storage
+                .filter((s: any) => s.details.formFactor === stor.formFactor)
+                .reduce((sum: number, s: any) => sum + s.quantity, 0);
 
             return usedSlots < Number(caseStorageFormFactor.numSlots);
@@ -821 +824 @@
                 if (!storageFF) return false;
 
-                const usedSlots = existing.storage.filter(
-                    (s: any) => s.details.formFactor === stor.details.formFactor
-                ).length;
+                const usedSlots = existing.storage
+                    .filter((s: any) => s.details.formFactor === stor.details.formFactor)
+                    .reduce((sum: number, s: any) => sum + s.quantity, 0);;
 
                 return usedSlots <= Number(storageFF.numSlots);
@@ -963 +966 @@
             .values({
                 buildId,
-                componentId
+                componentId,
+                numComponents: 1
+            })
+            .onConflictDoUpdate({
+                target: [buildComponentsTable.buildId, buildComponentsTable.componentId],
+                set: {
+                    numComponents: sql`${buildComponentsTable.numComponents} + 1`
+                }
             });
 
@@ -969 +979 @@
             .select({
                 price:  componentsTable.price,
+                quantity: buildComponentsTable.numComponents
             })
             .from(buildComponentsTable)
@@ -979 +990 @@
             );
 
-        const totalPrice = buildComponents.reduce((sum, c) => sum + Number(c.price), 0);
+        const totalPrice = buildComponents.reduce((sum, c) =>
+            sum + (Number(c.price) * c.quantity), 0
+        );
 
         await tx
@@ -1009 +1022 @@
         if(!build || build.isApproved) return null;
 
-        const result = await tx
-            .delete(buildComponentsTable)
+        const [existing] = await tx
+            .select({
+                quantity: buildComponentsTable.numComponents
+            })
+            .from(buildComponentsTable)
             .where(
                 and(
@@ -1016 +1032 @@
                     eq(buildComponentsTable.componentId, componentId)
                 )
-            );
-
-        if(result.rowCount === 0) return null;
+            )
+            .limit(1);
+
+        if (!existing) return null;
+
+        if (existing.quantity > 1) {
+            await tx
+                .update(buildComponentsTable)
+                .set({
+                    numComponents: sql`${buildComponentsTable.numComponents} - 1`
+                })
+                .where(
+                    and(
+                        eq(buildComponentsTable.buildId, buildId),
+                        eq(buildComponentsTable.componentId, componentId)
+                    )
+                );
+        } else {
+            await tx
+                .delete(buildComponentsTable)
+                .where(
+                    and(
+                        eq(buildComponentsTable.buildId, buildId),
+                        eq(buildComponentsTable.componentId, componentId)
+                    )
+                );
+        }
 
         const buildComponents = await tx
             .select({
                 price:  componentsTable.price,
+                quantity: buildComponentsTable.numComponents
             })
             .from(buildComponentsTable)
@@ -1033 +1074 @@
             );
 
-        const totalPrice = buildComponents.reduce((sum, c) => sum + Number(c.price), 0);
+        const totalPrice = buildComponents.reduce((sum, c) =>
+            sum + (Number(c.price) * c.quantity), 0
+        );
 
         await tx
@@ -1044 +1087 @@
             );
 
-        return result;
+        return componentId;
     })
 }