fix(orchestration): remote joiner alias conflict (#8844)
This commit is contained in:
committed by
GitHub
parent
68f3244de3
commit
6cfe9bd874
@@ -11,7 +11,7 @@ export const addOrderTransactionStep = createStep(
|
||||
async (data: CreateOrderTransactionDTO, { container }) => {
|
||||
const service = container.resolve(ModuleRegistrationName.ORDER)
|
||||
|
||||
const created = await service.addTransactions(data)
|
||||
const created = await service.addOrderTransactions(data)
|
||||
|
||||
return new StepResponse(created, created.id)
|
||||
},
|
||||
@@ -22,6 +22,6 @@ export const addOrderTransactionStep = createStep(
|
||||
|
||||
const service = container.resolve(ModuleRegistrationName.ORDER)
|
||||
|
||||
await service.deleteTransactions(id)
|
||||
await service.deleteOrderTransactions(id)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -16,7 +16,7 @@ export const createOrderLineItemsStep = createStep(
|
||||
const orderModule = container.resolve(ModuleRegistrationName.ORDER)
|
||||
|
||||
const createdItems = input.items.length
|
||||
? await orderModule.createLineItems(input.items)
|
||||
? await orderModule.createOrderLineItems(input.items)
|
||||
: []
|
||||
|
||||
return new StepResponse(
|
||||
@@ -31,6 +31,6 @@ export const createOrderLineItemsStep = createStep(
|
||||
|
||||
const orderModule = container.resolve(ModuleRegistrationName.ORDER)
|
||||
|
||||
await orderModule.deleteLineItems(itemIds)
|
||||
await orderModule.deleteOrderLineItems(itemIds)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -3,7 +3,7 @@ import {
|
||||
IOrderModuleService,
|
||||
} from "@medusajs/types"
|
||||
import { ModuleRegistrationName } from "@medusajs/utils"
|
||||
import { createStep, StepResponse } from "@medusajs/workflows-sdk"
|
||||
import { StepResponse, createStep } from "@medusajs/workflows-sdk"
|
||||
|
||||
export interface CreateOrderShippingMethodsStepInput {
|
||||
shipping_methods: CreateOrderShippingMethodDTO[]
|
||||
@@ -19,7 +19,9 @@ export const createOrderShippingMethods = createStep(
|
||||
ModuleRegistrationName.ORDER
|
||||
)
|
||||
|
||||
const created = await service.createShippingMethods(input.shipping_methods)
|
||||
const created = await service.createOrderShippingMethods(
|
||||
input.shipping_methods
|
||||
)
|
||||
|
||||
return new StepResponse(
|
||||
created,
|
||||
@@ -35,6 +37,6 @@ export const createOrderShippingMethods = createStep(
|
||||
ModuleRegistrationName.ORDER
|
||||
)
|
||||
|
||||
await service.deleteShippingMethods(createdMethodIds)
|
||||
await service.deleteOrderShippingMethods(createdMethodIds)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -16,7 +16,7 @@ export const deleteOrderLineItems = createStep(
|
||||
ModuleRegistrationName.ORDER
|
||||
)
|
||||
|
||||
const deleted = await service.softDeleteLineItems(input.ids)
|
||||
const deleted = await service.softDeleteOrderLineItems(input.ids)
|
||||
|
||||
return new StepResponse(deleted, input.ids)
|
||||
},
|
||||
@@ -29,6 +29,6 @@ export const deleteOrderLineItems = createStep(
|
||||
ModuleRegistrationName.ORDER
|
||||
)
|
||||
|
||||
await service.restoreLineItems(ids)
|
||||
await service.restoreOrderLineItems(ids)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -6,7 +6,6 @@ export interface DeleteOrderShippingMethodsStepInput {
|
||||
ids: string[]
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This step deletes order shipping methods.
|
||||
*/
|
||||
@@ -17,7 +16,7 @@ export const deleteOrderShippingMethods = createStep(
|
||||
ModuleRegistrationName.ORDER
|
||||
)
|
||||
|
||||
const deleted = await service.softDeleteShippingMethods(input.ids)
|
||||
const deleted = await service.softDeleteOrderShippingMethods(input.ids)
|
||||
|
||||
return new StepResponse(deleted, input.ids)
|
||||
},
|
||||
@@ -30,6 +29,6 @@ export const deleteOrderShippingMethods = createStep(
|
||||
ModuleRegistrationName.ORDER
|
||||
)
|
||||
|
||||
await service.restoreShippingMethods(ids)
|
||||
await service.restoreOrderShippingMethods(ids)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -28,23 +28,25 @@ export const setOrderTaxLinesForItemsStep = createStep(
|
||||
)
|
||||
|
||||
const getShippingTaxLinesPromise =
|
||||
await orderService.listShippingMethodTaxLines({
|
||||
await orderService.listOrderShippingMethodTaxLines({
|
||||
shipping_method_id: shipping_tax_lines.map((t) => t.shipping_line_id),
|
||||
})
|
||||
|
||||
const getItemTaxLinesPromise = await orderService.listLineItemTaxLines({
|
||||
item_id: item_tax_lines.map((t) => t.line_item_id),
|
||||
})
|
||||
const getItemTaxLinesPromise = await orderService.listOrderLineItemTaxLines(
|
||||
{
|
||||
item_id: item_tax_lines.map((t) => t.line_item_id),
|
||||
}
|
||||
)
|
||||
|
||||
const itemsTaxLinesData = normalizeItemTaxLinesForOrder(item_tax_lines)
|
||||
const setItemTaxLinesPromise = itemsTaxLinesData.length
|
||||
? orderService.setLineItemTaxLines(order.id, itemsTaxLinesData)
|
||||
? orderService.setOrderLineItemTaxLines(order.id, itemsTaxLinesData)
|
||||
: void 0
|
||||
|
||||
const shippingTaxLinesData =
|
||||
normalizeShippingTaxLinesForOrder(shipping_tax_lines)
|
||||
const setShippingTaxLinesPromise = shippingTaxLinesData.length
|
||||
? await orderService.setShippingMethodTaxLines(
|
||||
? await orderService.setOrderShippingMethodTaxLines(
|
||||
order.id,
|
||||
shippingTaxLinesData
|
||||
)
|
||||
@@ -77,7 +79,7 @@ export const setOrderTaxLinesForItemsStep = createStep(
|
||||
)
|
||||
|
||||
if (existingLineItemTaxLines) {
|
||||
await orderService.setLineItemTaxLines(
|
||||
await orderService.setOrderLineItemTaxLines(
|
||||
order.id,
|
||||
existingLineItemTaxLines.map((taxLine) => ({
|
||||
description: taxLine.description,
|
||||
@@ -90,7 +92,7 @@ export const setOrderTaxLinesForItemsStep = createStep(
|
||||
)
|
||||
}
|
||||
|
||||
await orderService.setShippingMethodTaxLines(
|
||||
await orderService.setOrderShippingMethodTaxLines(
|
||||
order.id,
|
||||
existingShippingMethodTaxLines.map((taxLine) => ({
|
||||
description: taxLine.description,
|
||||
|
||||
@@ -22,12 +22,12 @@ export const updateOrderShippingMethodsStep = createStep(
|
||||
const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, {
|
||||
objectFields: ["metadata"],
|
||||
})
|
||||
const dataBeforeUpdate = await service.listShippingMethods(
|
||||
const dataBeforeUpdate = await service.listOrderShippingMethods(
|
||||
{ id: data.map((d) => d.id) },
|
||||
{ relations, select: selects }
|
||||
)
|
||||
|
||||
const updated = await service.updateShippingMethods(data)
|
||||
const updated = await service.updateOrderShippingMethods(data)
|
||||
|
||||
return new StepResponse(updated, dataBeforeUpdate)
|
||||
},
|
||||
@@ -40,6 +40,6 @@ export const updateOrderShippingMethodsStep = createStep(
|
||||
ModuleRegistrationName.ORDER
|
||||
)
|
||||
|
||||
await service.updateShippingMethods(dataBeforeUpdate)
|
||||
await service.updateOrderShippingMethods(dataBeforeUpdate)
|
||||
}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user