feat(inventory): implement numeric stock inventory across fullstack and improve prescription UX handoff
Deploy Canina / deploy (push) Failing after 2m31s
E2E Playwright Tests / Run Full E2E & Security Suites (push) Failing after 7s

This commit is contained in:
devops committed 2026-10-12 19:29:48 +00:00
1 parent e9582430e6
commit 741365f04c
13 files changed
+177 -47

No files matched your search

+9 -2
View File
@@ -581,7 +581,8 @@ export class AdminService {
metaDescription: data.metaDescription || '',
keywords: data.keywords || '',
canonicalUrl: data.canonicalUrl || '',
stockStatus: data.stockStatus || 'IN_STOCK',
stock: data.stock !== undefined ? Number(data.stock) : (data.stockStatus === 'OUT_OF_STOCK' ? 0 : 100),
stockStatus: data.stockStatus || (data.stock !== undefined && Number(data.stock) <= 0 ? 'OUT_OF_STOCK' : 'IN_STOCK'),
noIndex: data.noIndex ?? false,
noFollow: data.noFollow ?? false,
ogImage: data.ogImage || null,
@@ -761,8 +762,14 @@ export class AdminService {
metaDescription: data.metaDescription,
keywords: data.keywords,
canonicalUrl: data.canonicalUrl,
stock:
data.stock !== undefined ? Number(data.stock) : undefined,
stockStatus:
data.stockStatus !== undefined ? data.stockStatus : undefined,
data.stockStatus !== undefined
? data.stockStatus
: (data.stock !== undefined
? (Number(data.stock) <= 0 ? 'OUT_OF_STOCK' : 'IN_STOCK')
: undefined),
noIndex: data.noIndex !== undefined ? data.noIndex : undefined,
noFollow: data.noFollow !== undefined ? data.noFollow : undefined,
ogImage: data.ogImage !== undefined ? data.ogImage : undefined,
+5
View File
@@ -241,6 +241,11 @@ export class ProductDto {
@IsString()
stockStatus?: 'IN_STOCK' | 'OUT_OF_STOCK' | 'PRE_ORDER' | 'DISCONTINUED';
@ApiPropertyOptional({ description: 'تعداد موجودی در انبار' })
@IsOptional()
@IsNumber()
stock?: number;
@ApiPropertyOptional({ description: 'عدم ایندکس توسط موتورهای جستجو' })
@IsOptional()
@IsBoolean()
+66 -23
View File
@@ -141,18 +141,23 @@ export class OrdersService {
const productMap = new Map(products.map((p) => [p.id, p]));
for (const productId of productIds) {
const product = productMap.get(productId);
for (const item of createOrderDto.items) {
const product = productMap.get(item.productId);
if (!product) {
throw new NotFoundException(`محصول یافت نشد`);
}
const isOutOfStock =
product.stockStatus === 'OUT_OF_STOCK' ||
product.stockStatus === 'DISCONTINUED' ||
(product.packageSize !== null && Number(product.packageSize) <= 0);
product.stock <= 0;
if (isOutOfStock) {
throw new BadRequestException(
`محصول «${product.nameFa || product.name}» در حال حاضر ناموجود است و امکان ثبت سفارش آن وجود ندارد`,
`محصول «${product.nameFa || (product as any).name}» در حال حاضر ناموجود است و امکان ثبت سفارش آن وجود ندارد`,
);
}
if (item.quantity > product.stock) {
throw new BadRequestException(
`تعداد درخواستی برای محصول «${product.nameFa || (product as any).name}» (${item.quantity} عدد) بیشتر از موجودی انبار (${product.stock} عدد) است`,
);
}
}
@@ -272,6 +277,22 @@ export class OrdersService {
.catch(() => {});
}
// Deduct inventory atomically for wallet orders
for (const item of createOrderDto.items) {
const updated = await tx.product.update({
where: { id: item.productId },
data: {
stock: { decrement: item.quantity },
},
});
if (updated.stock <= 0) {
await tx.product.update({
where: { id: item.productId },
data: { stockStatus: 'OUT_OF_STOCK' },
});
}
}
return newOrder;
});
@@ -289,27 +310,49 @@ export class OrdersService {
const isOnline = createOrderDto.paymentMethod === 'online';
const initialStatus = isOnline ? 'pending_payment' : 'processing';
const createdOrder = await this.prisma.order.create({
data: {
userId,
couponId,
totalAmount: Number(finalAmount),
charityDonation: Number(charityAmount),
isRefill: Boolean(createOrderDto.isRefill),
refillIntervalDays: createOrderDto.refillIntervalDays || 60,
trackingNumber,
status: initialStatus,
paymentMethod: createOrderDto.paymentMethod || 'card',
shippingAddress: createOrderDto.shippingAddress,
orderItems: {
create: orderItemsData,
const createdOrder = await this.prisma.$transaction(async (tx) => {
const order = await tx.order.create({
data: {
userId,
couponId,
totalAmount: Number(finalAmount),
charityDonation: Number(charityAmount),
isRefill: Boolean(createOrderDto.isRefill),
refillIntervalDays: createOrderDto.refillIntervalDays || 60,
trackingNumber,
status: initialStatus,
paymentMethod: createOrderDto.paymentMethod || 'card',
shippingAddress: createOrderDto.shippingAddress,
orderItems: {
create: orderItemsData,
},
},
},
include: {
orderItems: {
include: { product: true },
include: {
orderItems: {
include: { product: true },
},
},
},
});
// Deduct inventory immediately for non-online orders (card to card)
if (!isOnline) {
for (const item of createOrderDto.items) {
const updated = await tx.product.update({
where: { id: item.productId },
data: {
stock: { decrement: item.quantity },
},
});
if (updated.stock <= 0) {
await tx.product.update({
where: { id: item.productId },
data: { stockStatus: 'OUT_OF_STOCK' },
});
}
}
}
return order;
});
// Send Order Confirmation SMS (for card-to-card or non-online orders, online orders get SMS on verify)
+25 -1
View File
@@ -433,12 +433,36 @@ export class PaymentService {
},
});
// Mark inventory reservations as CONSUMED
// Mark inventory reservations as CONSUMED and decrement product stock
await tx.inventoryReservation.updateMany({
where: { orderId: transaction.orderId, status: 'ACTIVE' },
data: { status: 'CONSUMED' },
});
const orderWithItems = await tx.order.findUnique({
where: { id: transaction.orderId },
include: { orderItems: true },
});
if (orderWithItems?.orderItems) {
for (const item of orderWithItems.orderItems) {
if (item.productId) {
const updated = await tx.product.update({
where: { id: item.productId },
data: {
stock: { decrement: item.quantity },
},
});
if (updated.stock <= 0) {
await tx.product.update({
where: { id: item.productId },
data: { stockStatus: 'OUT_OF_STOCK' },
});
}
}
}
}
// If charity donation was made, update user's total charity
if (
transaction.order &&
+1 -1
View File
@@ -187,7 +187,7 @@ export class TorobController {
const isInStock =
product.stockStatus !== 'DISCONTINUED' &&
product.stockStatus !== 'OUT_OF_STOCK' &&
(product.packageSize === null || Number(product.packageSize) > 0) &&
(product.stock === undefined || product.stock > 0) &&
String(product.stockStatus || '')
.toLowerCase()
.includes('in');