Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

fix(core): keep order group seller_count and total independent of list filters (#1632)

Viktor Holik77db0dcc5850
diff --git a/apps/docs/platform/order-group/guides/list-order-groups.mdx b/apps/docs/platform/order-group/guides/list-order-groups.mdx
index 941e3cc5c..787946f1e 100644
--- a/apps/docs/platform/order-group/guides/list-order-groups.mdx
+++ b/apps/docs/platform/order-group/guides/list-order-groups.mdx
@@ -42,6 +42,10 @@ The workflow returns `{ rows, metadata }`, where `metadata` carries the `count`,
Filters go inside `variables`: the group repository understands `id`,
`customer_id`, `seller_id`, `status`, `sales_channel_id`, `created_at`,
`updated_at`, and a free-text `q` (matched against group id and customer id).
+ Order-level filters (`seller_id`, `status`, `sales_channel_id`) only decide
+ which groups match. A matching group's `seller_count` and `total` still
+ describe every order in the group, as covered in
+ [Computed totals](/platform/order-group/concepts/computed-totals).
</Note>
## Scope to a seller
diff --git a/integration-tests/http/order/admin/order-list-filters.spec.ts b/integration-tests/http/order/admin/order-list-filters.spec.ts
index 0f452ae23..0102db2ba 100644
--- a/integration-tests/http/order/admin/order-list-filters.spec.ts
+++ b/integration-tests/http/order/admin/order-list-filters.spec.ts
@@ -350,7 +350,22 @@ medusaIntegrationTestRunner({
{},
storeHeaders
)
- return { orderGroupId: completeResp.data.order_group.id }
+ const orderGroupId = completeResp.data.order_group.id
+ const query = appContainer.resolve(
+ ContainerRegistrationKeys.QUERY
+ )
+ const { data: orderGroup } = await query.graph({
+ entity: "order_group",
+ filters: { id: orderGroupId },
+ fields: ["id", "orders.id", "orders.seller.id"],
+ })
+ return {
+ orderGroupId,
+ orders: (orderGroup[0] as any).orders as {
+ id: string
+ seller: { id: string }
+ }[],
+ }
}
beforeAll(async () => {
@@ -436,12 +451,21 @@ medusaIntegrationTestRunner({
expect(ids).not.toContain(groupB)
})
- it("trims child orders to the selected seller within a multi-seller group", async () => {
+ it("keeps every child order and the full aggregates of a matching multi-seller group", async () => {
const { orderGroupId } = await completeMultiSellerCheckout([
seller1Seed.offer.id,
seller2Seed.offer.id,
])
+ const unfiltered = await api.get(
+ `/admin/order-groups?id=${orderGroupId}`,
+ adminHeaders
+ )
+ const baseline = unfiltered.data.order_groups[0]
+ expect(baseline.orders.length).toEqual(2)
+ expect(baseline.seller_count).toEqual(2)
+ expect(baseline.total).toBeGreaterThan(0)
+
const response = await api.get(
`/admin/order-groups?seller_id=${seller1Seed.sellerId}`,
adminHeaders
@@ -452,12 +476,9 @@ medusaIntegrationTestRunner({
(g: any) => g.id === orderGroupId
)
expect(group).toBeDefined()
- expect(group.orders.length).toEqual(1)
- expect(
- group.orders.every(
- (o: any) => o.seller?.id === seller1Seed.sellerId
- )
- ).toBe(true)
+ expect(group.orders.length).toEqual(2)
+ expect(group.seller_count).toEqual(2)
+ expect(group.total).toEqual(baseline.total)
})
it("returns an empty list for an unknown seller", async () => {
@@ -491,6 +512,67 @@ medusaIntegrationTestRunner({
expect(ids).toContain(groupB)
})
})
+
+ describe("GET /admin/order-groups?status=...", () => {
+ it("matches groups by child order status without shrinking seller_count or total", async () => {
+ const { orderGroupId, orders } =
+ await completeMultiSellerCheckout([
+ seller1Seed.offer.id,
+ seller2Seed.offer.id,
+ ])
+ const { orderGroupId: pendingOnlyGroupId } =
+ await completeCartCheckout(seller1Seed.offer.id)
+
+ const baseline = (
+ await api.get(
+ `/admin/order-groups?id=${orderGroupId}`,
+ adminHeaders
+ )
+ ).data.order_groups[0]
+ expect(baseline.seller_count).toEqual(2)
+ expect(baseline.orders.length).toEqual(2)
+
+ const seller2Order = orders.find(
+ (o) => o.seller?.id === seller2Seed.sellerId
+ )!
+ const cancelResp = await api.post(
+ `/vendor/orders/${seller2Order.id}/cancel`,
+ {},
+ seller2Seed.headers
+ )
+ expect(cancelResp.status).toEqual(200)
+
+ const canceled = await api.get(
+ `/admin/order-groups?status=canceled`,
+ adminHeaders
+ )
+ expect(canceled.status).toEqual(200)
+ const canceledIds = canceled.data.order_groups.map(
+ (g: any) => g.id
+ )
+ expect(canceledIds).toContain(orderGroupId)
+ expect(canceledIds).not.toContain(pendingOnlyGroupId)
+
+ const group = canceled.data.order_groups.find(
+ (g: any) => g.id === orderGroupId
+ )
+ expect(group.orders.length).toEqual(2)
+ expect(group.seller_count).toEqual(2)
+ expect(group.total).toEqual(baseline.total)
+
+ const pending = await api.get(
+ `/admin/order-groups?status=pending`,
+ adminHeaders
+ )
+ const pendingGroup = pending.data.order_groups.find(
+ (g: any) => g.id === orderGroupId
+ )
+ expect(pendingGroup).toBeDefined()
+ expect(pendingGroup.orders.length).toEqual(2)
+ expect(pendingGroup.seller_count).toEqual(2)
+ expect(pendingGroup.total).toEqual(baseline.total)
+ })
+ })
})
},
})
diff --git a/packages/core/src/api/admin/order-groups/route.ts b/packages/core/src/api/admin/order-groups/route.ts
index 057ec77ed..83e0238cc 100644
--- a/packages/core/src/api/admin/order-groups/route.ts
+++ b/packages/core/src/api/admin/order-groups/route.ts
@@ -10,7 +10,8 @@ export const GET = async (
req: AuthenticatedMedusaRequest,
res: MedusaResponse<HttpTypes.AdminOrderGroupListResponse>
) => {
- const { seller_id: sellerId, ...filterableFields } = req.filterableFields
+ // `applyOrderGroupSellerFilter` already narrowed `id` to the seller's groups.
+ const { seller_id: _sellerId, ...filterableFields } = req.filterableFields
const { result } = await getOrderGroupsListWorkflow(req.scope).run({
input: {
@@ -21,7 +22,6 @@ export const GET = async (
take: req.queryConfig.pagination?.take,
order: req.queryConfig.pagination?.order as Record<string, string>,
},
- sellerId: sellerId as string | string[] | undefined,
},
})
diff --git a/packages/core/src/modules/seller/repositories/order-group.ts b/packages/core/src/modules/seller/repositories/order-group.ts
index 952713872..c626f2825 100644
--- a/packages/core/src/modules/seller/repositories/order-group.ts
+++ b/packages/core/src/modules/seller/repositories/order-group.ts
@@ -19,8 +19,6 @@ const OPERATOR_MAP = {
export class OrderGroupRepository extends DALUtils.mikroOrmBaseRepositoryFactory(
OrderGroup
) {
-
-
private parseFilterValue(
column: string,
value: any,
@@ -73,6 +71,8 @@ export class OrderGroupRepository extends DALUtils.mikroOrmBaseRepositoryFactory
const params: any[] = []
const whereClauses: string[] = ["og.deleted_at IS NULL"]
+ const orderParams: any[] = []
+ const orderClauses: string[] = []
if (filters.id) {
const ids = Array.isArray(filters.id) ? filters.id : [filters.id]
@@ -104,8 +104,8 @@ export class OrderGroupRepository extends DALUtils.mikroOrmBaseRepositoryFactory
? filters.seller_id
: [filters.seller_id]
const placeholders = sellerIds.map(() => "?").join(",")
- whereClauses.push(`oso.seller_id IN (${placeholders})`)
- params.push(...sellerIds)
+ orderClauses.push(`fo_seller.seller_id IN (${placeholders})`)
+ orderParams.push(...sellerIds)
}
if (filters.status) {
@@ -113,8 +113,8 @@ export class OrderGroupRepository extends DALUtils.mikroOrmBaseRepositoryFactory
? filters.status
: [filters.status]
const placeholders = statuses.map(() => "?").join(",")
- whereClauses.push(`o.status IN (${placeholders})`)
- params.push(...statuses)
+ orderClauses.push(`fo.status IN (${placeholders})`)
+ orderParams.push(...statuses)
}
if (filters.sales_channel_id) {
@@ -122,8 +122,8 @@ export class OrderGroupRepository extends DALUtils.mikroOrmBaseRepositoryFactory
? filters.sales_channel_id
: [filters.sales_channel_id]
const placeholders = salesChannelIds.map(() => "?").join(",")
- whereClauses.push(`o.sales_channel_id IN (${placeholders})`)
- params.push(...salesChannelIds)
+ orderClauses.push(`fo.sales_channel_id IN (${placeholders})`)
+ orderParams.push(...salesChannelIds)
}
if (filters.created_at) {
@@ -140,6 +140,20 @@ export class OrderGroupRepository extends DALUtils.mikroOrmBaseRepositoryFactory
params.push(searchPattern, searchPattern)
}
+ // Order-level filters only decide which groups match. The aggregates below
+ // must still span every order in the group, so those filters live in an
+ // EXISTS subquery instead of the join the aggregates run over.
+ if (orderClauses.length > 0) {
+ whereClauses.push(`EXISTS (
+ SELECT 1
+ FROM order_group_order fogo
+ JOIN "order" fo ON fo.id = fogo.order_id
+ LEFT JOIN order_order_seller_seller fo_seller ON fo_seller.order_id = fo.id
+ WHERE fogo.order_group_id = og.id AND ${orderClauses.join(" AND ")}
+ )`)
+ params.push(...orderParams)
+ }
+
const orderByClauses: string[] = []
if (orderBy.created_at) {
orderByClauses.push(`og.created_at ${orderBy.created_at}`)
@@ -154,11 +168,8 @@ export class OrderGroupRepository extends DALUtils.mikroOrmBaseRepositoryFactory
const whereClause = whereClauses.join(" AND ")
const countQuery = `
- SELECT COUNT(DISTINCT og.id) as count
+ SELECT COUNT(*) as count
FROM order_group og
- LEFT JOIN order_group_order ogo ON ogo.order_group_id = og.id
- LEFT JOIN "order" o ON o.id = ogo.order_id
- LEFT JOIN order_order_seller_seller oso ON oso.order_id = o.id
WHERE ${whereClause}
`