From d6a2136c707d740fa51da3ebce5387a903192d34 Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 12 Oct 2026 20:24:49 +0000 Subject: [PATCH] feat(inventory): link online order reservations to database hold and sync numerical stock in RSS/Torob feeds --- backend/src/orders/orders.service.ts | 11 ++++++++++- .../application/app/api/torob/products/route.ts | 13 ++++++++----- frontend/application/app/shop/feed.xml/route.ts | 12 ++++++++++-- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/backend/src/orders/orders.service.ts b/backend/src/orders/orders.service.ts index 567ac2f1..2465f8e1 100644 --- a/backend/src/orders/orders.service.ts +++ b/backend/src/orders/orders.service.ts @@ -309,6 +309,7 @@ export class OrdersService { const isOnline = createOrderDto.paymentMethod === 'online'; const initialStatus = isOnline ? 'pending_payment' : 'processing'; + const reservationExpiry = new Date(Date.now() + 15 * 60 * 1000); // 15 minutes hold const createdOrder = await this.prisma.$transaction(async (tx) => { const order = await tx.order.create({ @@ -326,14 +327,22 @@ export class OrdersService { orderItems: { create: orderItemsData, }, + inventoryReservations: { + create: orderItemsData.map((item) => ({ + productId: item.productId, + quantity: item.quantity, + expiresAt: reservationExpiry, + status: isOnline ? 'ACTIVE' : 'CONSUMED', + })), + }, }, include: { orderItems: { include: { product: true }, }, + inventoryReservations: true, }, }); - // Deduct inventory immediately for non-online orders (card to card) if (!isOnline) { for (const item of createOrderDto.items) { diff --git a/frontend/application/app/api/torob/products/route.ts b/frontend/application/app/api/torob/products/route.ts index 5a7d5c73..ea60a634 100644 --- a/frontend/application/app/api/torob/products/route.ts +++ b/frontend/application/app/api/torob/products/route.ts @@ -153,11 +153,14 @@ export async function GET(request: NextRequest) { : `${baseUrl}${proxied.startsWith('/') ? proxied : `/${proxied}`}`; } - const isInStock = - product.stockStatus !== 'OUT_OF_STOCK' && - product.stockStatus !== 'out_of_stock' && - product.stockStatus !== 'DISCONTINUED' && - product.inStock !== false; + const isOutOfStock = + product.stockStatus === 'OUT_OF_STOCK' || + product.stockStatus === 'out_of_stock' || + product.stockStatus === 'DISCONTINUED' || + product.inStock === false || + (typeof product.stock === 'number' && product.stock <= 0); + + const isInStock = !isOutOfStock; const price = Number(product.priceValue || product.price || 0); const oldPrice = Number(product.oldPrice || product.priceValue || product.price || 0); diff --git a/frontend/application/app/shop/feed.xml/route.ts b/frontend/application/app/shop/feed.xml/route.ts index 9f0be76e..a0cd44d1 100644 --- a/frontend/application/app/shop/feed.xml/route.ts +++ b/frontend/application/app/shop/feed.xml/route.ts @@ -34,9 +34,17 @@ export async function GET() { imageLink = proxied.startsWith('http') ? proxied : `${baseUrl}${proxied.startsWith('/') ? proxied : `/${proxied}`}`; } + const isOutOfStock = + product.stockStatus === 'OUT_OF_STOCK' || + product.stockStatus === 'DISCONTINUED' || + (typeof product.stock === 'number' && product.stock <= 0); + let availability = 'in_stock'; - if (product.stockStatus === 'OUT_OF_STOCK') availability = 'out_of_stock'; - if (product.stockStatus === 'PRE_ORDER') availability = 'preorder'; + if (isOutOfStock) { + availability = 'out_of_stock'; + } else if (product.stockStatus === 'PRE_ORDER') { + availability = 'preorder'; + } const price = product.priceValue ? `${product.priceValue * 10} IRR` : '0 IRR'; const gtinTag = product.barcode ? `${product.barcode}` : '';