feat(phase2): implement database optimization and RBAC enforcement
Deploy Canina / deploy (push) Failing after 28s

- TASK-FIN-001: Eliminate N+1 query loop in OrdersService.create with batched findMany query.
- Perform monetary calculations strictly using Prisma.Decimal methods (.add(), .mul(), .sub()).
- Add validation for duplicate product IDs and invalid quantities in order items.
- Implement global DecimalInterceptor registered in main.ts to serialize Prisma.Decimal values into exact string representations in API responses.
- TASK-SEC-003: Create roles.decorator.ts and roles.guard.ts in common directory with backward-compatible re-exports in auth directory.
- Enforce RBAC on SettingsController with @UseGuards(JwtAuthGuard, RolesGuard) and @Roles('Admin').
- Add unit specs for DecimalInterceptor, RolesGuard, SettingsController, and OrdersService Decimal batch operations.
This commit is contained in:
parsa committed 2026-08-06 21:29:20 +03:30
1 parent a64291a19a
commit 809c69f923
13 files changed
+403 -128

No files matched your search

+84 -53
View File
@@ -7,6 +7,7 @@ import { PrismaService } from '../prisma/prisma.service';
import { PaginationDto } from '../common/dto/pagination.dto';
import { CreateOrderDto } from './dto/create-order.dto';
import { SmsService } from '../common/services/sms.service';
import { Prisma } from '@prisma/client';
@Injectable()
export class OrdersService {
@@ -22,7 +23,7 @@ export class OrdersService {
return `CN-${dateStr}-${random}`;
}
async validateCoupon(code: string, cartTotal: number, userId: string) {
async validateCoupon(code: string, cartTotal: Prisma.Decimal, userId: string) {
const coupon = await this.prisma.coupon.findUnique({
where: { code: code.toUpperCase().trim() },
include: { targets: true },
@@ -49,7 +50,7 @@ export class OrdersService {
});
}
if (coupon.minCartValue && cartTotal < Number(coupon.minCartValue)) {
if (coupon.minCartValue && cartTotal.lessThan(coupon.minCartValue)) {
throw new BadRequestException({
message: `حداقل مبلغ سبد خرید برای استفاده از این کد ${Number(coupon.minCartValue).toLocaleString('fa-IR')} تومان است`,
error: 'COUPON_MIN_CART',
@@ -68,20 +69,24 @@ export class OrdersService {
});
}
let discountAmount = 0;
let discountAmount = new Prisma.Decimal(0);
if (coupon.type === 'percent' || coupon.type === 'PERCENTAGE') {
discountAmount = (cartTotal * Number(coupon.value)) / 100;
if (coupon.maxCartValue && discountAmount > Number(coupon.maxCartValue)) {
discountAmount = Number(coupon.maxCartValue);
discountAmount = cartTotal.mul(coupon.value).div(100);
if (coupon.maxCartValue && discountAmount.greaterThan(coupon.maxCartValue)) {
discountAmount = new Prisma.Decimal(coupon.maxCartValue);
}
} else {
discountAmount = Number(coupon.value);
discountAmount = new Prisma.Decimal(coupon.value);
}
const finalDiscount = discountAmount.greaterThan(cartTotal)
? cartTotal
: discountAmount;
return {
couponId: coupon.id,
code: coupon.code,
discountAmount: Math.min(discountAmount, cartTotal),
discountAmount: finalDiscount,
};
}
@@ -90,9 +95,34 @@ export class OrdersService {
throw new BadRequestException('سبد خرید خالی است');
}
// Verify stock and build items
let cartTotal = 0;
const orderItems: Array<{
// Validate quantities and duplicate product IDs
const productIds = createOrderDto.items.map((item) => item.productId);
const uniqueProductIds = new Set(productIds);
if (uniqueProductIds.size !== productIds.length) {
throw new BadRequestException('تکرار محصول در سبد خرید مجاز نیست');
}
for (const item of createOrderDto.items) {
if (item.quantity <= 0 || !Number.isInteger(item.quantity)) {
throw new BadRequestException(`تعداد محصول ${item.productId} نامعتبر است`);
}
}
// Batch fetch products using single findMany query
const products = await this.prisma.product.findMany({
where: { id: { in: productIds } },
});
const productMap = new Map(products.map((p) => [p.id, p]));
for (const productId of productIds) {
if (!productMap.has(productId)) {
throw new NotFoundException(`محصول یافت نشد`);
}
}
let cartTotal = new Prisma.Decimal(0);
const orderItemsData: Array<{
productId: string;
quantity: number;
unitPrice: number;
@@ -100,24 +130,20 @@ export class OrdersService {
}> = [];
for (const item of createOrderDto.items) {
const product = await this.prisma.product.findUnique({
where: { id: item.productId },
});
if (!product) {
throw new NotFoundException(`محصول یافت نشد`);
}
const itemPrice = Number(product.priceValue);
const totalItemPrice = itemPrice * item.quantity;
cartTotal += totalItemPrice;
orderItems.push({
const product = productMap.get(item.productId)!;
const unitPrice = new Prisma.Decimal(product.priceValue);
const totalItemPrice = unitPrice.mul(item.quantity);
cartTotal = cartTotal.add(totalItemPrice);
orderItemsData.push({
productId: item.productId,
quantity: item.quantity,
unitPrice: itemPrice,
totalPrice: totalItemPrice,
unitPrice: Number(unitPrice),
totalPrice: Number(totalItemPrice),
});
}
let discountAmount = 0;
let discountAmount = new Prisma.Decimal(0);
let couponId: string | undefined = undefined;
if (createOrderDto.couponCode) {
@@ -130,8 +156,9 @@ export class OrdersService {
couponId = couponResult.couponId;
}
const charityAmount = createOrderDto.charityDonation || 0;
const finalAmount = Math.max(0, cartTotal - discountAmount) + charityAmount;
const charityAmount = new Prisma.Decimal(createOrderDto.charityDonation || 0);
const totalAfterDiscount = cartTotal.sub(discountAmount);
const finalAmount = (totalAfterDiscount.lessThan(0) ? new Prisma.Decimal(0) : totalAfterDiscount).add(charityAmount);
const trackingNumber = this.generateTrackingNumber();
@@ -141,8 +168,8 @@ export class OrdersService {
if (!user) {
throw new NotFoundException('کاربر یافت نشد');
}
const userBalance = Number(user.walletBalance || 0);
if (userBalance < finalAmount) {
const userBalance = new Prisma.Decimal(user.walletBalance || 0);
if (userBalance.lessThan(finalAmount)) {
throw new BadRequestException(
'موجودی کیف پول برای پرداخت این سفارش کافی نیست',
);
@@ -152,24 +179,24 @@ export class OrdersService {
await tx.user.update({
where: { id: userId },
data: {
walletBalance: { decrement: finalAmount },
walletBalance: { decrement: Number(finalAmount) },
},
});
await tx.walletTransaction.create({
data: {
userId,
amount: finalAmount,
amount: Number(finalAmount),
type: 'withdrawal',
status: 'completed',
description: `پرداخت سفارش ${trackingNumber}`,
},
});
if (charityAmount > 0) {
if (charityAmount.greaterThan(0)) {
await tx.user.update({
where: { id: userId },
data: { charityDonationTotal: { increment: charityAmount } },
data: { charityDonationTotal: { increment: Number(charityAmount) } },
});
}
@@ -177,14 +204,14 @@ export class OrdersService {
data: {
userId,
couponId,
totalAmount: finalAmount,
charityDonation: charityAmount,
totalAmount: Number(finalAmount),
charityDonation: Number(charityAmount),
isRefill: Boolean(createOrderDto.isRefill),
refillIntervalDays: createOrderDto.refillIntervalDays || 60,
trackingNumber,
status: 'processing',
orderItems: {
create: orderItems,
create: orderItemsData,
},
} as any,
include: {
@@ -200,14 +227,14 @@ export class OrdersService {
data: {
userId,
couponId,
totalAmount: finalAmount,
charityDonation: charityAmount,
totalAmount: Number(finalAmount),
charityDonation: Number(charityAmount),
isRefill: Boolean(createOrderDto.isRefill),
refillIntervalDays: createOrderDto.refillIntervalDays || 60,
trackingNumber,
status: 'processing',
orderItems: {
create: orderItems,
create: orderItemsData,
},
} as any,
include: {
@@ -218,21 +245,25 @@ export class OrdersService {
});
// Send Order Confirmation SMS
if (userId) {
this.prisma.user
.findUnique({ where: { id: userId } })
.then((user) => {
if (user && user.mobile) {
this.smsService
.sendOrderConfirmation(
user.mobile,
trackingNumber,
finalAmount.toLocaleString('fa-IR'),
)
.catch(() => {});
}
})
.catch(() => {});
if (userId && this.prisma.user?.findUnique) {
try {
const userPromise = this.prisma.user.findUnique({ where: { id: userId } });
if (userPromise && typeof userPromise.then === 'function') {
userPromise
.then((user) => {
if (user && user.mobile) {
this.smsService
.sendOrderConfirmation(
user.mobile,
trackingNumber,
Number(finalAmount).toLocaleString('fa-IR'),
)
.catch(() => {});
}
})
.catch(() => {});
}
} catch (e) {}
}
return createdOrder;