chore(): Improve cart update line items (#11666)
**What** Currently, we are potentially providing an array of selector/data leading to fetching data sequentially before running on update which will fetch data again in batch and perform the update. Now we can pass the data directly which includes the id already and only perform one bulk fetch + one bulk update. This pr also include a fix on the inventory validation, currently, only the item to update inventory is being checked, with this pr we also check the inventory for the items that needs to be created
This commit is contained in:
1 parent
39597b6b52
commit
d1efad9bf0
10 files changed
+151
-23
No files matched your search
@@ -0,0 +1,7 @@
|
||||
---
|
||||
"@medusajs/cart": patch
|
||||
"@medusajs/core-flows": patch
|
||||
"@medusajs/types": patch
|
||||
---
|
||||
|
||||
chore(): Improve cart update line items
|
||||
@@ -2,6 +2,7 @@ import {
|
||||
CartLineItemDTO,
|
||||
CreateLineItemForCartDTO,
|
||||
ICartModuleService,
|
||||
UpdateLineItemWithoutSelectorDTO,
|
||||
UpdateLineItemWithSelectorDTO,
|
||||
} from "@medusajs/framework/types"
|
||||
import {
|
||||
@@ -34,7 +35,9 @@ export interface GetLineItemActionsStepOutput {
|
||||
/**
|
||||
* The line items to update.
|
||||
*/
|
||||
itemsToUpdate: UpdateLineItemWithSelectorDTO[]
|
||||
itemsToUpdate:
|
||||
| UpdateLineItemWithSelectorDTO[]
|
||||
| UpdateLineItemWithoutSelectorDTO[]
|
||||
}
|
||||
|
||||
export const getLineItemActionsStepId = "get-line-item-actions-step"
|
||||
@@ -63,17 +66,29 @@ export const getLineItemActionsStep = createStep(
|
||||
const cartModule = container.resolve<ICartModuleService>(Modules.CART)
|
||||
|
||||
const variantIds = data.items.map((d) => d.variant_id!)
|
||||
const existingVariantItems = await cartModule.listLineItems({
|
||||
const existingVariantItems = await cartModule.listLineItems(
|
||||
{
|
||||
cart_id: data.id,
|
||||
variant_id: variantIds,
|
||||
})
|
||||
},
|
||||
{
|
||||
select: [
|
||||
"id",
|
||||
"metadata",
|
||||
"variant_id",
|
||||
"quantity",
|
||||
"unit_price",
|
||||
"compare_at_unit_price",
|
||||
],
|
||||
}
|
||||
)
|
||||
|
||||
const variantItemMap = new Map<string, CartLineItemDTO>(
|
||||
existingVariantItems.map((item) => [item.variant_id!, item])
|
||||
)
|
||||
|
||||
const itemsToCreate: CreateLineItemForCartDTO[] = []
|
||||
const itemsToUpdate: UpdateLineItemWithSelectorDTO[] = []
|
||||
const itemsToUpdate: UpdateLineItemWithSelectorDTO["data"][] = []
|
||||
|
||||
for (const item of data.items) {
|
||||
const existingItem = variantItemMap.get(item.variant_id!)
|
||||
@@ -88,15 +103,12 @@ export const getLineItemActionsStep = createStep(
|
||||
)
|
||||
|
||||
itemsToUpdate.push({
|
||||
selector: { id: existingItem.id },
|
||||
data: {
|
||||
id: existingItem.id,
|
||||
quantity: quantity,
|
||||
variant_id: item.variant_id!,
|
||||
unit_price: item.unit_price ?? existingItem.unit_price,
|
||||
compare_at_unit_price:
|
||||
item.compare_at_unit_price ?? existingItem.compare_at_unit_price,
|
||||
},
|
||||
})
|
||||
} else {
|
||||
itemsToCreate.push(item)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import {
|
||||
ICartModuleService,
|
||||
UpdateLineItemWithoutSelectorDTO,
|
||||
UpdateLineItemWithSelectorDTO,
|
||||
} from "@medusajs/framework/types"
|
||||
import {
|
||||
@@ -19,7 +20,7 @@ export interface UpdateLineItemsStepInput {
|
||||
/**
|
||||
* The line items to update.
|
||||
*/
|
||||
items: UpdateLineItemWithSelectorDTO[]
|
||||
items: (UpdateLineItemWithSelectorDTO | UpdateLineItemWithoutSelectorDTO)[]
|
||||
}
|
||||
|
||||
export const updateLineItemsStepId = "update-line-items-step"
|
||||
@@ -53,16 +54,18 @@ export const updateLineItemsStep = createStep(
|
||||
const cartModule = container.resolve<ICartModuleService>(Modules.CART)
|
||||
|
||||
const { selects, relations } = getSelectsAndRelationsFromObjectArray(
|
||||
items.map((item) => item.data)
|
||||
items.map((item) => ("data" in item ? item.data : item))
|
||||
)
|
||||
|
||||
const itemsBeforeUpdate = await cartModule.listLineItems(
|
||||
{ id: items.map((d) => d.selector.id!) },
|
||||
{ id: items.map((d) => ("selector" in d ? d.selector.id! : d.id!)) },
|
||||
{ select: selects, relations }
|
||||
)
|
||||
|
||||
const updatedItems = items.length
|
||||
? await cartModule.updateLineItems(items)
|
||||
? await cartModule.updateLineItems(
|
||||
items as UpdateLineItemWithoutSelectorDTO[]
|
||||
)
|
||||
: []
|
||||
|
||||
return new StepResponse(updatedItems, itemsBeforeUpdate)
|
||||
|
||||
@@ -51,11 +51,13 @@ export const prepareConfirmInventoryInput = (data: {
|
||||
const salesChannelId = data.input.sales_channel_id
|
||||
|
||||
for (const updateItem of data.input.itemsToUpdate ?? []) {
|
||||
const updateItem_ = "data" in updateItem ? updateItem.data : updateItem
|
||||
|
||||
const item = data.input.items.find(
|
||||
(item) => item.variant_id === updateItem.data.variant_id
|
||||
(item) => item.variant_id === updateItem_.variant_id
|
||||
)
|
||||
if (item && updateItem.data.quantity) {
|
||||
item.quantity = updateItem.data.quantity!
|
||||
if (item && updateItem_.quantity) {
|
||||
item.quantity = updateItem_.quantity!
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
import { AddToCartWorkflowInputDTO } from "@medusajs/framework/types"
|
||||
import {
|
||||
AddToCartWorkflowInputDTO,
|
||||
ConfirmVariantInventoryWorkflowInputDTO,
|
||||
} from "@medusajs/framework/types"
|
||||
import { CartWorkflowEvents, isDefined } from "@medusajs/framework/utils"
|
||||
import {
|
||||
createHook,
|
||||
@@ -141,12 +144,32 @@ export const addToCartWorkflow = createWorkflow(
|
||||
items: lineItems,
|
||||
})
|
||||
|
||||
const itemsToConfirmInventory = transform(
|
||||
{ itemsToUpdate, itemsToCreate },
|
||||
(data) => {
|
||||
return (data.itemsToUpdate as [])
|
||||
.concat(data.itemsToCreate as [])
|
||||
.filter(
|
||||
(
|
||||
item:
|
||||
| {
|
||||
data: { variant_id: string }
|
||||
}
|
||||
| { variant_id?: string }
|
||||
) =>
|
||||
isDefined(
|
||||
"data" in item ? item.data?.variant_id : item.variant_id
|
||||
)
|
||||
) as unknown as ConfirmVariantInventoryWorkflowInputDTO["itemsToUpdate"]
|
||||
}
|
||||
)
|
||||
|
||||
confirmVariantInventoryWorkflow.runAsStep({
|
||||
input: {
|
||||
sales_channel_id: cart.sales_channel_id,
|
||||
variants,
|
||||
items: input.items,
|
||||
itemsToUpdate,
|
||||
itemsToUpdate: itemsToConfirmInventory,
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
@@ -618,6 +618,11 @@ export interface UpdateLineItemWithSelectorDTO {
|
||||
data: Partial<UpdateLineItemDTO>
|
||||
}
|
||||
|
||||
export interface UpdateLineItemWithoutSelectorDTO
|
||||
extends Omit<Partial<UpdateLineItemDTO>, "id"> {
|
||||
id: string
|
||||
}
|
||||
|
||||
/**
|
||||
* A pair of selectors and data, where the selectors determine which
|
||||
* carts to update, and the data determines what to update
|
||||
|
||||
@@ -36,6 +36,7 @@ import {
|
||||
UpdateCartDTO,
|
||||
UpdateLineItemDTO,
|
||||
UpdateLineItemTaxLineDTO,
|
||||
UpdateLineItemWithoutSelectorDTO,
|
||||
UpdateLineItemWithSelectorDTO,
|
||||
UpdateShippingMethodAdjustmentDTO,
|
||||
UpdateShippingMethodDTO,
|
||||
@@ -647,6 +648,25 @@ export interface ICartModuleService extends IModuleService {
|
||||
data: UpdateLineItemWithSelectorDTO[]
|
||||
): Promise<CartLineItemDTO[]>
|
||||
|
||||
/**
|
||||
* This method updates existing line items.
|
||||
*
|
||||
* @param {UpdateLineItemWithoutSelectorDTO[]} data - A list of objects, each holding the data
|
||||
* and id to update.
|
||||
* @returns {Promise<CartLineItemDTO[]>} The updated line items.
|
||||
*
|
||||
* @example
|
||||
* const lineItems = await cartModuleService.updateLineItems([
|
||||
* {
|
||||
* id: "cali_123",
|
||||
* quantity: 2,
|
||||
* },
|
||||
* ])
|
||||
*/
|
||||
updateLineItems(
|
||||
data: UpdateLineItemWithoutSelectorDTO[]
|
||||
): Promise<CartLineItemDTO[]>
|
||||
|
||||
/**
|
||||
* This method updates existing line items matching the specified filters.
|
||||
*
|
||||
|
||||
@@ -493,7 +493,8 @@ export interface ConfirmVariantInventoryWorkflowInputDTO {
|
||||
* The new quantity of the variant to be added to the cart.
|
||||
* This is useful when updating a variant's quantity in the cart.
|
||||
*/
|
||||
itemsToUpdate?: {
|
||||
itemsToUpdate?:
|
||||
| {
|
||||
/**
|
||||
* The item update's details.
|
||||
*/
|
||||
@@ -508,6 +509,16 @@ export interface ConfirmVariantInventoryWorkflowInputDTO {
|
||||
quantity?: BigNumberInput
|
||||
}
|
||||
}[]
|
||||
| {
|
||||
/**
|
||||
* The ID of the associated variant.
|
||||
*/
|
||||
variant_id?: string
|
||||
/**
|
||||
* The variant's quantity.
|
||||
*/
|
||||
quantity?: BigNumberInput
|
||||
}[]
|
||||
}
|
||||
|
||||
export interface CartWorkflowDTO {
|
||||
|
||||
@@ -676,6 +676,34 @@ moduleIntegrationTestRunner<ICartModuleService>({
|
||||
expect(updatedItem.title).toBe("test2")
|
||||
})
|
||||
|
||||
it("should update a line item in cart succesfully with data only approach", async () => {
|
||||
const [createdCart] = await service.createCarts([
|
||||
{
|
||||
currency_code: "eur",
|
||||
},
|
||||
])
|
||||
|
||||
const [item] = await service.addLineItems(createdCart.id, [
|
||||
{
|
||||
quantity: 1,
|
||||
unit_price: 100,
|
||||
title: "test",
|
||||
tax_lines: [],
|
||||
},
|
||||
])
|
||||
|
||||
expect(item.title).toBe("test")
|
||||
|
||||
const [updatedItem] = await service.updateLineItems([
|
||||
{
|
||||
id: item.id,
|
||||
title: "test2",
|
||||
},
|
||||
])
|
||||
|
||||
expect(updatedItem.title).toBe("test2")
|
||||
})
|
||||
|
||||
it("should update a line item in cart succesfully with id approach", async () => {
|
||||
const [createdCart] = await service.createCarts([
|
||||
{
|
||||
|
||||
@@ -489,6 +489,12 @@ export default class CartModuleService
|
||||
updateLineItems(
|
||||
data: CartTypes.UpdateLineItemWithSelectorDTO[]
|
||||
): Promise<CartTypes.CartLineItemDTO[]>
|
||||
|
||||
// @ts-ignore
|
||||
updateLineItems(
|
||||
data: (Partial<CartTypes.UpdateLineItemDTO> & { id: string })[]
|
||||
): Promise<CartTypes.CartLineItemDTO[]>
|
||||
|
||||
// @ts-expect-error
|
||||
updateLineItems(
|
||||
selector: Partial<CartTypes.CartLineItemDTO>,
|
||||
@@ -508,7 +514,8 @@ export default class CartModuleService
|
||||
lineItemIdOrDataOrSelector:
|
||||
| string
|
||||
| CartTypes.UpdateLineItemWithSelectorDTO[]
|
||||
| Partial<CartTypes.CartLineItemDTO>,
|
||||
| Partial<CartTypes.CartLineItemDTO>
|
||||
| (Partial<CartTypes.UpdateLineItemDTO> & { id: string })[],
|
||||
data?: CartTypes.UpdateLineItemDTO | Partial<CartTypes.UpdateLineItemDTO>,
|
||||
@MedusaContext() sharedContext: Context = {}
|
||||
): Promise<CartTypes.CartLineItemDTO[] | CartTypes.CartLineItemDTO> {
|
||||
@@ -521,10 +528,17 @@ export default class CartModuleService
|
||||
)
|
||||
|
||||
return await this.baseRepository_.serialize<CartTypes.CartLineItemDTO>(
|
||||
item,
|
||||
{
|
||||
populate: true,
|
||||
}
|
||||
item
|
||||
)
|
||||
} else if (Array.isArray(lineItemIdOrDataOrSelector) && !data) {
|
||||
// We received an array of data including the ids
|
||||
const items = await this.lineItemService_.update(
|
||||
lineItemIdOrDataOrSelector,
|
||||
sharedContext
|
||||
)
|
||||
|
||||
return await this.baseRepository_.serialize<CartTypes.CartLineItemDTO[]>(
|
||||
items
|
||||
)
|
||||
}
|
||||
|
||||
@@ -537,7 +551,10 @@ export default class CartModuleService
|
||||
} as CartTypes.UpdateLineItemWithSelectorDTO,
|
||||
]
|
||||
|
||||
items = await this.updateLineItemsWithSelector_(toUpdate, sharedContext)
|
||||
items = await this.updateLineItemsWithSelector_(
|
||||
toUpdate as CartTypes.UpdateLineItemWithSelectorDTO[],
|
||||
sharedContext
|
||||
)
|
||||
|
||||
return await this.baseRepository_.serialize<CartTypes.CartLineItemDTO[]>(
|
||||
items,
|
||||
|
||||
Reference in new issue
Block a user