The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.
TypeScript b2b-marketplacecomposable-commerceecommerceenterpriseheadless-commercemarketplacemedusamedusajsmulti-vendortypescript
fix(offer): subtract reserved stock from store offer availability (#1669)
Ricardo Sat548d5db65204
diff --git a/integration-tests/http/offer/store/store-offers.spec.ts b/integration-tests/http/offer/store/store-offers.spec.tsindex f7fa1e73e..83da53af0 100644--- a/integration-tests/http/offer/store/store-offers.spec.ts+++ b/integration-tests/http/offer/store/store-offers.spec.ts@@ -367,6 +367,59 @@ medusaIntegrationTestRunner({expect(response.data.offers[0].in_stock).toEqual(true)})+ it("subtracts reserved stock from inventory_quantity", async () => {+ const seed = await seedSellerOffer({+ email: "[email protected]",+ name: "Reserved",+ stocked: 100,+ offerPrice: 12000,+ required_quantity: 12,+ })++ const inventoryService = appContainer.resolve(Modules.INVENTORY)+ const inventoryItemId = seed.offer.inventory_items[0].id+ const [level] = await inventoryService.listInventoryLevels({+ inventory_item_id: inventoryItemId,+ })+ await inventoryService.createReservationItems([+ {+ inventory_item_id: inventoryItemId,+ location_id: level.location_id,+ quantity: 24,+ },+ ])++ const list = await api.get(+ `/store/offers?product_id=${seed.productId}&fields=+inventory_quantity`,+ storeHeaders+ )+ expect(list.data.offers[0].inventory_quantity).toEqual(6)++ const single = await api.get(+ `/store/offers/${seed.offer.id}?fields=+inventory_quantity`,+ storeHeaders+ )+ expect(single.data.offer.inventory_quantity).toEqual(6)+ })++ it("computes inventory_quantity when the requested fields omit the inventory link", async () => {+ const seed = await seedSellerOffer({+ email: "[email protected]",+ name: "Narrow",+ stocked: 100,+ offerPrice: 12000,+ required_quantity: 12,+ })++ const response = await api.get(+ `/store/offers/${seed.offer.id}?fields=id,inventory_quantity`,+ storeHeaders+ )++ expect(response.status).toEqual(200)+ expect(response.data.offer.inventory_quantity).toEqual(8)+ })+it("reports zero stock for an offer whose location is not linked to the sales channel", async () => {const seed = await seedSellerOffer({email: "[email protected]",diff --git a/packages/core/src/api/store/offers/helpers.ts b/packages/core/src/api/store/offers/helpers.tsindex 27297f889..590ec07d9 100644--- a/packages/core/src/api/store/offers/helpers.ts+++ b/packages/core/src/api/store/offers/helpers.ts@@ -22,6 +22,7 @@ import {type OfferLocationLevel = {location_id: stringstocked_quantity: number+ reserved_quantity?: number | null}type OfferInventoryLink = {@@ -267,11 +268,19 @@ export const wrapOffersWithInventoryQuantityForSalesChannel = async (for (const link of links) {const requiredQuantity = link.required_quantity ?? 1const levels = link.inventory_item?.location_levels ?? []- const stocked = levels+ const available = levels.filter((level) => channelLocationIds.has(level.location_id))- .reduce((sum, level) => sum + (level.stocked_quantity ?? 0), 0)+ .reduce(+ (sum, level) =>+ sum ++ Math.max(+ 0,+ (level.stocked_quantity ?? 0) - (level.reserved_quantity ?? 0)+ ),+ 0+ )const itemAvailability =- requiredQuantity > 0 ? Math.floor(stocked / requiredQuantity) : 0+ requiredQuantity > 0 ? Math.floor(available / requiredQuantity) : 0offerAvailability = Math.min(offerAvailability, itemAvailability)}@@ -281,6 +290,13 @@ export const wrapOffersWithInventoryQuantityForSalesChannel = async (}}+const inventoryQuantityFields = [+ "inventory_item_link.required_quantity",+ "inventory_item_link.inventory_item.location_levels.location_id",+ "inventory_item_link.inventory_item.location_levels.stocked_quantity",+ "inventory_item_link.inventory_item.location_levels.reserved_quantity",+]+export const splitComputedOfferFields = (fields: string[]) => {const withCalculatedPrice = fields.some((f) => f === "calculated_price" || f.startsWith("calculated_price.")@@ -306,10 +322,17 @@ export const splitComputedOfferFields = (fields: string[]) => {}}+ const needsInventory = withInventoryQuantity || withInStock+ // Availability is derived from these columns, so they are read whenever it is+ // requested, even if the client's field list leaves them out.+ const queryFields = needsInventory+ ? Array.from(new Set([...filteredFields, ...inventoryQuantityFields]))+ : filteredFields+return {- fields: filteredFields,+ fields: queryFields,withCalculatedPrice,- withInventoryQuantity: withInventoryQuantity || withInStock,+ withInventoryQuantity: needsInventory,withEffectiveLeadtime,}}diff --git a/packages/core/src/api/store/offers/query-config.ts b/packages/core/src/api/store/offers/query-config.tsindex 23d465685..050254001 100644--- a/packages/core/src/api/store/offers/query-config.ts+++ b/packages/core/src/api/store/offers/query-config.ts@@ -38,6 +38,7 @@ export const defaultStoreOfferFields = ["inventory_item_link.inventory_item.location_levels.id","inventory_item_link.inventory_item.location_levels.location_id","inventory_item_link.inventory_item.location_levels.stocked_quantity",+ "inventory_item_link.inventory_item.location_levels.reserved_quantity",]export const storeOfferQueryConfig = {