order confirm after pay

src/modules/orders/controllers/orders.controller.ts

@@ -6,7 +6,7 @@ import { UserId } from '../../../common/decorators/user-id.decorator';
 import { RestId } from 'src/common/decorators/rest-id.decorator';
 import { AdminAuthGuard } from '../../auth/guards/adminAuth.guard';
 import { FindOrdersDto } from '../dto/find-orders.dto';
-import { OrderStatus } from '../interface/order-status';
+import { OrderStatus } from '../interface/order.interface';
 
 @ApiTags('orders')
 @ApiBearerAuth()

src/modules/orders/dto/find-orders.dto.ts

@@ -1,7 +1,7 @@
 import { IsOptional, IsString, IsNumber, Min, IsIn, IsEnum, IsDateString } from 'class-validator';
 import { Type } from 'class-transformer';
 import { ApiPropertyOptional } from '@nestjs/swagger';
-import { OrderStatus } from '../interface/order-status';
+import { OrderStatus } from '../interface/order.interface';
 import { PaymentStatusEnum } from '../../payments/interface/payment';
 
 // Define the valid sort directions

src/modules/orders/entities/order.entity.ts

@@ -13,13 +13,13 @@ import {
 } from '@mikro-orm/core';
 import { BaseEntity } from '../../../common/entities/base.entity';
 import { PaymentStatusEnum } from '../../payments/interface/payment';
-import { OrderCouponDetail, OrderStatus } from '../interface/order-status';
+import { OrderCouponDetail, OrderStatus } from '../interface/order.interface';
 import { User } from '../../users/entities/user.entity';
 import { Restaurant } from '../../restaurants/entities/restaurant.entity';
 import { PaymentMethod } from '../../payments/entities/payment-method.entity';
 import { OrderItem } from './order-item.entity';
 import { Delivery } from '../../delivery/entities/delivery.entity';
-import { OrderUserAddress, OrderCarAddress } from '../interface/order-status';
+import { OrderUserAddress, OrderCarAddress } from '../interface/order.interface';
 
 @Entity({ tableName: 'orders' })
 @Unique({ properties: ['restaurant', 'orderNumber'] })

src/modules/orders/orders.module.ts

@@ -18,6 +18,7 @@ import { OrderRepository } from './repositories/order.repository';
 import { OrderListeners } from './listeners/order.listeners';
 import { AdminModule } from '../admin/admin.module';
 import { NotificationsModule } from '../notifications/notifications.module';
+import { InventoryModule } from '../inventory/inventory.module';
 
 @Module({
   imports: [
@@ -29,6 +30,7 @@ import { NotificationsModule } from '../notifications/notifications.module';
     JwtModule,
     AdminModule,
     NotificationsModule,
+    InventoryModule
   ],
   controllers: [OrdersController],
   providers: [OrdersService, OrderRepository, OrderListeners],

src/modules/orders/providers/orders.service.ts

@@ -6,7 +6,7 @@ import { User } from '../../users/entities/user.entity';
 import { Restaurant } from '../../restaurants/entities/restaurant.entity';
 import { Food } from '../../foods/entities/food.entity';
 import { CartService } from '../../cart/providers/cart.service';
-import { OrderStatus, OrderUserAddress, OrderCarAddress } from '../interface/order-status';
+import { OrderStatus, OrderUserAddress, OrderCarAddress } from '../interface/order.interface';
 import { PaymentMethodEnum, PaymentStatusEnum } from '../../payments/interface/payment';
 import { Cart } from '../../cart/interfaces/cart.interface';
 import { PaymentMethod } from '../../payments/entities/payment-method.entity';
@@ -17,6 +17,8 @@ import { OrderRepository } from '../repositories/order.repository';
 import { FindOrdersDto } from '../dto/find-orders.dto';
 import { PaginatedResult } from 'src/common/interfaces/pagination.interface';
 import { Payment } from 'src/modules/payments/entities/payment.entity';
+import { InventoryService } from 'src/modules/inventory/inventory.service';
+import { BulkReserveFoodDto } from 'src/modules/inventory/dto/bulk-reserve-food.dto';
 
 type OrderItemData = { food: Food; quantity: number; unitPrice: number; discount: number };
 
@@ -53,6 +55,7 @@ export class OrdersService {
     private readonly cartService: CartService,
     private readonly orderRepository: OrderRepository,
     private readonly paymentsService: PaymentsService,
+    private readonly inventoryService: InventoryService,
   ) { }
 
   async checkout(userId: string, restaurantId: string) {
@@ -109,8 +112,16 @@ export class OrdersService {
         method: order.paymentMethod.method,
         gateway: order.paymentMethod.gateway ?? null,
       });
-      em.persist(payment);
 
+      em.persist(payment);
+      // reserve stock based on payment method.
+      const bulkReserveFoodDto: BulkReserveFoodDto = {
+        items: validated.orderItemsData.map(item => ({
+          foodId: item.food.id,
+          quantity: item.quantity,
+        })),
+      };
+      await this.inventoryService.tempBulkReserveFood(em, restaurantId, order.id, order.paymentMethod.method, bulkReserveFoodDto);
       await em.flush();
       this.logger.debug(`Order ${order.id} created for user ${userId} (restaurant ${restaurantId})`);
       return order;

src/modules/orders/repositories/order.repository.ts

@@ -3,7 +3,7 @@ import { EntityManager, EntityRepository } from '@mikro-orm/postgresql';
 import { FilterQuery } from '@mikro-orm/core';
 import { Order } from '../entities/order.entity';
 import { PaginatedResult } from 'src/common/interfaces/pagination.interface';
-import { OrderStatus } from '../interface/order-status';
+import { OrderStatus } from '../interface/order.interface';
 import { PaymentStatusEnum } from '../../payments/interface/payment';
 import { Review } from '../../review/entities/review.entity';
 
@@ -96,7 +96,7 @@ export class OrderRepository extends EntityRepository<Order> {
       limit,
       offset,
       orderBy: { [orderBy]: order.toLowerCase() as 'asc' | 'desc' },
-      populate: ['user', 'restaurant', 'deliveryMethod',   'paymentMethod', 'items', 'items.food'] as never,
+      populate: ['user', 'restaurant', 'deliveryMethod', 'paymentMethod', 'items', 'items.food'] as never,
     });
 
     // Collect all (orderId, foodId) pairs for efficient review lookup