change enum type

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

@@ -1,5 +1,5 @@
 export enum PaymentMethod {
-  CASH = "CASH",
-  CARD = "CARD",
-  ONLINE_PAYMENT = "ONLINE_PAYMENT",
+  CASH = 0,
+  CARD = 1,
+  ONLINE_PAYMENT = 2,
 }

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

@@ -1,5 +1,5 @@
 export enum VnpCardType {
-	ATM = "ATM",
-	QRCODE = "QRCODE",
-	None = "None"
+    None = 0,
+	ATM = 1,
+	QRCODE = 2
 }

backend/src/entities/payment.entity.ts

@@ -18,8 +18,8 @@ export class PaymentEntity extends BaseEntity {
   @OneToOne(() => OrderEntity, (a) => a.payment)
   order: Relation<OrderEntity>;
 
-  @Column({ type: 'enum', enum: PaymentMethod, default: "CASH" })
-  payment_method: PaymentMethod; // E.g., 'Cash', 'Credit Card', 'Online Payment'
+  @Column({ type: 'enum', enum: PaymentMethod, default: 0 })
+  payment_method: PaymentMethod; 
 
   @Column()
   vnp_amount: number
@@ -30,8 +30,8 @@ export class PaymentEntity extends BaseEntity {
   @Column()
   vnp_bank_tran_no:string
   
-  @Column({ type: 'enum', enum: VnpCardType, default: "None"})
-  vnp_card_type: VnpCardType //  E.g., 'ATM', 'QRCODE', 'None'
+  @Column({ type: 'enum', enum: VnpCardType, default: 0})
+  vnp_card_type: VnpCardType 
 
   @Column()
   vnp_order_info: string

backend/src/migrations/1730647727322-modify_payment_entity.ts

@@ -1,42 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class ModifyPaymentEntity1730647727322 implements MigrationInterface {
-    name = 'ModifyPaymentEntity1730647727322'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "value"`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_amount" integer NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_code" character varying NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_tran_no" character varying NOT NULL`);
-        await queryRunner.query(`CREATE TYPE "public"."payments_vnp_card_type_enum" AS ENUM('ATM', 'QRCODE', 'None')`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_card_type" "public"."payments_vnp_card_type_enum" NOT NULL DEFAULT 'None'`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_order_info" character varying NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_paydate" character varying NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_response_code" integer NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_no" character varying NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_status" integer NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_securehash" character varying NOT NULL`);
-        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'`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        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 "payments" DROP COLUMN "vnp_securehash"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_status"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_no"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_response_code"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_paydate"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_order_info"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_card_type"`);
-        await queryRunner.query(`DROP TYPE "public"."payments_vnp_card_type_enum"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_tran_no"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_code"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_amount"`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "value" integer NOT NULL`);
-    }
-
-}

backend/src/migrations/1730648552709-modify_payment.ts

@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class ModifyPayment1730648552709 implements MigrationInterface {
+    name = 'ModifyPayment1730648552709'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TYPE "public"."payments_payment_method_enum" RENAME TO "payments_payment_method_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_payment_method_enum" AS ENUM('0', '1', '2')`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "payment_method" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "payment_method" TYPE "public"."payments_payment_method_enum" USING "payment_method"::"text"::"public"."payments_payment_method_enum"`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "payment_method" SET DEFAULT '0'`);
+        await queryRunner.query(`DROP TYPE "public"."payments_payment_method_enum_old"`);
+        await queryRunner.query(`ALTER TYPE "public"."payments_vnp_card_type_enum" RENAME TO "payments_vnp_card_type_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_vnp_card_type_enum" AS ENUM('0', '1', '2')`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_card_type" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_card_type" TYPE "public"."payments_vnp_card_type_enum" USING "vnp_card_type"::"text"::"public"."payments_vnp_card_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_card_type" SET DEFAULT '0'`);
+        await queryRunner.query(`DROP TYPE "public"."payments_vnp_card_type_enum_old"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TYPE "public"."payments_vnp_card_type_enum_old" AS ENUM('ATM', 'QRCODE', 'None')`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_card_type" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_card_type" TYPE "public"."payments_vnp_card_type_enum_old" USING "vnp_card_type"::"text"::"public"."payments_vnp_card_type_enum_old"`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_card_type" SET DEFAULT 'None'`);
+        await queryRunner.query(`DROP TYPE "public"."payments_vnp_card_type_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."payments_vnp_card_type_enum_old" RENAME TO "payments_vnp_card_type_enum"`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_payment_method_enum_old" AS ENUM('CASH', 'CARD', 'ONLINE_PAYMENT')`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "payment_method" DROP DEFAULT`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "payment_method" TYPE "public"."payments_payment_method_enum_old" USING "payment_method"::"text"::"public"."payments_payment_method_enum_old"`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "payment_method" SET DEFAULT 'CASH'`);
+        await queryRunner.query(`DROP TYPE "public"."payments_payment_method_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."payments_payment_method_enum_old" RENAME TO "payments_payment_method_enum"`);
+    }
+
+}