asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(medusa): Hard delete OrderEdits (#2225)

Browse Source
This commit is contained in:
Philip Korsholm
2022-09-19 10:18:21 +02:00
committed by GitHub
parent 3f73170288
commit 5a2ac76762
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integration-tests/api/__tests__/admin/order-edit.js
View File

@@ -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,

2
packages/medusa/src/migrations/1663059812399-order_editing.ts
View File

@@ -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(

4
packages/medusa/src/models/order-edit.ts
View File

@@ -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

2
packages/medusa/src/services/order-edit.ts
View File

@@ -278,7 +278,7 @@ export default class OrderEditService extends TransactionBaseService {
)
}
await orderEditRepo.softRemove(edit)
await orderEditRepo.remove(edit)
})
}
}