Feat(medusa): cancel order edit (#2240)

**What**
- cancel an order edit

Fixes CORE-500
This commit is contained in:
Philip Korsholm authored and GitHub committed 2022-09-27 03:13:15 +00:00
1 parent d138baf460
commit 1807bff029
12 files changed
+393 -16

No files matched your search

@@ -0,0 +1,43 @@
import { IdMap } from "medusa-test-utils"
import { request } from "../../../../../helpers/test-request"
import OrderEditingFeatureFlag from "../../../../../loaders/feature-flags/order-editing"
import { orderEditServiceMock } from "../../../../../services/__mocks__/order-edit"
describe("POST /admin/order-edits/:id/cancel", () => {
describe("cancels an order edit", () => {
const orderEditId = IdMap.getId("testCancelOrderEdit")
let subject
beforeAll(async () => {
subject = await request("POST", `/admin/order-edits/${orderEditId}/cancel`, {
adminSession: {
jwt: {
userId: IdMap.getId("admin_user"),
},
},
flags: [OrderEditingFeatureFlag],
})
})
afterAll(() => {
jest.clearAllMocks()
})
it("calls orderService cancel", () => {
expect(orderEditServiceMock.cancel).toHaveBeenCalledTimes(1)
expect(orderEditServiceMock.cancel).toHaveBeenCalledWith(orderEditId, {loggedInUser: IdMap.getId("admin_user")})
})
it("returns 200", () => {
expect(subject.status).toEqual(200)
})
it("returns cancel result", () => {
expect(subject.body.order_edit).toEqual(expect.objectContaining({
id: orderEditId,
canceled_at: expect.any(String),
status: 'canceled'
}))
})
})
})
@@ -0,0 +1,73 @@
import { Request, Response } from "express"
import { OrderEditService } from "../../../../services"
import { IsOptional, IsString } from "class-validator"
import { EntityManager } from "typeorm"
/**
* @oas [post] /order-edits/{id}/cancel
* operationId: "PostOrderEditsOrderEditCancel"
* summary: "Cancel an OrderEdit"
* description: "Cancels an OrderEdit."
* x-authenticated: true
* parameters:
* - (path) id=* {string} The ID of the OrderEdit.
* x-codeSamples:
* - lang: JavaScript
* label: JS Client
* source: |
* import Medusa from "@medusajs/medusa-js"
* const medusa = new Medusa({ baseUrl: MEDUSA_BACKEND_URL, maxRetries: 3 })
* // must be previously logged in or use api token
* medusa.admin.orderEdit.cancel(orderEditId)
* .then(({ order_edit }) => {
* console.log(order_edit.id)
* })
* - lang: Shell
* label: cURL
* source: |
* curl --location --request POST 'https://medusa-url.com/admin/order-edits/:id/cancel' \
* --header 'Authorization: Bearer {api_token}'
* security:
* - api_token: []
* - cookie_auth: []
* tags:
* - OrderEdit
* responses:
* 200:
* description: OK
* content:
* application/json:
* schema:
* properties:
* order_edit:
* $ref: "#/components/schemas/order_edit"
* "400":
* $ref: "#/components/responses/400_error"
* "401":
* $ref: "#/components/responses/unauthorized"
* "404":
* $ref: "#/components/responses/not_found_error"
* "500":
* $ref: "#/components/responses/500_error"
*/
export default async (req: Request, res: Response) => {
const { id } = req.params
const orderEditService = req.scope.resolve(
"orderEditService"
) as OrderEditService
const manager = req.scope.resolve("manager") as EntityManager
const userId = req.user?.id ?? req.user?.userId
await manager.transaction(async (transactionManager) => {
await orderEditService
.withTransaction(transactionManager)
.cancel(id, { loggedInUser: userId })
})
const orderEdit = await orderEditService.retrieve(id)
return res.json({ order_edit: orderEdit })
}
@@ -11,7 +11,7 @@ import {
* @oas [post] /order-edits
* operationId: "PostOrderEdits"
* summary: "Create an OrderEdit"
* description: "Created a OrderEdit."
* description: "Creates an OrderEdit."
* x-authenticated: true
* x-codeSamples:
* - lang: JavaScript
@@ -46,6 +46,11 @@ export default (app) => {
middlewares.wrap(require("./update-order-edit").default)
)
route.post(
"/:id/cancel",
middlewares.wrap(require("./cancel-order-edit").default)
)
route.delete("/:id", middlewares.wrap(require("./delete-order-edit").default))
route.delete(
@@ -58,6 +58,14 @@ export const orderEditServiceMock = {
declined_at: new Date(),
})
}
if (orderId === IdMap.getId("testCancelOrderEdit")) {
return Promise.resolve({
...orderEdits.testCreatedOrder,
id: orderId,
canceled_at: new Date(),
status: "canceled",
})
}
if (orderId === IdMap.getId("testRequestOrder")) {
return Promise.resolve({
...orderEdits.testCreatedOrder,
@@ -109,6 +117,9 @@ export const orderEditServiceMock = {
requested_by: userId,
})
}),
cancel: jest.fn().mockImplementation(() => {
return Promise.resolve({})
}),
}
const mock = jest.fn().mockImplementation(() => {
@@ -124,6 +124,15 @@ describe("OrderEditService", () => {
status: OrderEditStatus.DECLINED,
}
}
if (query?.where?.id === IdMap.getId("canceled-order-edit")) {
return { ...orderEditWithChanges, status: "canceled" }
}
if (query?.where?.id === IdMap.getId("confirmed-order-edit")) {
return { ...orderEditWithChanges, status: "confirmed" }
}
if (query?.where?.id === IdMap.getId("declined-order-edit")) {
return { ...orderEditWithChanges, status: "declined" }
}
return
},
@@ -289,21 +298,56 @@ describe("OrderEditService", () => {
afterEach(() => {
jest.clearAllMocks()
})
})
it("doesn't emit requested event", () => {
describe("cancel", () => {
it("Cancels an order edit", async () => {
const id = IdMap.getId("order-edit-with-changes")
const userId = IdMap.getId("user-id")
await orderEditService.cancel(id, {loggedInUser: userId})
expect(orderEditRepository.save).toHaveBeenCalledWith({
...orderEditWithChanges,
canceled_by: userId,
canceled_at: expect.any(Date),
})
expect(EventBusServiceMock.emit).toHaveBeenCalledTimes(1)
expect(EventBusServiceMock.emit).toHaveBeenCalledWith(
OrderEditService.Events.CANCELED,
{ id }
)
})
it("Returns early in case of an already canceled order edit", async () => {
const id = IdMap.getId("canceled-order-edit")
const userId = IdMap.getId("user-id")
const result = await orderEditService.cancel(id, userId)
expect(result).toEqual(expect.objectContaining({ status: "canceled" }))
expect(orderEditRepository.save).toHaveBeenCalledTimes(0)
expect(EventBusServiceMock.emit).toHaveBeenCalledTimes(0)
})
it("doesn't call save", async () => {
expect(result).toEqual(
expect.objectContaining({
requested_at: expect.any(Date),
requested_by: userId,
})
)
test.each(["confirmed", "declined"])(
"Fails to cancel an edit with status %s",
async (status) => {
expect.assertions(1)
const id = IdMap.getId(`${status}-order-edit`)
const userId = IdMap.getId("user-id")
expect(orderEditRepository.save).toHaveBeenCalledTimes(0)
})
try {
await orderEditService.cancel(id, userId)
} catch (err) {
expect(err.message).toEqual(
`Cannot cancel order edit with status ${status}`
)
}
}
)
})
})
})
+45 -5
View File
@@ -34,6 +34,7 @@ export default class OrderEditService extends TransactionBaseService {
UPDATED: "order-edit.updated",
DECLINED: "order-edit.declined",
REQUESTED: "order-edit.requested",
CANCELED: "order-edit.canceled",
}
protected transactionManager_: EntityManager | undefined
@@ -363,7 +364,7 @@ export default class OrderEditService extends TransactionBaseService {
orderEditId: string,
context: {
loggedInUser?: string
}
} = {}
): Promise<OrderEdit> {
return await this.atomicPhase_(async (manager) => {
const orderEditRepo = manager.getCustomRepository(
@@ -421,8 +422,8 @@ export default class OrderEditService extends TransactionBaseService {
await Promise.all(
[
taxProviderServiceTs.clearLineItemsTaxLines(clonedItemIds),
clonedItemIds.map((id) => {
return lineItemAdjustmentServiceTx.delete({
clonedItemIds.map(async (id) => {
return await lineItemAdjustmentServiceTx.delete({
item_id: id,
})
}),
@@ -430,9 +431,48 @@ export default class OrderEditService extends TransactionBaseService {
)
await Promise.all(
clonedItemIds.map((id) => {
return lineItemServiceTx.delete(id)
clonedItemIds.map(async (id) => {
return await lineItemServiceTx.delete(id)
})
)
}
async cancel(
orderEditId: string,
context: { loggedInUser?: string } = {}
): Promise<OrderEdit> {
return await this.atomicPhase_(async (manager) => {
const orderEditRepository = manager.getCustomRepository(
this.orderEditRepository_
)
const orderEdit = await this.retrieve(orderEditId)
if (orderEdit.status === OrderEditStatus.CANCELED) {
return orderEdit
}
if (
[OrderEditStatus.CONFIRMED, OrderEditStatus.DECLINED].includes(
orderEdit.status
)
) {
throw new MedusaError(
MedusaError.Types.NOT_ALLOWED,
`Cannot cancel order edit with status ${orderEdit.status}`
)
}
orderEdit.canceled_at = new Date()
orderEdit.canceled_by = context.loggedInUser
const saved = await orderEditRepository.save(orderEdit)
await this.eventBusService_
.withTransaction(manager)
.emit(OrderEditService.Events.CANCELED, { id: orderEditId })
return saved
})
}
}