Merge pull request #23 from PBL6-team-CATS/fix/menu-items

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

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

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

@@ -2,12 +2,12 @@ import {
   BaseEntity,
   Column,
   Entity,
-  ManyToOne,
   OneToMany,
   PrimaryColumn,
   Relation,
 } from 'typeorm';
 import { BranchMenuEntity } from './branch-menu.entity.js';
+import { MenuItemType } from '../common/enums/MenuItemType.enum.js';
 
 @Entity('menu_items')
 export class MenuItemEntity extends BaseEntity {
@@ -20,8 +20,8 @@ export class MenuItemEntity extends BaseEntity {
   @Column({ nullable: true })
   image_url: string;
 
-  @Column({ nullable: true })
-  item_group_id: string;
+  @Column({ type: 'enum', enum: MenuItemType, default: 'khac' })
+  item_type: MenuItemType;
 
   @Column()
   description: string;

backend/src/migrations/1729877042750-MoveMenuItemType.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MoveMenuItemType1729877042750 implements MigrationInterface {
+    name = 'MoveMenuItemType1729877042750'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "menu_items" RENAME COLUMN "item_group_id" TO "item_type"`);
+        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'`);
+    }
+
+    public async down(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" character varying`);
+        await queryRunner.query(`ALTER TABLE "menu_items" RENAME COLUMN "item_type" TO "item_group_id"`);
+    }
+
+}

backend/src/modules/menu-item/menu-item.service.ts

@@ -20,13 +20,7 @@ export class MenuItemService {
 
   async findAll(query: PaginateQuery) {
     const paginateConfig: PaginateConfig<MenuItemEntity> = {
-      sortableColumns: [
-        'id',
-        'item_group_id',
-        'item_name',
-        'price',
-        'create_at',
-      ],
+      sortableColumns: ['id', 'item_type', 'item_name', 'price', 'create_at'],
       nullSort: 'last',
       defaultSortBy: [['id', 'DESC']],
       searchableColumns: ['item_name'],
@@ -37,6 +31,7 @@ export class MenuItemService {
           FilterOperator.GT,
           FilterOperator.GTE,
         ],
+        item_type: [FilterOperator.EQ]
       },
     };
     return paginate(query, MenuItemEntity.createQueryBuilder(), paginateConfig);