test commit

server/src/routes/user-orders.js

@@ -176,35 +176,45 @@ export async function registerUserOrderRoutes(fastify) {
     return reply.code(201).send({ orderId: created.id })
   })
 
-  fastify.get('/api/me/orders', { preHandler: [fastify.authenticate] }, async (request) => {
-    const userId = request.user.sub
-    const orders = await prisma.order.findMany({
-      where: { userId },
-      include: { items: true },
-      orderBy: { createdAt: 'desc' },
-    })
-    return {
-      items: orders.map((o) => ({
-        id: o.id,
-        status: o.status,
-        totalCents: o.totalCents,
-        currency: o.currency,
-        createdAt: o.createdAt,
-        updatedAt: o.updatedAt,
-        itemsCount: o.items.reduce((s, i) => s + i.qty, 0),
-      })),
+  fastify.get('/api/me/orders', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+    try {
+      const userId = request.user.sub
+      const orders = await prisma.order.findMany({
+        where: { userId },
+        include: { items: { select: { qty: true } } },
+        orderBy: { createdAt: 'desc' },
+      })
+      return {
+        items: orders.map((o) => ({
+          id: o.id,
+          status: o.status,
+          totalCents: o.totalCents,
+          currency: o.currency,
+          createdAt: o.createdAt,
+          updatedAt: o.updatedAt,
+          itemsCount: o.items.reduce((s, i) => s + i.qty, 0),
+        })),
+      }
+    } catch (err) {
+      request.log.error(err)
+      return reply.code(500).send({ error: 'Не удалось загрузить заказы' })
     }
   })
 
   fastify.get('/api/me/orders/:id', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-    const userId = request.user.sub
-    const { id } = request.params
-    const order = await prisma.order.findFirst({
-      where: { id, userId },
-      include: { items: true, messages: { orderBy: { createdAt: 'asc' } } },
-    })
-    if (!order) return reply.code(404).send({ error: 'Заказ не найден' })
-    return { item: order }
+    try {
+      const userId = request.user.sub
+      const { id } = request.params
+      const order = await prisma.order.findFirst({
+        where: { id, userId },
+        include: { items: true, messages: { orderBy: { createdAt: 'asc' } } },
+      })
+      if (!order) return reply.code(404).send({ error: 'Заказ не найден' })
+      return { item: order }
+    } catch (err) {
+      request.log.error(err)
+      return reply.code(500).send({ error: 'Не удалось загрузить заказ' })
+    }
   })
 
   fastify.get(
@@ -251,19 +261,24 @@ export async function registerUserOrderRoutes(fastify) {
     '/api/me/orders/:id/confirm-received',
     { preHandler: [fastify.authenticate] },
     async (request, reply) => {
-      const userId = request.user.sub
-      const { id } = request.params
-      const order = await prisma.order.findFirst({ where: { id, userId } })
-      if (!order) return reply.code(404).send({ error: 'Заказ не найден' })
+      try {
+        const userId = request.user.sub
+        const { id } = request.params
+        const order = await prisma.order.findFirst({ where: { id, userId } })
+        if (!order) return reply.code(404).send({ error: 'Заказ не найден' })
 
-      const okDelivery = order.deliveryType === 'delivery' && order.status === 'SHIPPED'
-      const okPickup = order.deliveryType === 'pickup' && order.status === 'READY_FOR_PICKUP'
-      if (!okDelivery && !okPickup) {
-        return reply.code(409).send({ error: 'Сейчас нельзя подтвердить получение заказа' })
+        const okDelivery = order.deliveryType === 'delivery' && order.status === 'SHIPPED'
+        const okPickup = order.deliveryType === 'pickup' && order.status === 'READY_FOR_PICKUP'
+        if (!okDelivery && !okPickup) {
+          return reply.code(409).send({ error: 'Сейчас нельзя подтвердить получение заказа' })
+        }
+
+        await prisma.order.update({ where: { id }, data: { status: 'DONE' } })
+        return { ok: true, status: 'DONE' }
+      } catch (err) {
+        request.log.error(err)
+        return reply.code(500).send({ error: 'Не удалось подтвердить получение' })
       }
-
-      await prisma.order.update({ where: { id }, data: { status: 'DONE' } })
-      return { ok: true, status: 'DONE' }
     },
   )
 }