@endora-commerce/mod-catalog 0.105.0 → 0.107.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/admin/pages/CategoriesTree.d.ts.map +1 -1
- package/dist/admin/pages/CategoriesTree.js +21 -4
- package/dist/admin/pages/CategoriesTree.js.map +1 -1
- package/dist/admin/pages/ProductsList.d.ts.map +1 -1
- package/dist/admin/pages/ProductsList.js +36 -3
- package/dist/admin/pages/ProductsList.js.map +1 -1
- package/dist/backend/admin-search-provider.d.ts +56 -0
- package/dist/backend/admin-search-provider.d.ts.map +1 -0
- package/dist/backend/admin-search-provider.js +109 -0
- package/dist/backend/admin-search-provider.js.map +1 -0
- package/dist/backend/entities/product-list-saved-view.entity.d.ts +31 -0
- package/dist/backend/entities/product-list-saved-view.entity.d.ts.map +1 -0
- package/dist/backend/entities/product-list-saved-view.entity.js +75 -0
- package/dist/backend/entities/product-list-saved-view.entity.js.map +1 -0
- package/dist/backend/index.d.ts +2 -1
- package/dist/backend/index.d.ts.map +1 -1
- package/dist/backend/index.js +21 -0
- package/dist/backend/index.js.map +1 -1
- package/dist/backend/plugin.d.ts +5 -0
- package/dist/backend/plugin.d.ts.map +1 -1
- package/dist/backend/plugin.js +4 -0
- package/dist/backend/plugin.js.map +1 -1
- package/dist/backend/routes.admin.d.ts +6 -0
- package/dist/backend/routes.admin.d.ts.map +1 -1
- package/dist/backend/routes.admin.js +30 -1
- package/dist/backend/routes.admin.js.map +1 -1
- package/dist/backend/routes.public.d.ts.map +1 -1
- package/dist/backend/routes.public.js +10 -5
- package/dist/backend/routes.public.js.map +1 -1
- package/dist/backend/saved-view-actor.d.ts +16 -0
- package/dist/backend/saved-view-actor.d.ts.map +1 -0
- package/dist/backend/saved-view-actor.js +24 -0
- package/dist/backend/saved-view-actor.js.map +1 -0
- package/dist/backend/services/catalog-admin-search.service.d.ts +32 -0
- package/dist/backend/services/catalog-admin-search.service.d.ts.map +1 -0
- package/dist/backend/services/catalog-admin-search.service.js +141 -0
- package/dist/backend/services/catalog-admin-search.service.js.map +1 -0
- package/dist/backend/services/catalog-product-read.service.d.ts +8 -1
- package/dist/backend/services/catalog-product-read.service.d.ts.map +1 -1
- package/dist/backend/services/catalog-product-read.service.js +20 -0
- package/dist/backend/services/catalog-product-read.service.js.map +1 -1
- package/dist/backend/services/catalog-query.service.d.ts +8 -0
- package/dist/backend/services/catalog-query.service.d.ts.map +1 -1
- package/dist/backend/services/catalog-query.service.js +14 -15
- package/dist/backend/services/catalog-query.service.js.map +1 -1
- package/dist/backend/services/product-link.service.d.ts +5 -0
- package/dist/backend/services/product-link.service.d.ts.map +1 -1
- package/dist/backend/services/product-link.service.js +2 -5
- package/dist/backend/services/product-link.service.js.map +1 -1
- package/dist/backend/services/product-list-view-service.d.ts +53 -0
- package/dist/backend/services/product-list-view-service.d.ts.map +1 -0
- package/dist/backend/services/product-list-view-service.js +191 -0
- package/dist/backend/services/product-list-view-service.js.map +1 -0
- package/dist/manifest.d.ts +7 -2
- package/dist/manifest.d.ts.map +1 -1
- package/dist/manifest.js +21 -0
- package/dist/manifest.js.map +1 -1
- package/dist/migrations/20261014T170531_catalog_product_list_saved_views.d.ts +22 -0
- package/dist/migrations/20261014T170531_catalog_product_list_saved_views.d.ts.map +1 -0
- package/dist/migrations/20261014T170531_catalog_product_list_saved_views.js +38 -0
- package/dist/migrations/20261014T170531_catalog_product_list_saved_views.js.map +1 -0
- package/dist/migrations/index.d.ts +2 -1
- package/dist/migrations/index.d.ts.map +1 -1
- package/dist/migrations/index.js +3 -1
- package/dist/migrations/index.js.map +1 -1
- package/docs/catalog/attributes.md +1 -1
- package/docs/catalog.md +131 -1
- package/i18n/en.json +13 -1
- package/i18n/pl.json +13 -1
- package/package.json +9 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.public.d.ts","sourceRoot":"","sources":["../../src/backend/routes.public.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,
|
|
1
|
+
{"version":3,"file":"routes.public.d.ts","sourceRoot":"","sources":["../../src/backend/routes.public.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,SAAS,CAAC;AAE/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EASL,KAAK,qBAAqB,EAI1B,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAC;AAuDpC,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,mBAAmB,CAAC;IAClC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC;IACrC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC;;;OAGG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;;OAKG;IACH,iCAAiC,CAAC,EAAE,CAClC,gBAAgB,EAAE,MAAM,GAAG,SAAS,KACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5B;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,EAAE,qBAAqB,CAAC;CAC3C;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,IAAI,CAAC,CAwRf"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { ERROR_CODES, isPriceSort, productLinkKindSchema, productListSortSchema, validateBundleConfigurationRequestSchema, } from '@endora-commerce/contracts';
|
|
2
|
+
import { ERROR_CODES, isPriceSort, listingCurrencyQuerySchema, listingPriceChannelContext, productLinkKindSchema, productListSortSchema, resolveListingCurrency, validateBundleConfigurationRequestSchema, } from '@endora-commerce/contracts';
|
|
3
3
|
import { HttpError } from '@endora-commerce/platform/http';
|
|
4
4
|
import { effectiveState } from '@endora-commerce/platform/kernel';
|
|
5
5
|
import { getResolvedChannel } from '@endora-commerce/platform/kernel';
|
|
@@ -101,10 +101,7 @@ export async function registerCatalogPublicRoutes(app, deps) {
|
|
|
101
101
|
const organization = ctx.audience.organizationId === null ? null : { id: ctx.audience.organizationId };
|
|
102
102
|
const mode = await deps.listingPriceOrder.pageDisplayMode({
|
|
103
103
|
context: {
|
|
104
|
-
|
|
105
|
-
id: ctx.resolvedChannel.id,
|
|
106
|
-
defaultCurrency: ctx.resolvedChannel.defaultCurrency,
|
|
107
|
-
},
|
|
104
|
+
...listingPriceChannelContext(ctx.resolvedChannel, ctx.currency),
|
|
108
105
|
organization,
|
|
109
106
|
},
|
|
110
107
|
});
|
|
@@ -281,6 +278,13 @@ function readContext(request) {
|
|
|
281
278
|
// Feature 053 / FR-002: the sales channel is resolved once by the canonical
|
|
282
279
|
// middleware. Read it here instead of re-parsing the `x-sales-channel` header.
|
|
283
280
|
const ch = getResolvedChannel(request);
|
|
281
|
+
// Issue #249 — the currency every read on this request is priced in,
|
|
282
|
+
// resolved once here so a listing, its ordering, its price range and the
|
|
283
|
+
// Meilisearch path cannot disagree. A malformed `?currency=` is a 400 (the
|
|
284
|
+
// ZodError reaches the error envelope); one the channel does not offer falls
|
|
285
|
+
// back to its default — see `resolveListingCurrency`.
|
|
286
|
+
const requestedCurrency = request.query?.['currency'];
|
|
287
|
+
const currency = resolveListingCurrency(requestedCurrency === undefined ? undefined : listingCurrencyQuerySchema.parse(requestedCurrency), ch);
|
|
284
288
|
const acceptLanguage = acceptLanguageHeaderSchema.parse(request.headers['accept-language']);
|
|
285
289
|
const preferredLanguage = acceptLanguage ? acceptLanguage.split(',')[0]?.trim() : undefined;
|
|
286
290
|
return {
|
|
@@ -293,6 +297,7 @@ function readContext(request) {
|
|
|
293
297
|
},
|
|
294
298
|
audience: productAudienceOf(request),
|
|
295
299
|
preferredLanguage,
|
|
300
|
+
currency,
|
|
296
301
|
};
|
|
297
302
|
}
|
|
298
303
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.public.js","sourceRoot":"","sources":["../../src/backend/routes.public.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"routes.public.js","sourceRoot":"","sources":["../../src/backend/routes.public.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { ProductSavedViewActor } from './services/product-list-view-service.js';
|
|
2
|
+
/**
|
|
3
|
+
* The saved-view actor for the product list, read from the request's ambient
|
|
4
|
+
* tenant context (`specs/147-saved-views/` contract §4): the admin, and
|
|
5
|
+
* whether that admin reaches every organization — the "platform admin (for
|
|
6
|
+
* saved views)" of the spec's *Vocabulary* (research R-7).
|
|
7
|
+
*
|
|
8
|
+
* Every list with saved views derives this the same way, and
|
|
9
|
+
* `backend/test/integration/saved-list-views/rules-parity.test.ts` holds them
|
|
10
|
+
* to it. It fails closed twice: no admin actor is a 401, never a write under
|
|
11
|
+
* an empty owner id (threat model S-03); and an admin whose reach nobody could
|
|
12
|
+
* resolve — no scope port composed, or a role that cannot be read — is in
|
|
13
|
+
* `allowed-set` mode, so is not a platform admin.
|
|
14
|
+
*/
|
|
15
|
+
export declare function savedViewActor(): ProductSavedViewActor;
|
|
16
|
+
//# sourceMappingURL=saved-view-actor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"saved-view-actor.d.ts","sourceRoot":"","sources":["../../src/backend/saved-view-actor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAErF;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,IAAI,qBAAqB,CAMtD"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { ERROR_CODES } from '@endora-commerce/contracts';
|
|
2
|
+
import { HttpError } from '@endora-commerce/platform/http';
|
|
3
|
+
import { getTenantContext } from '@endora-commerce/platform/tenancy';
|
|
4
|
+
/**
|
|
5
|
+
* The saved-view actor for the product list, read from the request's ambient
|
|
6
|
+
* tenant context (`specs/147-saved-views/` contract §4): the admin, and
|
|
7
|
+
* whether that admin reaches every organization — the "platform admin (for
|
|
8
|
+
* saved views)" of the spec's *Vocabulary* (research R-7).
|
|
9
|
+
*
|
|
10
|
+
* Every list with saved views derives this the same way, and
|
|
11
|
+
* `backend/test/integration/saved-list-views/rules-parity.test.ts` holds them
|
|
12
|
+
* to it. It fails closed twice: no admin actor is a 401, never a write under
|
|
13
|
+
* an empty owner id (threat model S-03); and an admin whose reach nobody could
|
|
14
|
+
* resolve — no scope port composed, or a role that cannot be read — is in
|
|
15
|
+
* `allowed-set` mode, so is not a platform admin.
|
|
16
|
+
*/
|
|
17
|
+
export function savedViewActor() {
|
|
18
|
+
const ctx = getTenantContext();
|
|
19
|
+
if (!ctx || ctx.actor.kind !== 'admin' || !ctx.actor.id) {
|
|
20
|
+
throw new HttpError(401, ERROR_CODES.UNAUTHORIZED, 'Admin session required.');
|
|
21
|
+
}
|
|
22
|
+
return { adminUserId: ctx.actor.id, isPlatformAdmin: ctx.mode === 'all' };
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=saved-view-actor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"saved-view-actor.js","sourceRoot":"","sources":["../../src/backend/saved-view-actor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,cAAc;IAC5B,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAC;IAC/B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACxD,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,eAAe,EAAE,GAAG,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;AAC5E,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { EntityManager } from '@mikro-orm/postgresql';
|
|
2
|
+
import type { CatalogAttributeReadPort } from '@endora-commerce/contracts';
|
|
3
|
+
import type { CatalogAdminSearchQuery, CategoryAdminSearchRow, ProductAdminSearchRow } from '../admin-search-provider.js';
|
|
4
|
+
/**
|
|
5
|
+
* Global search over products and categories (`specs/150-admin-global-search/`,
|
|
6
|
+
* T048).
|
|
7
|
+
*
|
|
8
|
+
* The admin lists' rows: every product and category that is not deleted —
|
|
9
|
+
* drafts and inactive ones included (FR-016) — with no channel or audience
|
|
10
|
+
* filter, because the admin screens have none (research R-19). Only the
|
|
11
|
+
* selected fields are matched, literally (`likeEscaped`, Postgres' default
|
|
12
|
+
* `\` LIKE escape). A name matches in **any** language (one value of the
|
|
13
|
+
* per-language map, never a key); `quickSearchAttributes` are the attributes
|
|
14
|
+
* this module flags `quickSearchable`, read through its own attribute port as
|
|
15
|
+
* the storefront type-ahead does. Identifiers (SKU, slug) rank exact → prefix
|
|
16
|
+
* → the rest, then most recent change, then id; `limit + 1` rows, no count.
|
|
17
|
+
*/
|
|
18
|
+
export declare class CatalogAdminSearchService {
|
|
19
|
+
#private;
|
|
20
|
+
private readonly emFactory;
|
|
21
|
+
private readonly attributeRead;
|
|
22
|
+
constructor(emFactory: () => EntityManager, attributeRead: Pick<CatalogAttributeReadPort, 'listByFlag'>);
|
|
23
|
+
searchProducts(query: CatalogAdminSearchQuery): Promise<{
|
|
24
|
+
rows: ProductAdminSearchRow[];
|
|
25
|
+
hasMore: boolean;
|
|
26
|
+
}>;
|
|
27
|
+
searchCategories(query: CatalogAdminSearchQuery): Promise<{
|
|
28
|
+
rows: CategoryAdminSearchRow[];
|
|
29
|
+
hasMore: boolean;
|
|
30
|
+
}>;
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=catalog-admin-search.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalog-admin-search.service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/catalog-admin-search.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,EACV,uBAAuB,EACvB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AAErC;;;;;;;;;;;;;GAaG;AACH,qBAAa,yBAAyB;;IAElC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;gBADb,SAAS,EAAE,MAAM,aAAa,EAC9B,aAAa,EAAE,IAAI,CAAC,wBAAwB,EAAE,YAAY,CAAC;IAGxE,cAAc,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAsC5G,gBAAgB,CACpB,KAAK,EAAE,uBAAuB,GAC7B,OAAO,CAAC;QAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAoGjE"}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Global search over products and categories (`specs/150-admin-global-search/`,
|
|
3
|
+
* T048).
|
|
4
|
+
*
|
|
5
|
+
* The admin lists' rows: every product and category that is not deleted —
|
|
6
|
+
* drafts and inactive ones included (FR-016) — with no channel or audience
|
|
7
|
+
* filter, because the admin screens have none (research R-19). Only the
|
|
8
|
+
* selected fields are matched, literally (`likeEscaped`, Postgres' default
|
|
9
|
+
* `\` LIKE escape). A name matches in **any** language (one value of the
|
|
10
|
+
* per-language map, never a key); `quickSearchAttributes` are the attributes
|
|
11
|
+
* this module flags `quickSearchable`, read through its own attribute port as
|
|
12
|
+
* the storefront type-ahead does. Identifiers (SKU, slug) rank exact → prefix
|
|
13
|
+
* → the rest, then most recent change, then id; `limit + 1` rows, no count.
|
|
14
|
+
*/
|
|
15
|
+
export class CatalogAdminSearchService {
|
|
16
|
+
emFactory;
|
|
17
|
+
attributeRead;
|
|
18
|
+
constructor(emFactory, attributeRead) {
|
|
19
|
+
this.emFactory = emFactory;
|
|
20
|
+
this.attributeRead = attributeRead;
|
|
21
|
+
}
|
|
22
|
+
async searchProducts(query) {
|
|
23
|
+
const fields = new Set(query.fields);
|
|
24
|
+
const contains = `%${query.likeEscaped}%`;
|
|
25
|
+
const quickKeys = fields.has('quickSearchAttributes')
|
|
26
|
+
? (await this.attributeRead.listByFlag('quickSearchable')).map((a) => a.key)
|
|
27
|
+
: [];
|
|
28
|
+
const matches = [];
|
|
29
|
+
if (fields.has('sku'))
|
|
30
|
+
matches.push((qb) => qb.orWhereRaw('"sku" ilike ?', [contains]));
|
|
31
|
+
if (fields.has('name')) {
|
|
32
|
+
matches.push((qb) => qb.orWhereRaw('exists (select 1 from jsonb_each_text("name") n where n.value ilike ?)', [contains]));
|
|
33
|
+
}
|
|
34
|
+
if (fields.has('slug'))
|
|
35
|
+
matches.push((qb) => qb.orWhereRaw('"slug" ilike ?', [contains]));
|
|
36
|
+
for (const key of quickKeys) {
|
|
37
|
+
matches.push((qb) => qb.orWhereRaw('"attribute_values"->>? ilike ?', [key, contains]));
|
|
38
|
+
}
|
|
39
|
+
if (query.isUuid)
|
|
40
|
+
matches.push((qb) => qb.orWhereRaw('"id" = ?::uuid', [query.text]));
|
|
41
|
+
const identifiers = ['sku', 'slug'].filter((f) => fields.has(f));
|
|
42
|
+
const rows = await this.#page('products', ['id', 'sku', 'name', 'type', 'status'], matches, identifiers, query);
|
|
43
|
+
return {
|
|
44
|
+
hasMore: rows.length > query.limit,
|
|
45
|
+
rows: rows.slice(0, query.limit).map((r) => ({
|
|
46
|
+
id: r.id,
|
|
47
|
+
sku: r.sku,
|
|
48
|
+
name: parseJson(r.name),
|
|
49
|
+
type: r.type,
|
|
50
|
+
status: r.status,
|
|
51
|
+
})),
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
async searchCategories(query) {
|
|
55
|
+
const fields = new Set(query.fields);
|
|
56
|
+
const contains = `%${query.likeEscaped}%`;
|
|
57
|
+
const matches = [];
|
|
58
|
+
if (fields.has('name')) {
|
|
59
|
+
matches.push((qb) => qb.orWhereRaw('exists (select 1 from jsonb_each_text("name") n where n.value ilike ?)', [contains]));
|
|
60
|
+
}
|
|
61
|
+
if (fields.has('slug'))
|
|
62
|
+
matches.push((qb) => qb.orWhereRaw('"slug" ilike ?', [contains]));
|
|
63
|
+
if (query.isUuid)
|
|
64
|
+
matches.push((qb) => qb.orWhereRaw('"id" = ?::uuid', [query.text]));
|
|
65
|
+
const identifiers = fields.has('slug') ? ['slug'] : [];
|
|
66
|
+
const rows = await this.#page('categories', ['id', 'name'], matches, identifiers, query);
|
|
67
|
+
const page = rows.slice(0, query.limit);
|
|
68
|
+
const paths = await this.#ancestorNames(page.map((r) => r.id));
|
|
69
|
+
return {
|
|
70
|
+
hasMore: rows.length > query.limit,
|
|
71
|
+
rows: page.map((r) => ({ id: r.id, name: parseJson(r.name), path: paths.get(r.id) ?? [] })),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
async #page(table, columns, matches, identifiers, query) {
|
|
75
|
+
if (matches.length === 0)
|
|
76
|
+
return [];
|
|
77
|
+
const em = this.emFactory();
|
|
78
|
+
const builder = em
|
|
79
|
+
.getKnex()(table)
|
|
80
|
+
.select(columns.map((c) => (c === 'id' ? em.getKnex().raw('"id"::text as id') : c)))
|
|
81
|
+
.whereNull('deleted_at')
|
|
82
|
+
.andWhere((or) => {
|
|
83
|
+
for (const match of matches)
|
|
84
|
+
match(or);
|
|
85
|
+
});
|
|
86
|
+
const exact = [];
|
|
87
|
+
const starts = [];
|
|
88
|
+
const exactBindings = [];
|
|
89
|
+
const startBindings = [];
|
|
90
|
+
if (query.isUuid) {
|
|
91
|
+
exact.push('"id" = ?::uuid');
|
|
92
|
+
exactBindings.push(query.text);
|
|
93
|
+
}
|
|
94
|
+
for (const column of identifiers) {
|
|
95
|
+
exact.push(`lower("${column}") = lower(?)`);
|
|
96
|
+
exactBindings.push(query.text);
|
|
97
|
+
starts.push(`"${column}" ilike ?`);
|
|
98
|
+
startBindings.push(`${query.likeEscaped}%`);
|
|
99
|
+
}
|
|
100
|
+
if (exact.length > 0) {
|
|
101
|
+
const prefix = starts.length > 0 ? ` when ${starts.join(' or ')} then 1` : '';
|
|
102
|
+
builder.orderByRaw(`case when ${exact.join(' or ')} then 0${prefix} else 2 end`, [
|
|
103
|
+
...exactBindings,
|
|
104
|
+
...startBindings,
|
|
105
|
+
]);
|
|
106
|
+
}
|
|
107
|
+
builder.orderBy('updated_at', 'desc').orderBy('id', 'asc').limit(query.limit + 1);
|
|
108
|
+
return (await em.execute(builder));
|
|
109
|
+
}
|
|
110
|
+
/** Each category's ancestors' names, root first — one recursive read for the whole page. */
|
|
111
|
+
async #ancestorNames(ids) {
|
|
112
|
+
const out = new Map();
|
|
113
|
+
if (ids.length === 0)
|
|
114
|
+
return out;
|
|
115
|
+
const placeholders = ids.map(() => '?').join(', ');
|
|
116
|
+
const rows = (await this.emFactory().execute(`with recursive chain as (
|
|
117
|
+
select c.id as leaf, c.parent_category_id as next_id, 0 as depth
|
|
118
|
+
from categories c where c.id::text in (${placeholders})
|
|
119
|
+
union all
|
|
120
|
+
select chain.leaf, p.parent_category_id, chain.depth + 1
|
|
121
|
+
from chain join categories p on p.id = chain.next_id
|
|
122
|
+
where chain.depth < 32
|
|
123
|
+
)
|
|
124
|
+
select chain.leaf::text as leaf, chain.depth, a.name
|
|
125
|
+
from chain join categories a on a.id = chain.next_id`, [...ids]));
|
|
126
|
+
const byLeaf = new Map();
|
|
127
|
+
for (const row of rows) {
|
|
128
|
+
const list = byLeaf.get(row.leaf) ?? [];
|
|
129
|
+
list.push({ depth: Number(row.depth), name: parseJson(row.name) });
|
|
130
|
+
byLeaf.set(row.leaf, list);
|
|
131
|
+
}
|
|
132
|
+
for (const [leaf, list] of byLeaf) {
|
|
133
|
+
out.set(leaf, list.sort((a, b) => b.depth - a.depth).map((entry) => entry.name));
|
|
134
|
+
}
|
|
135
|
+
return out;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
function parseJson(value) {
|
|
139
|
+
return typeof value === 'string' ? JSON.parse(value) : value;
|
|
140
|
+
}
|
|
141
|
+
//# sourceMappingURL=catalog-admin-search.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalog-admin-search.service.js","sourceRoot":"","sources":["../../../src/backend/services/catalog-admin-search.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { EntityManager } from '@mikro-orm/postgresql';
|
|
2
|
-
import type { CatalogPackagingUnitRecord, CatalogProductLinkRow, CatalogProductLookupOptions, CatalogProductReadPort, CatalogProductRecord, CatalogProductValueOverrideRecord, CatalogProductVariantRecord, ProductLinkKind } from '@endora-commerce/contracts';
|
|
2
|
+
import type { CatalogAttributeValueQuery, CatalogPackagingUnitRecord, CatalogProductLinkRow, CatalogProductLookupOptions, CatalogProductReadPort, CatalogProductRecord, CatalogProductValueOverrideRecord, CatalogProductVariantRecord, ProductLinkKind } from '@endora-commerce/contracts';
|
|
3
3
|
import { Product } from '../entities/product.entity.js';
|
|
4
4
|
import { ProductLink } from '../entities/product-link.entity.js';
|
|
5
5
|
import { ProductPackagingUnit } from '../entities/product-packaging-unit.entity.js';
|
|
@@ -37,6 +37,13 @@ export declare class CatalogProductReadService implements CatalogProductReadPort
|
|
|
37
37
|
findPackagingUnitInProduct(productId: string, packagingUnitId: string): Promise<CatalogPackagingUnitRecord | null>;
|
|
38
38
|
listLinksBySourceIds(sourceProductIds: readonly string[], kind?: ProductLinkKind): Promise<CatalogProductLinkRow[]>;
|
|
39
39
|
listValueOverridesByProductIds(productIds: readonly string[]): Promise<CatalogProductValueOverrideRecord[]>;
|
|
40
|
+
/**
|
|
41
|
+
* Feature 148 — the products an attribute value selects, structurally (see
|
|
42
|
+
* the port). One statement over the product's own JSONB; the `jsonb` forms
|
|
43
|
+
* keep a stored string `"true"` from matching a boolean selection and a
|
|
44
|
+
* scalar from matching an array one.
|
|
45
|
+
*/
|
|
46
|
+
listProductIdsByAttributeValue(query: CatalogAttributeValueQuery): Promise<string[]>;
|
|
40
47
|
}
|
|
41
48
|
export declare function toCatalogProductRecord(product: Product): CatalogProductRecord;
|
|
42
49
|
export declare function toCatalogProductVariantRecord(variant: ProductVariant): CatalogProductVariantRecord;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-product-read.service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/catalog-product-read.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,uBAAuB,CAAC;AACxE,OAAO,KAAK,EACV,0BAA0B,EAC1B,qBAAqB,EACrB,2BAA2B,EAC3B,sBAAsB,EACtB,oBAAoB,EACpB,iCAAiC,EACjC,2BAA2B,EAC3B,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,yBAA0B,YAAW,sBAAsB;IAC1D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM,aAAa;IAErD,QAAQ,CACZ,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAQjC,SAAS,CACb,GAAG,EAAE,SAAS,MAAM,EAAE,EACtB,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAS5B,SAAS,CACb,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAQjC,UAAU,CACd,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAS5B,UAAU,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,OAAO,CAAC,OAAO,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAS/E,wBAAwB,CAC5B,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,OAAO,CAAC,2BAA2B,EAAE,CAAC;IAUnC,kBAAkB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,2BAA2B,EAAE,CAAC;IAMnF,oBAAoB,CACxB,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,2BAA2B,GAAG,IAAI,CAAC;IAQxC,0BAA0B,CAC9B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC;IAQvC,oBAAoB,CACxB,gBAAgB,EAAE,SAAS,MAAM,EAAE,EACnC,IAAI,CAAC,EAAE,eAAe,GACrB,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAa7B,8BAA8B,CAClC,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,OAAO,CAAC,iCAAiC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"catalog-product-read.service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/catalog-product-read.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,uBAAuB,CAAC;AACxE,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,qBAAqB,EACrB,2BAA2B,EAC3B,sBAAsB,EACtB,oBAAoB,EACpB,iCAAiC,EACjC,2BAA2B,EAC3B,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,yBAA0B,YAAW,sBAAsB;IAC1D,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM,aAAa;IAErD,QAAQ,CACZ,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAQjC,SAAS,CACb,GAAG,EAAE,SAAS,MAAM,EAAE,EACtB,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAS5B,SAAS,CACb,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAQjC,UAAU,CACd,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAS5B,UAAU,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,OAAO,CAAC,OAAO,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAS/E,wBAAwB,CAC5B,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,OAAO,CAAC,2BAA2B,EAAE,CAAC;IAUnC,kBAAkB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,2BAA2B,EAAE,CAAC;IAMnF,oBAAoB,CACxB,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,2BAA2B,GAAG,IAAI,CAAC;IAQxC,0BAA0B,CAC9B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC;IAQvC,oBAAoB,CACxB,gBAAgB,EAAE,SAAS,MAAM,EAAE,EACnC,IAAI,CAAC,EAAE,eAAe,GACrB,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAa7B,8BAA8B,CAClC,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,OAAO,CAAC,iCAAiC,EAAE,CAAC;IAQ/C;;;;;OAKG;IACG,8BAA8B,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAmB3F;AAgBD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,oBAAoB,CA2B7E;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,cAAc,GACtB,2BAA2B,CAW7B;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,oBAAoB,GACzB,0BAA0B,CAW5B;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,WAAW,GAAG,qBAAqB,CAQhF;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,oBAAoB,GAC7B,iCAAiC,CASnC"}
|
|
@@ -109,6 +109,26 @@ export class CatalogProductReadService {
|
|
|
109
109
|
});
|
|
110
110
|
return overrides.map(toCatalogProductValueOverrideRecord);
|
|
111
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Feature 148 — the products an attribute value selects, structurally (see
|
|
114
|
+
* the port). One statement over the product's own JSONB; the `jsonb` forms
|
|
115
|
+
* keep a stored string `"true"` from matching a boolean selection and a
|
|
116
|
+
* scalar from matching an array one.
|
|
117
|
+
*/
|
|
118
|
+
async listProductIdsByAttributeValue(query) {
|
|
119
|
+
const predicate = query.match === 'array'
|
|
120
|
+
? `jsonb_typeof(p.attribute_values -> ?) = 'array' and (p.attribute_values -> ?) @> jsonb_build_array(?::text)`
|
|
121
|
+
: query.match === 'boolean'
|
|
122
|
+
? `(p.attribute_values -> ?) = to_jsonb(?::boolean) and (p.attribute_values -> ?) is not null`
|
|
123
|
+
: `(p.attribute_values -> ?) = to_jsonb(?::text) and (p.attribute_values -> ?) is not null`;
|
|
124
|
+
const params = query.match === 'array'
|
|
125
|
+
? [query.key, query.key, query.value]
|
|
126
|
+
: query.match === 'boolean'
|
|
127
|
+
? [query.key, query.value === 'true', query.key]
|
|
128
|
+
: [query.key, query.value, query.key];
|
|
129
|
+
const rows = await this.emFactory().execute(`select p.id from products p where ${predicate}`, params);
|
|
130
|
+
return rows.map((row) => row.id);
|
|
131
|
+
}
|
|
112
132
|
}
|
|
113
133
|
/**
|
|
114
134
|
* `{}` by default — the wider read. `liveOnly` drops soft-deleted rows,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-product-read.service.js","sourceRoot":"","sources":["../../../src/backend/services/catalog-product-read.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"catalog-product-read.service.js","sourceRoot":"","sources":["../../../src/backend/services/catalog-product-read.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,6 +58,14 @@ export interface CatalogQueryContext {
|
|
|
58
58
|
* then to any available key.
|
|
59
59
|
*/
|
|
60
60
|
preferredLanguage?: string | undefined;
|
|
61
|
+
/**
|
|
62
|
+
* The currency this read is priced in (issue #249), already resolved by the
|
|
63
|
+
* route against the channel's own list (`resolveListingCurrency`). Absent
|
|
64
|
+
* means the channel's default. Every price, price ordering and price range on
|
|
65
|
+
* this service reads it through {@link CatalogQueryService.#viewerPricingContext},
|
|
66
|
+
* so a page cannot be priced in one currency and ordered in another.
|
|
67
|
+
*/
|
|
68
|
+
currency?: string | undefined;
|
|
61
69
|
}
|
|
62
70
|
/**
|
|
63
71
|
* The two reads a listing card needs beyond the product row and its price:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-query.service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/catalog-query.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAK3D,OAAO,KAAK,EACV,2BAA2B,EAC3B,oBAAoB,EACrB,MAAM,qCAAqC,CAAC;AAK7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAQpE,OAAO,
|
|
1
|
+
{"version":3,"file":"catalog-query.service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/catalog-query.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ import { BundleSlot } from '../entities/bundle-slot.entity.js';
|
|
|
13
13
|
import { BundleSlotOption } from '../entities/bundle-slot-option.entity.js';
|
|
14
14
|
import { resolvePrimaryAssetUrls } from './primary-asset-url.js';
|
|
15
15
|
import { viewerOrganizationFor } from './viewer-organization.js';
|
|
16
|
-
import { ERROR_CODES, isPriceSort, isProductVisibleTo, listingPriceMoney, } from '@endora-commerce/contracts';
|
|
16
|
+
import { ERROR_CODES, isPriceSort, isProductVisibleTo, listingPriceChannelContext, listingPriceMoney, } from '@endora-commerce/contracts';
|
|
17
17
|
import { HttpError } from '@endora-commerce/platform/http';
|
|
18
18
|
import { encodeCursor, decodeCursor } from '@endora-commerce/platform/http';
|
|
19
19
|
/** A category id as the database spells one — anything else is a 404, not a query. */
|
|
@@ -323,14 +323,14 @@ export class CatalogQueryService {
|
|
|
323
323
|
* for, so the anonymous request issues exactly the resolution it issued
|
|
324
324
|
* before and lands on exactly the cache entry it landed on before.
|
|
325
325
|
*/
|
|
326
|
-
async #listingPricesFor(products,
|
|
326
|
+
async #listingPricesFor(products, ctx) {
|
|
327
327
|
if (products.length === 0)
|
|
328
328
|
return new Map();
|
|
329
|
-
if (!(
|
|
329
|
+
if (!(ctx.resolvedChannel.isPublic ?? true))
|
|
330
330
|
return new Map();
|
|
331
331
|
return this.#requireListingPrices().resolveListingPrices({
|
|
332
332
|
products,
|
|
333
|
-
context: await this.#viewerPricingContext(
|
|
333
|
+
context: await this.#viewerPricingContext(ctx),
|
|
334
334
|
});
|
|
335
335
|
}
|
|
336
336
|
/**
|
|
@@ -343,15 +343,14 @@ export class CatalogQueryService {
|
|
|
343
343
|
* prevent, and it would be one forgotten argument away if each seam built its
|
|
344
344
|
* own context.
|
|
345
345
|
*/
|
|
346
|
-
async #viewerPricingContext(
|
|
346
|
+
async #viewerPricingContext(ctx) {
|
|
347
|
+
const { audience } = ctx;
|
|
347
348
|
const organization = audience.organizationId === null
|
|
348
349
|
? null
|
|
349
350
|
: await viewerOrganizationFor(this.#requireOrganizationDetails(), audience);
|
|
350
351
|
return {
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
defaultCurrency: channel?.defaultCurrency ?? 'PLN',
|
|
354
|
-
},
|
|
352
|
+
// Issue #249 — the currency the route resolved, or the channel default.
|
|
353
|
+
...listingPriceChannelContext(ctx.resolvedChannel, ctx.currency),
|
|
355
354
|
organization,
|
|
356
355
|
};
|
|
357
356
|
}
|
|
@@ -518,7 +517,7 @@ export class CatalogQueryService {
|
|
|
518
517
|
// Its asset and its category slugs are resolved the same way and for the
|
|
519
518
|
// same reason (issue #263): both helpers took an id list already, and both
|
|
520
519
|
// were being handed one id at a time from inside the loop.
|
|
521
|
-
const resolvedPrices = await this.#listingPricesFor(priceable,
|
|
520
|
+
const resolvedPrices = await this.#listingPricesFor(priceable, ctx);
|
|
522
521
|
const cardReads = await this.#listingCardReadsFor(em, priceable.map((p) => p.id));
|
|
523
522
|
const summaries = priceable.map((p) => this.toSummary(p, channel, ctx.preferredLanguage, resolvedPrices, cardReads));
|
|
524
523
|
return {
|
|
@@ -717,7 +716,7 @@ export class CatalogQueryService {
|
|
|
717
716
|
async #listByViewerPrice(em, params, ctx, where, sort) {
|
|
718
717
|
const channel = ctx.resolvedChannel;
|
|
719
718
|
const direction = sort === 'price' ? 'asc' : 'desc';
|
|
720
|
-
const context = await this.#viewerPricingContext(
|
|
719
|
+
const context = await this.#viewerPricingContext(ctx);
|
|
721
720
|
const amountRange = this.#amountRange(params);
|
|
722
721
|
const restrictToProductIds = params.categorySlug
|
|
723
722
|
? [...(await this.productIdsInCategoryTree(em, params.categorySlug))]
|
|
@@ -842,7 +841,7 @@ export class CatalogQueryService {
|
|
|
842
841
|
const hasMore = collected.length > params.limit;
|
|
843
842
|
const page = collected.slice(0, params.limit);
|
|
844
843
|
const nextCursor = hasMore && page.length > 0 ? encodeObjectCursor(cursors[params.limit - 1]) : null;
|
|
845
|
-
const resolvedPrices = await this.#listingPricesFor(page,
|
|
844
|
+
const resolvedPrices = await this.#listingPricesFor(page, ctx);
|
|
846
845
|
const cardReads = await this.#listingCardReadsFor(em, page.map((p) => p.id));
|
|
847
846
|
return {
|
|
848
847
|
data: page.map((p) => this.toSummary(p, channel, ctx.preferredLanguage, resolvedPrices, cardReads)),
|
|
@@ -909,7 +908,7 @@ export class CatalogQueryService {
|
|
|
909
908
|
const candidates = rows.filter((r) => visibleIds.has(r.id) &&
|
|
910
909
|
this.#passesPageFilters(r, params, ctx) &&
|
|
911
910
|
(categoryFilteredIds === null || categoryFilteredIds.has(r.id)));
|
|
912
|
-
const chunkPrices = await this.#listingPricesFor(candidates,
|
|
911
|
+
const chunkPrices = await this.#listingPricesFor(candidates, ctx);
|
|
913
912
|
for (const product of candidates) {
|
|
914
913
|
const price = chunkPrices.get(product.id);
|
|
915
914
|
if (price === undefined || price.source !== 'price_list')
|
|
@@ -990,7 +989,7 @@ export class CatalogQueryService {
|
|
|
990
989
|
if (!isProductVisibleTo(product, ctx.audience)) {
|
|
991
990
|
throw new HttpError(404, ERROR_CODES.PRODUCT_NOT_FOUND, 'Product not found.');
|
|
992
991
|
}
|
|
993
|
-
const summary = this.toSummary(product, channel, ctx.preferredLanguage, await this.#listingPricesFor([product],
|
|
992
|
+
const summary = this.toSummary(product, channel, ctx.preferredLanguage, await this.#listingPricesFor([product], ctx), await this.#listingCardReadsFor(em, [product.id]));
|
|
994
993
|
// Categories
|
|
995
994
|
const categoryRows = await em.execute(`select category_id from product_categories where product_id = ?`, [product.id]);
|
|
996
995
|
const categoryIds = categoryRows.map((r) => r.category_id);
|
|
@@ -1281,7 +1280,7 @@ export class CatalogQueryService {
|
|
|
1281
1280
|
// -> legacy product_assets first row. One helper, shared with `toSummary`
|
|
1282
1281
|
// and `ProductLinkService`, so the chain and the port call have one home.
|
|
1283
1282
|
const assetUrlByProduct = await resolvePrimaryAssetUrls(em, this.#requireAssets(), ids);
|
|
1284
|
-
const resolvedPrices = await this.#listingPricesFor(products,
|
|
1283
|
+
const resolvedPrices = await this.#listingPricesFor(products, ctx);
|
|
1285
1284
|
for (const p of products) {
|
|
1286
1285
|
const price = this.#summaryPrice(resolvedPrices, p.id);
|
|
1287
1286
|
result.set(p.id, {
|