fix: update branch menus

backend/src/common/enums/MenuItemType.enum.ts

@@ -1,6 +1,6 @@
 export enum MenuItemType {
-  MON_CHINH = 1, // món chính
-  TRANG_MIENG = 2, // tráng miệng
-  GIAI_KHAT = 3, // giải khát
   KHAC = 0, // khác
+  MON_CHINH = 1, // món chính
+  GIAI_KHAT = 2, // giải khát
+  TRANG_MIENG = 3, // tráng miệng
 }

backend/src/entities/receipt.entity.ts

@@ -1,57 +1,57 @@
-import {
-  BaseEntity,
-  Column,
-  CreateDateColumn,
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  Relation,
-} from 'typeorm';
-import { BranchEntity } from './branch.entity.js';
-import { UserEntity } from './user.entity.js';
-
-@Entity('receipts')
-export class ReceiptEntity extends BaseEntity {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column()
-  branch_id: string;
-
-  @ManyToOne(() => BranchEntity, (a) => a.receipts)
-  @JoinColumn({ name: 'branch_id' })
-  branch: Relation<BranchEntity>;
-
-  @Column({ default: 0 })
-  income: number;
-
-  @Column({ default: 0 })
-  spend: number;
-
-  @Column({ nullable: true })
-  description: string;
-
-  @Column({ default: 0 })
-  type: number;
-
-  @Column({ default: 0 })
-  sub_type: number;
-
-  @Column({ nullable: true })
-  sender_id: string;
-
-  @Column({ nullable: true })
-  receiver_id: string;
-
-  @ManyToOne(() => UserEntity, (a) => a.out_receipts)
-  @JoinColumn({ name: 'sender_id' })
-  sender: Relation<UserEntity>;
-
-  @ManyToOne(() => UserEntity, (a) => a.in_receipts)
-  @JoinColumn({ name: 'receiver_id' })
-  receiver: Relation<UserEntity>;
-
-  @CreateDateColumn()
-  created_at: Date;
-}
+import {
+  BaseEntity,
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  Relation,
+} from 'typeorm';
+import { BranchEntity } from './branch.entity.js';
+import { UserEntity } from './user.entity.js';
+
+@Entity('receipts')
+export class ReceiptEntity extends BaseEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  branch_id: string;
+
+  @ManyToOne(() => BranchEntity, (a) => a.receipts)
+  @JoinColumn({ name: 'branch_id' })
+  branch: Relation<BranchEntity>;
+
+  @Column({ default: 0 })
+  income: number;
+
+  @Column({ default: 0 })
+  spend: number;
+
+  @Column({ nullable: true })
+  description: string;
+
+  @Column({ default: 0 })
+  type: number;
+
+  @Column({ default: 0 })
+  sub_type: number;
+
+  @Column({ nullable: true })
+  sender_id: string;
+
+  @Column({ nullable: true })
+  receiver_id: string;
+
+  @ManyToOne(() => UserEntity, (a) => a.out_receipts)
+  @JoinColumn({ name: 'sender_id' })
+  sender: Relation<UserEntity>;
+
+  @ManyToOne(() => UserEntity, (a) => a.in_receipts)
+  @JoinColumn({ name: 'receiver_id' })
+  receiver: Relation<UserEntity>;
+
+  @CreateDateColumn()
+  created_at: Date;
+}

backend/src/migrations/1730547520878-AddReceipt.ts

