Changeset e03e6fb

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

Location:

database

Files:

• drizzle/queries/builds.ts (modified) (6 diffs)
• drizzle/queries/components.ts (modified) (14 diffs)
• drizzle/schema/builds.ts (modified) (2 diffs)
• migrations/0000_shallow_darkhawk.sql (moved) (moved from database/migrations/0000_regular_kulan_gath.sql ) (1 diff)
• migrations/meta/0000_snapshot.json (modified) (4 diffs)
• migrations/meta/_journal.json (modified) (1 diff)

database/drizzle/queries/builds.ts

@@ -200 +200 @@
             .select({
                 componentId: buildComponentsTable.componentId,
-                component: componentsTable
+                component: componentsTable,
+                quantity: buildComponentsTable.numComponents
             })
             .from(buildComponentsTable)
@@ -292 +293 @@
         return {
             ...buildDetails,
-            components: components.map(c => c.component),
+            components: components.map(c => ({
+                    ...c.component,
+                    quantity: c.quantity
+            })),
             reviews: reviews.map(r => ({
                 username: r.username,
@@ -419 +423 @@
 
         const existing = await tx
-            .select({ componentId: buildComponentsTable.componentId })
+            .select({
+                componentId: buildComponentsTable.componentId,
+                numComponents: buildComponentsTable.numComponents
+            })
             .from(buildComponentsTable)
             .where(eq(buildComponentsTable.buildId, buildId));
@@ -428 +435 @@
                     buildId: newBuild.id,
                     componentId: r.componentId,
+                    numComponents: r.numComponents
                 })),
             );
@@ -545 +553 @@
         const components = await tx
             .select({
-                componentId: buildComponentsTable.componentId
+                componentId: buildComponentsTable.componentId,
+                quantity: buildComponentsTable.numComponents
             })
             .from(buildComponentsTable)
@@ -554 +563 @@
         return {
             build,
-            componentIds: components.map(c => c.componentId)
+            components: components.map(c => ({
+                id: c.componentId,
+                quantity: c.quantity
+            }))
         };
     });

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;
     })
 }

database/drizzle/schema/builds.ts

@@ -17 +17 @@
 
 export const buildComponentsTable = pgTable("build_component", {
-        id: serial("id").primaryKey(),
         buildId: integer("build_id")
             .notNull()
@@ -24 +23 @@
             .notNull()
             .references(() => componentsTable.id, { onDelete: "cascade", onUpdate: "cascade" }),
+        numComponents: integer("num_components")
+            .notNull()
+            .default(1),
     },
+    (t) => ({
+        pk: primaryKey({ columns: [t.buildId, t.componentId] }),
+    }),
 );
 

database/migrations/0000_shallow_darkhawk.sql

@@ -1 +1 @@
 CREATE TABLE "build_component" (
-        "id" serial PRIMARY KEY NOT NULL,
-        "build_id" integer NOT NULL,
-        "component_id" integer NOT NULL
+        "build_id" integer NOT NULL,
+        "component_id" integer NOT NULL,
+        "num_components" integer DEFAULT 1 NOT NULL,
+        CONSTRAINT "build_component_build_id_component_id_pk" PRIMARY KEY("build_id","component_id")
 );
 --> statement-breakpoint

database/migrations/meta/0000_snapshot.json

@@ -1 +1 @@
 {
-  "id": "779a3882-651b-446d-8967-3728aeea2888",
+  "id": "d1ab4ce8-e387-4d74-8d5b-511fdbe0a032",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
@@ -9 +9 @@
       "schema": "",
       "columns": {
-        "id": {
-          "name": "id",
-          "type": "serial",
-          "primaryKey": true,
-          "notNull": true
-        },
         "build_id": {
           "name": "build_id",
@@ -26 +20 @@
           "primaryKey": false,
           "notNull": true
+        },
+        "num_components": {
+          "name": "num_components",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1
         }
       },
@@ -57 +58 @@
         }
       },
-      "compositePrimaryKeys": {},
+      "compositePrimaryKeys": {
+        "build_component_build_id_component_id_pk": {
+          "name": "build_component_build_id_component_id_pk",
+          "columns": [
+            "build_id",
+            "component_id"
+          ]
+        }
+      },
       "uniqueConstraints": {},
       "policies": {},

database/migrations/meta/_journal.json

@@ -6 +6 @@
       "idx": 0,
       "version": "7",
-      "when": 1769188258136,
-      "tag": "0000_regular_kulan_gath",
+      "when": 1769598141213,
+      "tag": "0000_shallow_darkhawk",
       "breakpoints": true
     }