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
feat(core): cascade product delete to seller offers (#1583)
Viktor Holikdb0385c04d85
diff --git a/integration-tests/http/product/admin/product-delete.spec.ts b/integration-tests/http/product/admin/product-delete.spec.tsnew file mode 100644index 000000000..4204ed39d--- /dev/null+++ b/integration-tests/http/product/admin/product-delete.spec.ts@@ -0,0 +1,206 @@+import { medusaIntegrationTestRunner } from "@medusajs/test-utils"+import { MedusaContainer } from "@medusajs/framework/types"+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"+import {+ MercurModules,+ ProductChangeActionType,+ ProductChangeStatus,+} from "@mercurjs/types"++import { createSellerUser } from "../../../helpers/create-seller-user"+import { createVendorProduct } from "../../../helpers/create-product"+import { createShippingProfile } from "../../../helpers/create-shipping-profile"+import {+ adminHeaders,+ createAdminUser,+} from "../../../helpers/create-admin-user"++jest.setTimeout(60000)++type Headers = { headers: Record<string, string> }++type OfferRow = { id: string; deleted_at: Date | null }++type OfferService = {+ listOffers: (+ filters: Record<string, unknown>,+ config: Record<string, unknown>+ ) => Promise<OfferRow[]>+}++medusaIntegrationTestRunner({+ testSuite: ({ getContainer, api, dbConnection }) => {+ describe("Product delete cascades to offers", () => {+ let container: MedusaContainer+ let sellerHeaders: Headers+ let otherSellerHeaders: Headers++ beforeAll(async () => {+ container = getContainer()+ })++ beforeEach(async () => {+ await createAdminUser(dbConnection, adminHeaders, container)++ const a = await createSellerUser(container, {+ email: "[email protected]",+ name: "Delete Cascade Seller",+ })+ sellerHeaders = a.headers++ const b = await createSellerUser(container, {+ email: "[email protected]",+ name: "Delete Cascade Seller Two",+ })+ otherSellerHeaders = b.headers+ })++ const createOffer = async (+ headers: Headers,+ variantId: string,+ sku: string+ ) => {+ const shippingProfile = await createShippingProfile(container, {+ name: `Standard ${sku}`,+ })+ const res = await api.post(+ `/vendor/offers`,+ {+ sku,+ variant_id: variantId,+ shipping_profile_id: shippingProfile.id,+ inventory_items: [{}],+ prices: [{ amount: 1000, currency_code: "usd" }],+ },+ headers+ )+ return res.data.offer.id as string+ }++ const listOffersWithDeleted = (productId: string) =>+ container+ .resolve<OfferService>(MercurModules.OFFER)+ .listOffers({ product_id: productId }, { withDeleted: true })++ it("admin DELETE soft-deletes the product and every offer on it", async () => {+ const product = await createVendorProduct(api, sellerHeaders, {+ title: `Cascade Admin ${Date.now()}`,+ variants: [{ title: "Default" }],+ })+ const variantId = product.variants[0].id++ const offerIds = [+ await createOffer(sellerHeaders, variantId, "CASCADE-ADMIN-1"),+ await createOffer(otherSellerHeaders, variantId, "CASCADE-ADMIN-2"),+ ]++ const res = await api.delete(+ `/admin/products/${product.id}`,+ adminHeaders+ )+ expect(res.status).toEqual(200)+ expect(res.data).toEqual({+ id: product.id,+ object: "product",+ deleted: true,+ })++ const got = await api+ .get(`/admin/products/${product.id}`, adminHeaders)+ .catch((e) => e.response)+ expect(got.status).toEqual(404)++ const offers = await listOffersWithDeleted(product.id)+ expect(offers.map((o) => o.id).sort()).toEqual(offerIds.sort())+ expect(offers.every((o) => o.deleted_at !== null)).toBe(true)++ const query = container.resolve(ContainerRegistrationKeys.QUERY)+ const { data: changes } = await query.graph({+ entity: "product_change",+ fields: ["id", "status", "actions.action"],+ filters: { product_id: product.id },+ })+ const deleteChange = (+ changes as Array<{ status: string; actions: { action: string }[] }>+ ).find((c) =>+ c.actions.some(+ (a) => a.action === ProductChangeActionType.PRODUCT_DELETE+ )+ )+ expect(deleteChange?.status).toEqual(ProductChangeStatus.CONFIRMED)+ })++ it("admin DELETE of a product without offers still deletes it", async () => {+ const product = await createVendorProduct(api, sellerHeaders, {+ title: `Cascade No Offers ${Date.now()}`,+ variants: [{ title: "Default" }],+ })++ const res = await api.delete(+ `/admin/products/${product.id}`,+ adminHeaders+ )+ expect(res.status).toEqual(200)++ const got = await api+ .get(`/admin/products/${product.id}`, adminHeaders)+ .catch((e) => e.response)+ expect(got.status).toEqual(404)+ })++ it("confirmed vendor PRODUCT_DELETE soft-deletes offers on the product", async () => {+ const product = await createVendorProduct(api, sellerHeaders, {+ title: `Cascade Vendor ${Date.now()}`,+ variants: [{ title: "Default" }],+ })+ const offerId = await createOffer(+ sellerHeaders,+ product.variants[0].id,+ "CASCADE-VENDOR-1"+ )++ const res = await api.delete(+ `/vendor/products/${product.id}`,+ sellerHeaders+ )+ expect(res.status).toEqual(202)++ const offers = await listOffersWithDeleted(product.id)+ expect(offers).toHaveLength(1)+ expect(offers[0].id).toEqual(offerId)+ expect(offers[0].deleted_at).not.toBeNull()++ const list = await api.get(`/admin/offers`, adminHeaders)+ expect(+ (list.data.offers as Array<{ id: string }>).some(+ (o) => o.id === offerId+ )+ ).toBe(false)+ })++ it("leaves offers on other products untouched", async () => {+ const doomed = await createVendorProduct(api, sellerHeaders, {+ title: `Cascade Doomed ${Date.now()}`,+ variants: [{ title: "Default" }],+ })+ const kept = await createVendorProduct(api, sellerHeaders, {+ title: `Cascade Kept ${Date.now()}`,+ variants: [{ title: "Default" }],+ })+ await createOffer(sellerHeaders, doomed.variants[0].id, "CASCADE-DOOMED")+ const keptOfferId = await createOffer(+ sellerHeaders,+ kept.variants[0].id,+ "CASCADE-KEPT"+ )++ await api.delete(`/admin/products/${doomed.id}`, adminHeaders)++ const offers = await listOffersWithDeleted(kept.id)+ expect(offers).toHaveLength(1)+ expect(offers[0].id).toEqual(keptOfferId)+ expect(offers[0].deleted_at).toBeNull()+ })+ })+ },+})diff --git a/packages/core/src/api/admin/products/[id]/route.ts b/packages/core/src/api/admin/products/[id]/route.tsindex bad36f867..89118c561 100644--- a/packages/core/src/api/admin/products/[id]/route.ts+++ b/packages/core/src/api/admin/products/[id]/route.ts@@ -10,11 +10,12 @@ import {import { AdditionalData } from "@medusajs/framework/types"import { HttpTypes } from "@mercurjs/types"-import { deleteProductsWorkflow, updateProductsWorkflow } from "@medusajs/medusa/core-flows"+import { updateProductsWorkflow } from "@medusajs/medusa/core-flows"import {enrichProductAttributes,wrapProductVariantsWithOffers,} from "../../../utils"+import { productEditDeleteProductWorkflow } from "../../../../workflows/product-edit/workflows/product-edit-delete-product"import { AdminUpdateProductType } from "../validators"export const GET = async (@@ -100,8 +101,12 @@ export const DELETE = async (req: AuthenticatedMedusaRequest,res: MedusaResponse<HttpTypes.AdminProductDeleteResponse>) => {- await deleteProductsWorkflow(req.scope).run({- input: { ids: [req.params.id] },+ await productEditDeleteProductWorkflow(req.scope).run({+ input: {+ product_id: req.params.id,+ created_by: req.auth_context.actor_id,+ auto_confirm: true,+ },})res.status(200).json({diff --git a/packages/core/src/workflows/product-edit/workflows/apply-product-change-actions.ts b/packages/core/src/workflows/product-edit/workflows/apply-product-change-actions.tsindex 836f4f380..d79616c19 100644--- a/packages/core/src/workflows/product-edit/workflows/apply-product-change-actions.ts+++ b/packages/core/src/workflows/product-edit/workflows/apply-product-change-actions.ts@@ -24,6 +24,7 @@ import {updateProductChangeActionsStep,type VariantImageLinks,} from "../steps"+import { deleteOffersWorkflow } from "../../offer/workflows/delete-offers"import { applyProductAttributeChangeActionsWorkflow } from "./apply-product-attribute-change-actions"export type ApplyProductChangeActionsWorkflowInput = {@@ -273,15 +274,39 @@ export const applyProductChangeActionsWorkflow: ReturnWorkflow<})),})- when(+ const deletedProductOffers = when({ buckets },({ buckets }) => buckets.productsToDelete.length > 0,).then(() => {+ const { data: productOffers } = useQueryGraphStep({+ entity: "offer",+ fields: ["id"],+ filters: transform({ buckets }, ({ buckets }) => ({+ product_id: buckets.productsToDelete,+ })),+ }).config({ name: "load-deleted-products-offers" })+deleteProductsWorkflow.runAsStep({input: transform({ buckets }, ({ buckets }) => ({ids: buckets.productsToDelete,})),})++ return productOffers+ })++ when(+ { deletedProductOffers },+ ({ deletedProductOffers }) => (deletedProductOffers?.length ?? 0) > 0,+ ).then(() => {+ deleteOffersWorkflow.runAsStep({+ input: transform(+ { deletedProductOffers },+ ({ deletedProductOffers }) => ({+ ids: (deletedProductOffers ?? []).map((o) => o.id),+ }),+ ),+ })})when(diff --git a/packages/core/src/workflows/product-edit/workflows/product-edit-delete-product.ts b/packages/core/src/workflows/product-edit/workflows/product-edit-delete-product.tsindex ba510f76f..5b688aacd 100644--- a/packages/core/src/workflows/product-edit/workflows/product-edit-delete-product.ts+++ b/packages/core/src/workflows/product-edit/workflows/product-edit-delete-product.ts@@ -18,6 +18,7 @@ import { stageProductChangeWorkflow } from "./stage-product-change"export type ProductEditDeleteProductWorkflowInput = {product_id: stringcreated_by?: string+ auto_confirm?: boolean} & AdditionalDataexport const productEditDeleteProductWorkflowId =@@ -48,7 +49,8 @@ export const productEditDeleteProductWorkflow: ReturnWorkflow<input: transform({ input, products }, ({ input, products }) => ({product_id: input.product_id,created_by: input.created_by,- auto_confirm: products[0]?.status === ProductStatus.DRAFT,+ auto_confirm:+ input.auto_confirm ?? products[0]?.status === ProductStatus.DRAFT,actions: [{product_id: input.product_id,