Changes in database/drizzle/queries/components.ts [e03e6fb:b0685a8]

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