modify payment

backend/src/entities/payment.entity.ts

@@ -7,8 +7,6 @@ import {
   Relation,
 } from 'typeorm';
 import { OrderEntity } from './order.entity.js';
-import { PaymentMethod } from '../common/enums/PaymentMethod.enum.js';
-import { VnpCardType } from '../common/enums/VnpCardType.enum.js';
 
 @Entity('payments')
 export class PaymentEntity extends BaseEntity {
@@ -18,36 +16,33 @@ export class PaymentEntity extends BaseEntity {
   @OneToOne(() => OrderEntity, (a) => a.payment)
   order: Relation<OrderEntity>;
 
-  @Column({ type: 'enum', enum: PaymentMethod, default: 0 })
-  payment_method: PaymentMethod; 
+  @Column({ default: 0 })
+  payment_method: number; 
 
   @Column()
   vnp_amount: number
 
-  @Column()
+  @Column({ nullable: true })
   vnp_bank_code: string
 
-  @Column()
+  @Column({ nullable: true })
   vnp_bank_tran_no:string
   
-  @Column({ type: 'enum', enum: VnpCardType, default: 0})
-  vnp_card_type: VnpCardType 
+  @Column({ default: 0})
+  vnp_card_type: number
 
-  @Column()
-  vnp_order_info: string
+  @Column({ nullable: true })
+  vnp_order_info: string //Nội dung giao dịch
 
-  @Column()
+  @Column({ nullable: true })
   vnp_paydate: string
 
-  @Column()
+  @Column({ nullable: true })
   vnp_response_code: number
 
-  @Column()
+  @Column({ nullable: true })
   vnp_transaction_no: string
 
-  @Column()
+  @Column({ nullable: true })
   vnp_transaction_status: number
-
-  @Column()
-  vnp_securehash: string
 }

backend/src/migrations/{1730648552709-modify_payment.ts → 1730650476355-modify_payment.ts}

@@ -1,36 +1,40 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-export class ModifyPayment1730648552709 implements MigrationInterface {
-    name = 'ModifyPayment1730648552709'
+export class ModifyPayment1730650476355 implements MigrationInterface {
+    name = 'ModifyPayment1730650476355'
 
     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"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_securehash"`);
+        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" ALTER COLUMN "vnp_bank_code" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_bank_tran_no" DROP NOT NULL`);
+        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" ADD "vnp_card_type" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_order_info" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_paydate" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_response_code" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_transaction_no" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_transaction_status" DROP NOT NULL`);
     }
 
     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"`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_transaction_status" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_transaction_no" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_response_code" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_paydate" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_order_info" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_card_type"`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_vnp_card_type_enum" AS ENUM('0', '1', '2')`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_card_type" "public"."payments_vnp_card_type_enum" NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_bank_tran_no" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ALTER COLUMN "vnp_bank_code" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "payment_method"`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_payment_method_enum" AS ENUM('0', '1', '2')`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "payment_method" "public"."payments_payment_method_enum" NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_securehash" character varying NOT NULL`);
     }
 
 }