@@ -1,30 +1,30 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class AddReceipt1730547520878 implements MigrationInterface {
-    name = 'AddReceipt1730547520878'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`CREATE TABLE "receipts" ("id" SERIAL NOT NULL, "branch_id" character varying NOT NULL, "income" integer NOT NULL DEFAULT '0', "spend" integer NOT NULL DEFAULT '0', "description" character varying, "type" integer NOT NULL DEFAULT '0', "sub_type" integer NOT NULL DEFAULT '0', "sender_id" uuid, "receiver_id" uuid, "created_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_5e8182d7c29e023da6e1ff33bfe" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`ALTER TABLE "branches" ADD "image_url" character varying`);
-        await queryRunner.query(`ALTER TABLE "branch_menu" ADD "sold_count" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "name" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "location" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "phone_number" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_82e9dee911c0e7393154d1d98ad" FOREIGN KEY ("branch_id") REFERENCES "branches"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_eda4c4e486a25beef4dc82a41d5" FOREIGN KEY ("sender_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_366c3d3cf125da97552f40001a1" FOREIGN KEY ("receiver_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_366c3d3cf125da97552f40001a1"`);
-        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_eda4c4e486a25beef4dc82a41d5"`);
-        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_82e9dee911c0e7393154d1d98ad"`);
-        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "phone_number" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "location" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "name" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "branch_menu" DROP COLUMN "sold_count"`);
-        await queryRunner.query(`ALTER TABLE "branches" DROP COLUMN "image_url"`);
-        await queryRunner.query(`DROP TABLE "receipts"`);
-    }
-
-}
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddReceipt1730547520878 implements MigrationInterface {
+    name = 'AddReceipt1730547520878'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "receipts" ("id" SERIAL NOT NULL, "branch_id" character varying NOT NULL, "income" integer NOT NULL DEFAULT '0', "spend" integer NOT NULL DEFAULT '0', "description" character varying, "type" integer NOT NULL DEFAULT '0', "sub_type" integer NOT NULL DEFAULT '0', "sender_id" uuid, "receiver_id" uuid, "created_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_5e8182d7c29e023da6e1ff33bfe" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "branches" ADD "image_url" character varying`);
+        await queryRunner.query(`ALTER TABLE "branch_menu" ADD "sold_count" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "name" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "location" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "phone_number" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_82e9dee911c0e7393154d1d98ad" FOREIGN KEY ("branch_id") REFERENCES "branches"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_eda4c4e486a25beef4dc82a41d5" FOREIGN KEY ("sender_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_366c3d3cf125da97552f40001a1" FOREIGN KEY ("receiver_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_366c3d3cf125da97552f40001a1"`);
+        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_eda4c4e486a25beef4dc82a41d5"`);
+        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_82e9dee911c0e7393154d1d98ad"`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "phone_number" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "location" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "name" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branch_menu" DROP COLUMN "sold_count"`);
+        await queryRunner.query(`ALTER TABLE "branches" DROP COLUMN "image_url"`);
+        await queryRunner.query(`DROP TABLE "receipts"`);
+    }
+
+}

backend/src/migrations/1730549959767-RemoveEnums.ts

@@ -1,36 +1,36 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class RemoveEnums1730549959767 implements MigrationInterface {
-    name = 'RemoveEnums1730549959767'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
-        await queryRunner.query(`DROP TYPE "public"."menu_items_item_type_enum"`);
-        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "payment_method"`);
-        await queryRunner.query(`DROP TYPE "public"."payments_payment_method_enum"`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "payment_method" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_type"`);
-        await queryRunner.query(`DROP TYPE "public"."orders_order_type_enum"`);
-        await queryRunner.query(`ALTER TABLE "orders" ADD "order_type" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_status"`);
-        await queryRunner.query(`DROP TYPE "public"."orders_order_status_enum"`);
-        await queryRunner.query(`ALTER TABLE "orders" ADD "order_status" integer NOT NULL DEFAULT '0'`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_status"`);
-        await queryRunner.query(`CREATE TYPE "public"."orders_order_status_enum" AS ENUM('pending', 'confirmed', 'preparing', 'delivering', 'done')`);
-        await queryRunner.query(`ALTER TABLE "orders" ADD "order_status" "public"."orders_order_status_enum" NOT NULL DEFAULT 'pending'`);
-        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_type"`);
-        await queryRunner.query(`CREATE TYPE "public"."orders_order_type_enum" AS ENUM('take_away', 'offline', 'online')`);
-        await queryRunner.query(`ALTER TABLE "orders" ADD "order_type" "public"."orders_order_type_enum" NOT NULL DEFAULT 'online'`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "payment_method"`);
-        await queryRunner.query(`CREATE TYPE "public"."payments_payment_method_enum" AS ENUM('cash', 'card', 'online_payment')`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "payment_method" "public"."payments_payment_method_enum" NOT NULL DEFAULT 'cash'`);
-        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
-        await queryRunner.query(`CREATE TYPE "public"."menu_items_item_type_enum" AS ENUM('monchinh', 'trangmieng', 'giaikhat', 'khac')`);
-        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" "public"."menu_items_item_type_enum" NOT NULL DEFAULT 'khac'`);
-    }
-
-}
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RemoveEnums1730549959767 implements MigrationInterface {
+    name = 'RemoveEnums1730549959767'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
+        await queryRunner.query(`DROP TYPE "public"."menu_items_item_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "payment_method"`);
+        await queryRunner.query(`DROP TYPE "public"."payments_payment_method_enum"`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "payment_method" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_type"`);
+        await queryRunner.query(`DROP TYPE "public"."orders_order_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_type" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_status"`);
+        await queryRunner.query(`DROP TYPE "public"."orders_order_status_enum"`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_status" integer NOT NULL DEFAULT '0'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_status"`);
+        await queryRunner.query(`CREATE TYPE "public"."orders_order_status_enum" AS ENUM('pending', 'confirmed', 'preparing', 'delivering', 'done')`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_status" "public"."orders_order_status_enum" NOT NULL DEFAULT 'pending'`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_type"`);
+        await queryRunner.query(`CREATE TYPE "public"."orders_order_type_enum" AS ENUM('take_away', 'offline', 'online')`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_type" "public"."orders_order_type_enum" NOT NULL DEFAULT 'online'`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "payment_method"`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_payment_method_enum" AS ENUM('cash', 'card', 'online_payment')`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "payment_method" "public"."payments_payment_method_enum" NOT NULL DEFAULT 'cash'`);
+        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
+        await queryRunner.query(`CREATE TYPE "public"."menu_items_item_type_enum" AS ENUM('monchinh', 'trangmieng', 'giaikhat', 'khac')`);
+        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" "public"."menu_items_item_type_enum" NOT NULL DEFAULT 'khac'`);
+    }
+
+}

backend/src/modules/branch-menus/branch-menus.service.ts

@@ -4,7 +4,12 @@ import { UpdateBranchMenuDto } from './dto/update-branch-menu.dto.js';
 import { BranchService } from '../branch/branch.service.js';
 import { MenuItemService } from '../menu-item/menu-item.service.js';
 import { BranchMenuEntity } from '../../entities/branch-menu.entity.js';
-import { paginate, PaginateConfig, PaginateQuery } from 'nestjs-paginate';
+import {
+  FilterOperator,
+  paginate,
+  PaginateConfig,
+  PaginateQuery,
+} from 'nestjs-paginate';
 import { isUUID } from 'class-validator';
 
 @Injectable()
@@ -36,12 +41,18 @@ export class BranchMenusService {
     const paginateConfig: PaginateConfig<BranchMenuEntity> = {
       sortableColumns: ['id', 'branch_id', 'menu_id', 'description'],
       nullSort: 'last',
-      defaultSortBy: [['id', 'DESC']],
+      defaultSortBy: [['menu_item.item_type', 'ASC']],
       searchableColumns: ['description'],
       filterableColumns: {
-        // price: [],
-        // item_type: [FilterOperator.EQ],
+        'menu_item.price': [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        'menu_item.item_type': [FilterOperator.EQ, FilterOperator.IN],
       },
+      relations: ['menu_item'],
     };
     return paginate(
       query,