modify create order

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

@@ -3,6 +3,7 @@ import { EntityManager } from '@mikro-orm/postgresql';
 import { Order } from '../entities/order.entity';
 import { OrderItem } from '../entities/order-item.entity';
 import { User } from '../../users/entities/user.entity';
+import { UserAddress } from '../../users/entities/user-address.entity';
 import { UserRestaurant } from '../../users/entities/user-restuarant.entity';
 import { Restaurant } from '../../restaurants/entities/restaurant.entity';
 import { Food } from '../../foods/entities/food.entity';
@@ -27,7 +28,6 @@ import { OrderMessage } from 'src/common/enums/message.enum';
 import { AdminCreateOrderDto } from '../dto/admin-create-order.dto';
 import { FoodOrderReportDto, FoodOrderReportSortBy } from '../dto/food-order-report.dto';
 import { DailyOrderReportDto, DailyOrderReportSortBy } from '../dto/daily-order-report.dto';
-import { normalizePhone } from 'src/modules/utils/phone.util';
 type OrderItemData = { food: Food; quantity: number; unitPrice: number; discount: number };
 
 type ValidatedCartForOrder = {
@@ -147,18 +147,8 @@ console.log(cart);
     return { paymentUrl, order };
   }
 
-  async createOrderForUserByPhone(restaurantId: string, dto: AdminCreateOrderDto): Promise<Order> {
-    const normalizedPhone = normalizePhone(dto.userPhone);
-    let user = await this.em.findOne(User, { phone: normalizedPhone });
-    if (!user) {
-      user = this.em.create(User, {
-        phone: normalizedPhone,
-        firstName: dto.firstName?.trim() || normalizedPhone,
-        lastName: dto.lastName?.trim(),
-      });
-      await this.em.persistAndFlush(user);
-      this.logger.debug(`Auto-created user ${user.id} with phone ${normalizedPhone} via admin order`);
-    }
+  async createOrderForUser(restaurantId: string, dto: AdminCreateOrderDto): Promise<Order> {
+    const user = await this.getUserOrFail(dto.userId);
 
     const [restaurant, delivery] = await Promise.all([
       this.getRestaurantOrFail(restaurantId),
@@ -167,10 +157,14 @@ console.log(cart);
 
     const paymentMethod = await this.getPaymentMethodOrFail(dto.paymentMethodId, restaurantId);
     this.assertPaymentMethodEnabled(paymentMethod);
-    this.assertCreditCardPaymentDetails(paymentMethod, dto.paymentDesc, dto.paymentAttachments);
 
     this.assertAdminDeliveryRequirements(dto, delivery);
 
+    const userAddress =
+      delivery.method === DeliveryMethodEnum.DeliveryCourier
+        ? await this.resolveUserAddressForOrder(user, dto.addressId!)
+        : null;
+
     const orderItemsData = await this.buildOrderItemsDataFromDto(dto.items, restaurantId);
 
     const subTotal = orderItemsData.reduce((sum, item) => sum + item.unitPrice * item.quantity, 0);
@@ -185,7 +179,7 @@ console.log(cart);
         user,
         restaurant,
         deliveryMethod: delivery,
-        userAddress: delivery.method === DeliveryMethodEnum.DeliveryCourier ? (dto.userAddress ?? null) : null,
+        userAddress,
         carAddress: delivery.method === DeliveryMethodEnum.DeliveryCar ? (dto.carAddress ?? null) : null,
         paymentMethod,
         couponDiscount: 0,
@@ -219,7 +213,6 @@ console.log(cart);
         status: PaymentStatusEnum.Pending,
         method: order.paymentMethod.method,
         gateway: order.paymentMethod.gateway ?? null,
-        ...this.buildCreditCardPaymentFields(paymentMethod, dto.paymentDesc, dto.paymentAttachments),
       });
       em.persist(payment);
 
@@ -229,7 +222,7 @@ console.log(cart);
       await this.inventoryService.deductFromInventory(em, bulkReserveFoodDto);
       await em.flush();
 
-      this.logger.debug(`Admin created order ${order.id} for user ${user.id} (phone: ${normalizedPhone}, restaurant: ${restaurantId})`);
+      this.logger.debug(`Admin created order ${order.id} for user ${user.id} (restaurant: ${restaurantId})`);
       return order;
     });
 
@@ -467,6 +460,28 @@ console.log(cart);
     return user;
   }
 
+  private async resolveUserAddressForOrder(user: User, addressId: string): Promise<OrderUserAddress> {
+    const address = await this.em.findOne(UserAddress, {
+      id: addressId,
+      user: { id: user.id },
+    });
+
+    if (!address) {
+      throw new NotFoundException(`Address with ID ${addressId} not found for user ${user.id}.`);
+    }
+
+    return {
+      fullName: [user.firstName, user.lastName].filter(Boolean).join(' '),
+      phone: address.phone || user.phone,
+      city: address.city,
+      province: address.province || '',
+      address: address.address,
+      postalCode: address.postalCode ?? undefined,
+      latitude: address.latitude,
+      longitude: address.longitude,
+    };
+  }
+
   private async getRestaurantOrFail(restaurantId: string): Promise<Restaurant> {
     const restaurant = await this.em.findOne(Restaurant, { id: restaurantId });
     if (!restaurant) throw new NotFoundException(OrderMessage.RESTAURANT_NOT_FOUND);
@@ -619,7 +634,7 @@ console.log(cart);
       }
     }
 
-    if (delivery.method === DeliveryMethodEnum.DeliveryCourier && !dto.userAddress) {
+    if (delivery.method === DeliveryMethodEnum.DeliveryCourier && !dto.addressId) {
       throw new BadRequestException(OrderMessage.ADDRESS_REQUIRED);
     }