From 3b801e74860b22ece5a150a816dfdaec8189e982 Mon Sep 17 00:00:00 2001 From: olivermrbl Date: Mon, 29 Mar 2021 11:45:30 +0200 Subject: [PATCH] fix nullable description --- .../admin/discounts/__tests__/create-discount.js | 3 +++ .../src/migrations/1617002207608-discount_usage.ts | 12 ++++++++++++ packages/medusa/src/models/discount-rule.ts | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/medusa/src/api/routes/admin/discounts/__tests__/create-discount.js b/packages/medusa/src/api/routes/admin/discounts/__tests__/create-discount.js index cde96a2332..18536d7533 100644 --- a/packages/medusa/src/api/routes/admin/discounts/__tests__/create-discount.js +++ b/packages/medusa/src/api/routes/admin/discounts/__tests__/create-discount.js @@ -11,6 +11,7 @@ describe("POST /admin/discounts", () => { payload: { code: "TEST", rule: { + description: "Test", type: "fixed", value: 10, allocation: "total", @@ -33,6 +34,7 @@ describe("POST /admin/discounts", () => { expect(DiscountServiceMock.create).toHaveBeenCalledWith({ code: "TEST", rule: { + description: "Test", type: "fixed", value: 10, allocation: "total", @@ -51,6 +53,7 @@ describe("POST /admin/discounts", () => { payload: { code: "10%OFF", rule: { + description: "Test", value: 10, allocation: "total", }, diff --git a/packages/medusa/src/migrations/1617002207608-discount_usage.ts b/packages/medusa/src/migrations/1617002207608-discount_usage.ts index 4b2176e48d..99d3697963 100644 --- a/packages/medusa/src/migrations/1617002207608-discount_usage.ts +++ b/packages/medusa/src/migrations/1617002207608-discount_usage.ts @@ -14,6 +14,12 @@ export class discountUsage1617002207608 implements MigrationInterface { await queryRunner.query( `ALTER TABLE "discount" ADD "usage_count" integer NOT NULL DEFAULT '0'` ) + await queryRunner.query( + `ALTER TABLE "discount_rule" ALTER COLUMN "description" DROP NOT NULL` + ) + await queryRunner.query( + `COMMENT ON COLUMN "discount_rule"."description" IS NULL` + ) } public async down(queryRunner: QueryRunner): Promise { @@ -25,5 +31,11 @@ export class discountUsage1617002207608 implements MigrationInterface { await queryRunner.query( `ALTER TABLE "discount_rule" ADD "usage_limit" integer` ) + await queryRunner.query( + `COMMENT ON COLUMN "discount_rule"."description" IS NULL` + ) + await queryRunner.query( + `ALTER TABLE "discount_rule" ALTER COLUMN "description" SET NOT NULL` + ) } } diff --git a/packages/medusa/src/models/discount-rule.ts b/packages/medusa/src/models/discount-rule.ts index 397678dd0d..1e86542892 100644 --- a/packages/medusa/src/models/discount-rule.ts +++ b/packages/medusa/src/models/discount-rule.ts @@ -30,7 +30,7 @@ export class DiscountRule { @PrimaryColumn() id: string - @Column() + @Column({ nullable: true }) description: string @Column({