From 964f85e26ef862bd5138837a799add77904d0fd0 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Mon, 4 May 2026 08:16:33 +0000
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=20Bolt:=20[performance=20improvement]?=
 =?UTF-8?q?=20batch=20fetch=20order=20items?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: f4teless <60130665+f4teless@users.noreply.github.com>
---
 .jules/bolt.md        |  3 +++
 lib/actions/orders.ts | 38 ++++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 .jules/bolt.md

diff --git a/.jules/bolt.md b/.jules/bolt.md
new file mode 100644
index 0000000..defa4cb
--- /dev/null
+++ b/.jules/bolt.md
@@ -0,0 +1,3 @@
+## 2024-05-20 - [Batch related database queries to prevent N+1 issues]
+**Learning:** Resolving multiple database rows that each require related child rows via `Promise.all(rows.map(async () => db.select(...)))` causes an N+1 query problem, increasing latency with each parent row.
+**Action:** Use `inArray` from `drizzle-orm` to fetch all related child rows in a single batch query, then group them in memory by parent ID.
diff --git a/lib/actions/orders.ts b/lib/actions/orders.ts
index 3d367bb..379a0ac 100644
--- a/lib/actions/orders.ts
+++ b/lib/actions/orders.ts
@@ -3,7 +3,7 @@
 import { db } from "@/lib/db";
 import { orders, orderItems, products, productVariants, user, bargainSessions } from "@/lib/db/schema";
 import { getServerSession } from "@/lib/auth-server";
-import { eq, desc, sql, and, isNull } from "drizzle-orm";
+import { eq, desc, sql, and, isNull, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import { markCouponUsed } from "./admin";
 
@@ -297,20 +297,30 @@ export async function getUserOrders() {
     .where(eq(orders.userId, session.user.id))
     .orderBy(desc(orders.createdAt));
 
-  // Fetch items for each order
-  const ordersWithItems = await Promise.all(
-    userOrders.map(async (order) => {
-      const items = await db
-        .select()
-        .from(orderItems)
-        .where(eq(orderItems.orderId, order.id));
+  if (userOrders.length === 0) {
+    return [];
+  }
 
-      return {
-        ...order,
-        items,
-      };
-    })
-  );
+  // Fetch all items for these orders in one query to prevent N+1 problem
+  const orderIds = userOrders.map((order) => order.id);
+  const allItems = await db
+    .select()
+    .from(orderItems)
+    .where(inArray(orderItems.orderId, orderIds));
+
+  // Group items by orderId
+  const itemsByOrderId = allItems.reduce((acc, item) => {
+    if (!acc[item.orderId]) {
+      acc[item.orderId] = [];
+    }
+    acc[item.orderId].push(item);
+    return acc;
+  }, {} as Record<string, typeof allItems>);
+
+  const ordersWithItems = userOrders.map((order) => ({
+    ...order,
+    items: itemsByOrderId[order.id] || [],
+  }));
 
   return ordersWithItems;
 }