From 5a2ac767625bc1ec3c29de751971e128b8f0473e Mon Sep 17 00:00:00 2001 From: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> Date: Mon, 19 Sep 2022 10:18:21 +0200 Subject: [PATCH] feat(medusa): Hard delete OrderEdits (#2225) --- integration-tests/api/__tests__/admin/order-edit.js | 8 +++++++- .../medusa/src/migrations/1663059812399-order_editing.ts | 2 +- packages/medusa/src/models/order-edit.ts | 4 ++-- packages/medusa/src/services/order-edit.ts | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/integration-tests/api/__tests__/admin/order-edit.js b/integration-tests/api/__tests__/admin/order-edit.js index 7b140278b3..0b02d8a26c 100644 --- a/integration-tests/api/__tests__/admin/order-edit.js +++ b/integration-tests/api/__tests__/admin/order-edit.js @@ -17,7 +17,7 @@ const { simpleProductFactory, simpleOrderFactory, } = require("../../factories") -const { OrderEditItemChangeType } = require("@medusajs/medusa") +const { OrderEditItemChangeType, OrderEdit } = require("@medusajs/medusa") jest.setTimeout(30000) @@ -212,6 +212,12 @@ describe("[MEDUSA_FF_ORDER_EDITING] /admin/order-edits", () => { adminHeaders ) + const orderEdit = await dbConnection.manager.findOne(OrderEdit, { + where: { id }, + withDeleted: true, + }) + + expect(orderEdit).toBeUndefined() expect(response.status).toEqual(200) expect(response.data).toEqual({ id, diff --git a/packages/medusa/src/migrations/1663059812399-order_editing.ts b/packages/medusa/src/migrations/1663059812399-order_editing.ts index a5dfbbcc9f..46ee7e5da4 100644 --- a/packages/medusa/src/migrations/1663059812399-order_editing.ts +++ b/packages/medusa/src/migrations/1663059812399-order_editing.ts @@ -15,7 +15,7 @@ export class orderEditing1663059812399 implements MigrationInterface { `CREATE TABLE "order_item_change" ("id" character varying NOT NULL, "created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updated_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deleted_at" TIMESTAMP WITH TIME ZONE, "type" "order_item_change_type_enum" NOT NULL, "order_edit_id" character varying NOT NULL, "original_line_item_id" character varying, "line_item_id" character varying, CONSTRAINT "UQ_da93cee3ca0dd50a5246268c2e9" UNIQUE ("order_edit_id", "line_item_id"), CONSTRAINT "UQ_5b7a99181e4db2ea821be0b6196" UNIQUE ("order_edit_id", "original_line_item_id"), CONSTRAINT "REL_5f9688929761f7df108b630e64" UNIQUE ("line_item_id"), CONSTRAINT "PK_d6eb138f77ffdee83567b85af0c" PRIMARY KEY ("id"))` ) await queryRunner.query( - `CREATE TABLE "order_edit" ("id" character varying NOT NULL, "created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updated_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deleted_at" TIMESTAMP WITH TIME ZONE, "order_id" character varying NOT NULL, "internal_note" character varying, "created_by" character varying NOT NULL, "requested_by" character varying, "requested_at" TIMESTAMP WITH TIME ZONE, "confirmed_by" character varying, "confirmed_at" TIMESTAMP WITH TIME ZONE, "declined_by" character varying, "declined_reason" character varying, "declined_at" TIMESTAMP WITH TIME ZONE, "canceled_by" character varying, "canceled_at" TIMESTAMP WITH TIME ZONE, CONSTRAINT "PK_58ab6acf2e84b4e827f5f846f7a" PRIMARY KEY ("id"))` + `CREATE TABLE "order_edit" ("id" character varying NOT NULL, "created_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updated_at" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "order_id" character varying NOT NULL, "internal_note" character varying, "created_by" character varying NOT NULL, "requested_by" character varying, "requested_at" TIMESTAMP WITH TIME ZONE, "confirmed_by" character varying, "confirmed_at" TIMESTAMP WITH TIME ZONE, "declined_by" character varying, "declined_reason" character varying, "declined_at" TIMESTAMP WITH TIME ZONE, "canceled_by" character varying, "canceled_at" TIMESTAMP WITH TIME ZONE, CONSTRAINT "PK_58ab6acf2e84b4e827f5f846f7a" PRIMARY KEY ("id"))` ) await queryRunner.query( diff --git a/packages/medusa/src/models/order-edit.ts b/packages/medusa/src/models/order-edit.ts index 30aad3c544..0fa130d8a1 100644 --- a/packages/medusa/src/models/order-edit.ts +++ b/packages/medusa/src/models/order-edit.ts @@ -12,7 +12,7 @@ import OrderEditingFeatureFlag from "../loaders/feature-flags/order-editing" import { FeatureFlagEntity } from "../utils/feature-flag-decorators" import { resolveDbType } from "../utils/db-aware-column" import { OrderItemChange } from "./order-item-change" -import { SoftDeletableEntity } from "../interfaces" +import { BaseEntity } from "../interfaces" import { generateEntityId } from "../utils" import { LineItem } from "./line-item" import { Order } from "./order" @@ -26,7 +26,7 @@ export enum OrderEditStatus { } @FeatureFlagEntity(OrderEditingFeatureFlag.key) -export class OrderEdit extends SoftDeletableEntity { +export class OrderEdit extends BaseEntity { @Column() order_id: string diff --git a/packages/medusa/src/services/order-edit.ts b/packages/medusa/src/services/order-edit.ts index 398d238915..c92fb12d45 100644 --- a/packages/medusa/src/services/order-edit.ts +++ b/packages/medusa/src/services/order-edit.ts @@ -278,7 +278,7 @@ export default class OrderEditService extends TransactionBaseService { ) } - await orderEditRepo.softRemove(edit) + await orderEditRepo.remove(edit) }) } }