feat: all thing about order

backend/src/entities/order-item.entity.ts

@@ -16,7 +16,7 @@ export class OrderItemEntity extends BaseEntity {
   id: number;
 
   @Column()
-  order_id: string;
+  order_id: number;
 
   @ManyToOne(() => OrderEntity, (a) => a.order_items)
   @JoinColumn({ name: 'order_id' })
@@ -26,7 +26,7 @@ export class OrderItemEntity extends BaseEntity {
   branch_menu_id: string;
 
   @ManyToOne(() => BranchMenuEntity)
-  @JoinColumn({ name: 'menu_id' })
+  @JoinColumn({ name: 'branch_menu_id' })
   branch_menu: Relation<BranchMenuEntity>;
 
   @Column()

backend/src/entities/order.entity.ts

@@ -26,6 +26,7 @@ export class OrderEntity extends BaseEntity {
   customer_id: string;
 
   @ManyToOne(() => UserEntity, { nullable: true })
+  @JoinColumn({ name: 'customer_id' })
   customer: Relation<UserEntity>;
 
   @Column()
@@ -35,12 +36,12 @@ export class OrderEntity extends BaseEntity {
   @JoinColumn({ name: 'branch_id' })
   branch: Relation<BranchEntity>;
 
-  @Column()
-  employee_id: string;
+  @Column({ nullable: true })
+  staff_id: string;
 
-  @ManyToOne(() => UserEntity)
-  @JoinColumn({ name: 'employee_id' })
-  employee: Relation<UserEntity>;
+  @ManyToOne(() => UserEntity, { nullable: true })
+  @JoinColumn({ name: 'staff_id' })
+  staff: Relation<UserEntity>;
 
   @Column({ nullable: true })
   table_number: number;
@@ -64,6 +65,6 @@ export class OrderEntity extends BaseEntity {
   payment_id: number;
 
   @OneToOne(() => PaymentEntity, (a) => a.order)
-  @JoinColumn()
+  @JoinColumn({ name: 'payment_id' })
   payment: Relation<PaymentEntity>;
 }

backend/src/migrations/{1730432721785-RefactorAll.ts → 1730474673934-RefactorAll.ts}

@@ -1,7 +1,7 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-export class RefactorAll1730432721785 implements MigrationInterface {
-    name = 'RefactorAll1730432721785'
+export class RefactorAll1730474673934 implements MigrationInterface {
+    name = 'RefactorAll1730474673934'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
         await queryRunner.query(`CREATE TABLE "feeds" ("id" SERIAL NOT NULL, "author_id" character varying, "image_url" character varying, "title" character varying NOT NULL, "description" character varying, "create_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_3dafbf766ecbb1eb2017732153f" PRIMARY KEY ("id"))`);
@@ -15,26 +15,26 @@ export class RefactorAll1730432721785 implements MigrationInterface {
         await queryRunner.query(`CREATE TABLE "payments" ("id" SERIAL NOT NULL, "payment_method" "public"."payments_payment_method_enum" NOT NULL DEFAULT 'cash', "value" integer NOT NULL, CONSTRAINT "PK_197ab7af18c93fbb0c9b28b4a59" PRIMARY KEY ("id"))`);
         await queryRunner.query(`CREATE TYPE "public"."orders_order_type_enum" AS ENUM('take_away', 'offline', 'online')`);
         await queryRunner.query(`CREATE TYPE "public"."orders_order_status_enum" AS ENUM('pending', 'confirmed', 'preparing', 'delivering', 'done')`);
-        await queryRunner.query(`CREATE TABLE "orders" ("id" SERIAL NOT NULL, "customer_id" character varying, "branch_id" character varying NOT NULL, "employee_id" uuid NOT NULL, "table_number" integer, "total_value" integer NOT NULL, "create_at" TIMESTAMP NOT NULL DEFAULT now(), "order_type" "public"."orders_order_type_enum" NOT NULL DEFAULT 'online', "order_status" "public"."orders_order_status_enum" NOT NULL DEFAULT 'pending', "payment_id" integer, "customerId" uuid, "paymentId" integer, CONSTRAINT "REL_06a051324c76276ca2a9d1feb0" UNIQUE ("paymentId"), CONSTRAINT "PK_710e2d4957aa5878dfe94e4ac2f" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TABLE "order_items" ("id" SERIAL NOT NULL, "order_id" integer NOT NULL, "branch_menu_id" character varying NOT NULL, "quantity" integer NOT NULL, "price" integer NOT NULL, "menu_id" uuid, CONSTRAINT "PK_005269d8574e6fac0493715c308" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "orders" ("id" SERIAL NOT NULL, "customer_id" uuid, "branch_id" character varying NOT NULL, "staff_id" uuid, "table_number" integer, "total_value" integer NOT NULL, "create_at" TIMESTAMP NOT NULL DEFAULT now(), "order_type" "public"."orders_order_type_enum" NOT NULL DEFAULT 'online', "order_status" "public"."orders_order_status_enum" NOT NULL DEFAULT 'pending', "payment_id" integer, CONSTRAINT "REL_5b3e94bd2aedc184f9ad8c1043" UNIQUE ("payment_id"), CONSTRAINT "PK_710e2d4957aa5878dfe94e4ac2f" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "order_items" ("id" SERIAL NOT NULL, "order_id" integer NOT NULL, "branch_menu_id" uuid NOT NULL, "quantity" integer NOT NULL, "price" integer NOT NULL, CONSTRAINT "PK_005269d8574e6fac0493715c308" PRIMARY KEY ("id"))`);
         await queryRunner.query(`ALTER TABLE "branches" ADD CONSTRAINT "FK_8c6ae9f9c654c4fac71bccbb7ed" FOREIGN KEY ("ownerId") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
         await queryRunner.query(`ALTER TABLE "branch_menu" ADD CONSTRAINT "FK_96fd74bed807987cf2ee5d8f168" FOREIGN KEY ("branch_id") REFERENCES "branches"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
         await queryRunner.query(`ALTER TABLE "branch_menu" ADD CONSTRAINT "FK_703aa953158d2e80f3fbb0eb9ea" FOREIGN KEY ("menu_id") REFERENCES "menu_items"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "orders" ADD CONSTRAINT "FK_e5de51ca888d8b1f5ac25799dd1" FOREIGN KEY ("customerId") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD CONSTRAINT "FK_772d0ce0473ac2ccfa26060dbe9" FOREIGN KEY ("customer_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
         await queryRunner.query(`ALTER TABLE "orders" ADD CONSTRAINT "FK_17b723da2c12837f4bc21e33398" FOREIGN KEY ("branch_id") REFERENCES "branches"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "orders" ADD CONSTRAINT "FK_f8a7411077c731327ca6e0b93b6" FOREIGN KEY ("employee_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "orders" ADD CONSTRAINT "FK_06a051324c76276ca2a9d1feb08" FOREIGN KEY ("paymentId") REFERENCES "payments"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD CONSTRAINT "FK_40337bbb0e0cc7113dc3037fc60" FOREIGN KEY ("staff_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD CONSTRAINT "FK_5b3e94bd2aedc184f9ad8c10439" FOREIGN KEY ("payment_id") REFERENCES "payments"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
         await queryRunner.query(`ALTER TABLE "order_items" ADD CONSTRAINT "FK_145532db85752b29c57d2b7b1f1" FOREIGN KEY ("order_id") REFERENCES "orders"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "order_items" ADD CONSTRAINT "FK_564d2ba92c6bc3ec79c874e1458" FOREIGN KEY ("menu_id") REFERENCES "branch_menu"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "order_items" ADD CONSTRAINT "FK_927879f38b3098216737427d2f0" FOREIGN KEY ("branch_menu_id") REFERENCES "branch_menu"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "order_items" DROP CONSTRAINT "FK_564d2ba92c6bc3ec79c874e1458"`);
+        await queryRunner.query(`ALTER TABLE "order_items" DROP CONSTRAINT "FK_927879f38b3098216737427d2f0"`);
         await queryRunner.query(`ALTER TABLE "order_items" DROP CONSTRAINT "FK_145532db85752b29c57d2b7b1f1"`);
-        await queryRunner.query(`ALTER TABLE "orders" DROP CONSTRAINT "FK_06a051324c76276ca2a9d1feb08"`);
-        await queryRunner.query(`ALTER TABLE "orders" DROP CONSTRAINT "FK_f8a7411077c731327ca6e0b93b6"`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP CONSTRAINT "FK_5b3e94bd2aedc184f9ad8c10439"`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP CONSTRAINT "FK_40337bbb0e0cc7113dc3037fc60"`);
         await queryRunner.query(`ALTER TABLE "orders" DROP CONSTRAINT "FK_17b723da2c12837f4bc21e33398"`);
-        await queryRunner.query(`ALTER TABLE "orders" DROP CONSTRAINT "FK_e5de51ca888d8b1f5ac25799dd1"`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP CONSTRAINT "FK_772d0ce0473ac2ccfa26060dbe9"`);
         await queryRunner.query(`ALTER TABLE "branch_menu" DROP CONSTRAINT "FK_703aa953158d2e80f3fbb0eb9ea"`);
         await queryRunner.query(`ALTER TABLE "branch_menu" DROP CONSTRAINT "FK_96fd74bed807987cf2ee5d8f168"`);
         await queryRunner.query(`ALTER TABLE "branches" DROP CONSTRAINT "FK_8c6ae9f9c654c4fac71bccbb7ed"`);

backend/src/modules/order/dto/create-order.dto.ts

@@ -1,24 +1,26 @@
-import { IsEnum, IsNumber, IsOptional, IsString } from 'class-validator';
+import {
+  IsArray,
+  IsEnum,
+  IsNumber,
+  IsObject,
+  IsOptional,
+  IsString,
+  ValidateNested,
+} from 'class-validator';
 import { OrderType } from '../../../common/enums/OrderType.enum.js';
 import { OrderItemsDto } from './order-items.dto.js';
+import { Type } from 'class-transformer';
 
 export class CreateOrderDto {
-  @IsString()
-  customer_id: string;
-
-  @IsString()
-  branch_id: string;
-
-  @IsString()
-  employee_id: string;
-
   @IsOptional()
-  @IsString()
+  @IsNumber()
   table_number?: number;
 
   @IsEnum(OrderType)
   order_type: OrderType;
 
-  
+  @IsArray()
+  @ValidateNested()
+  @Type(() => OrderItemsDto)
   order_items: OrderItemsDto[];
 }

backend/src/modules/order/dto/order-items.dto.ts

@@ -1,3 +1,9 @@
+import { IsNumber, IsString } from 'class-validator';
+
 export class OrderItemsDto {
-    
+  @IsString()
+  menu_id: string;
+
+  @IsNumber()
+  quantity: number;
 }

backend/src/modules/order/order.controller.ts

@@ -6,21 +6,43 @@ import {
   Patch,
   Param,
   Delete,
+  Req,
 } from '@nestjs/common';
 import { OrderService } from './order.service.js';
 import { CreateOrderDto } from './dto/create-order.dto.js';
+import { Role } from '../../common/enums/role.enum.js';
 
-@Controller('order')
+@Controller('branchs/:branchId/orders')
 export class OrderController {
   constructor(private readonly orderService: OrderService) {}
 
   @Post()
-  async create(@Body() createOrderDto: CreateOrderDto) {
-    return this.orderService.create(createOrderDto);
+  async create(
+    @Param('branchId') branchId: string,
+    @Req() req: Request,
+    @Body() createOrderDto: CreateOrderDto,
+  ) {
+    const userId = req['user'].sub;
+    const role = req['user'].roles;
+    console.log(req['user']);
+    if (role == Role.CUSTOMER)
+      return this.orderService.createFromCustomer(
+        branchId,
+        userId,
+        createOrderDto,
+      );
+    else
+      return this.orderService.createFromStaff(
+        branchId,
+        userId,
+        createOrderDto,
+      );
   }
 
   @Get()
-  async findAll() {
+  async findAll(@Req() req: Request) {
+    const userId = req['user'].sub;
+    console.log(req['user']);
     return this.orderService.findAll();
   }
 

backend/src/modules/order/order.module.ts

@@ -1,8 +1,11 @@
 import { Module } from '@nestjs/common';
 import { OrderService } from './order.service.js';
 import { OrderController } from './order.controller.js';
+import { BranchModule } from '../branch/branch.module.js';
+import { BranchMenusModule } from '../branch-menus/branch-menus.module.js';
 
 @Module({
+  imports: [BranchModule, BranchMenusModule],
   controllers: [OrderController],
   providers: [OrderService],
 })

backend/src/modules/order/order.service.ts

@@ -1,10 +1,126 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { CreateOrderDto } from './dto/create-order.dto.js';
+import { UserEntity } from '../../entities/user.entity.js';
+import { OrderEntity } from '../../entities/order.entity.js';
+import { BranchService } from '../branch/branch.service.js';
+import { OrderType } from '../../common/enums/OrderType.enum.js';
+import { isUUID } from 'class-validator';
+import { OrderItemEntity } from '../../entities/order-item.entity.js';
+import { BranchMenuEntity } from '../../entities/branch-menu.entity.js';
+import { OrderStatus } from '../../common/enums/OrderStatus.enum.js';
 
 @Injectable()
 export class OrderService {
-  create(createOrderDto: CreateOrderDto) {
-    return 'This action adds a new order';
+  constructor(private readonly branchService: BranchService) {}
+  async createFromCustomer(
+    branchId: string,
+    userId: string,
+    createOrderDto: CreateOrderDto,
+  ) {
+    console.log('??');
+    if (createOrderDto.order_type != OrderType.ONLINE) {
+      throw new BadRequestException('customer cannot create offline order');
+    }
+
+    const user = await UserEntity.findOneBy({ id: userId });
+    if (!user) {
+      throw new BadRequestException('User not found');
+    }
+    const branch = await this.branchService.getBranchOrError(branchId);
+    if (!branch) {
+      throw new BadRequestException('Branch not found');
+    }
+    const order = OrderEntity.create();
+    order.branch = branch;
+    order.customer = user;
+    order.order_type = createOrderDto.order_type;
+    order.order_status = OrderStatus.PENDING;
+    order.total_value = 0;
+    await order.save();
+
+    let orderItems: OrderItemEntity[] = [];
+    let totalValue = 0;
+    for (const item of createOrderDto.order_items) {
+      let branchMenu: BranchMenuEntity;
+      if (!isUUID(item.menu_id)) {
+        branchMenu = await BranchMenuEntity.findOne({
+          where: { branch_id: branchId, menu_id: item.menu_id },
+          relations: ['menu_item'],
+        });
+      } else {
+        branchMenu = await BranchMenuEntity.findOne({
+          where: { branch_id: branchId, id: item.menu_id },
+          relations: ['menu_item'],
+        });
+      }
+      if (!branchMenu) {
+        throw new BadRequestException('Item not found in branch menu');
+      }
+      const orderItem = OrderItemEntity.create();
+      orderItem.branch_menu = branchMenu;
+      orderItem.price = branchMenu.menu_item.price;
+      orderItem.quantity = item.quantity;
+      orderItem.order_id = order.id;
+      totalValue += orderItem.price * orderItem.quantity;
+      orderItems.push(orderItem);
+    }
+    await order.save();
+    order.total_value = totalValue;
+    await OrderItemEntity.save(orderItems);
+    return { ...order, order_items: orderItems };
+  }
+
+  async createFromStaff(
+    branchId: string,
+    userId: string,
+    createOrderDto: CreateOrderDto,
+  ) {
+    if (createOrderDto.order_type == OrderType.ONLINE) {
+      throw new BadRequestException('staff cannot create online order');
+    }
+    // staff
+    const staff = await UserEntity.findOneBy({ id: userId });
+    const branch = await this.branchService.getBranchOrError(branchId);
+    const order = OrderEntity.create();
+
+    order.branch = branch;
+    order.staff = staff;
+    order.order_type = createOrderDto.order_type;
+    order.table_number = createOrderDto.table_number;
+    order.order_status = OrderStatus.PREPARING;
+    order.total_value = 0;
+    await order.save();
+
+    let orderItems: OrderItemEntity[] = [];
+    let totalValue = 0;
+    for (const item of createOrderDto.order_items) {
+      let branchMenu: BranchMenuEntity;
+      if (!isUUID(item.menu_id)) {
+        branchMenu = await BranchMenuEntity.findOne({
+          where: { branch_id: branchId, menu_id: item.menu_id },
+          relations: ['menu_item'],
+        });
+      } else {
+        branchMenu = await BranchMenuEntity.findOne({
+          where: { branch_id: branchId, id: item.menu_id },
+          relations: ['menu_item'],
+        });
+      }
+      if (!branchMenu) {
+        throw new BadRequestException('Item not found in branch menu');
+      }
+      const orderItem = OrderItemEntity.create();
+      orderItem.branch_menu = branchMenu;
+      orderItem.price = branchMenu.menu_item.price;
+      orderItem.quantity = item.quantity;
+      orderItem.order_id = order.id;
+      totalValue += orderItem.price * orderItem.quantity;
+      orderItems.push(orderItem);
+    }
+    await order.save();
+    order.total_value = totalValue;
+    await OrderItemEntity.save(orderItems);
+    return { ...order, order_items: orderItems };
   }
 
   findAll() {