@infrab4a/connect-angular 4.0.0-beta.37 → 4.0.0-beta.39
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/esm2020/services/catalog/catalog.service.mjs +6 -4
- package/esm2020/services/catalog/category.service.mjs +4 -9
- package/fesm2015/infrab4a-connect-angular.mjs +8 -11
- package/fesm2015/infrab4a-connect-angular.mjs.map +1 -1
- package/fesm2020/infrab4a-connect-angular.mjs +8 -11
- package/fesm2020/infrab4a-connect-angular.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -8,7 +8,7 @@ export class CatalogService {
|
|
|
8
8
|
this.productRepository = productRepository;
|
|
9
9
|
this.categoryStructureAdapter = categoryStructureAdapter;
|
|
10
10
|
this.shop = shop;
|
|
11
|
-
this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, }) => {
|
|
11
|
+
this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, customOptions, }) => {
|
|
12
12
|
const filters = {};
|
|
13
13
|
if (clubDiscount?.length)
|
|
14
14
|
set(filters, 'price.subscriberDiscountPercentage', { operator: Where.IN, value: clubDiscount });
|
|
@@ -23,13 +23,15 @@ export class CatalogService {
|
|
|
23
23
|
};
|
|
24
24
|
if (prices?.min || prices?.max)
|
|
25
25
|
set(filters, prices.subscriberPrice ? 'price.subscriberPrice' : 'price.price', [
|
|
26
|
-
...(prices.min ? [{ operator: Where.GTE, value: prices.min }] : []),
|
|
27
|
-
...(prices.max ? [{ operator: Where.LTE, value: prices.max }] : []),
|
|
26
|
+
...(prices.min ? [{ operator: Where.GTE, value: Math.round(prices.min) }] : []),
|
|
27
|
+
...(prices.max ? [{ operator: Where.LTE, value: Math.ceil(prices.max) }] : []),
|
|
28
28
|
]);
|
|
29
29
|
if (rate)
|
|
30
30
|
filters.rate = { operator: Where.GTE, value: rate };
|
|
31
31
|
if (tags?.length)
|
|
32
32
|
filters.tags = { operator: Where.LIKE, value: tags };
|
|
33
|
+
if (customOptions?.length)
|
|
34
|
+
filters.filters = { operator: Where.LIKE, value: customOptions };
|
|
33
35
|
return filters;
|
|
34
36
|
};
|
|
35
37
|
this.buildSortQuery = (sort) => {
|
|
@@ -93,4 +95,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
93
95
|
type: Inject,
|
|
94
96
|
args: [DEFAULT_SHOP]
|
|
95
97
|
}] }]; } });
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"catalog.service.js","sourceRoot":"","sources":["../../../../../projects/connect-angular/src/services/catalog/catalog.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core'\r\nimport {\r\n  Category,\r\n  Product,\r\n  ProductGender,\r\n  ProductRepository,\r\n  RepositoryFindFielters,\r\n  RepositoryOrderBy,\r\n  RoundProductPricesHelper,\r\n  set,\r\n  Shops,\r\n  Where,\r\n} from '@infrab4a/connect'\r\nimport { CATEGORY_STRUCTURE, DEFAULT_SHOP } from '../../consts'\r\nimport { CategoryStructureAdapter } from './adapters'\r\nimport { ProductSort } from './types/product-sort.type'\r\n\r\ntype FetchProductsFilters = {\r\n  clubDiscount?: number[]\r\n  brands?: string[]\r\n  prices?: { min?: number; max?: number; subscriberPrice?: boolean }\r\n  gender?: ProductGender[]\r\n  rate?: number\r\n  tags?: []\r\n  customOptions?: string[]\r\n}\r\n\r\ntype FetchProductsOptions = {\r\n  page?: number\r\n  perPage?: number\r\n  filters?: FetchProductsFilters\r\n  sort?: ProductSort\r\n  mainGender?: ProductGender\r\n}\r\n\r\ntype FetchProductsResponse = {\r\n  products: { data: Product[]; total: number }\r\n  pages: number\r\n  prices: {\r\n    price: { min: number; max: number }\r\n    subscriberPrice: { min: number; max: number }\r\n  }\r\n}\r\n\r\n@Injectable()\r\nexport class CatalogService {\r\n  constructor(\r\n    @Inject('ProductRepository') private readonly productRepository: ProductRepository,\r\n    @Inject(CATEGORY_STRUCTURE) private readonly categoryStructureAdapter: CategoryStructureAdapter,\r\n    @Inject(DEFAULT_SHOP) private readonly shop: Shops,\r\n  ) {}\r\n\r\n  async fetchProducts(category: Category, options?: FetchProductsOptions): Promise<FetchProductsResponse> {\r\n    const limits = this.buildLimitQuery(options)\r\n\r\n    return await this.productRepository\r\n      .findCatalog(\r\n        {\r\n          filters: {\r\n            ...(await this.categoryStructureAdapter.buildProductFilterByCategory(category)),\r\n            ...this.buildFilterQuery(options?.filters || {}),\r\n          },\r\n          ...(options?.sort ? { orderBy: this.buildSortQuery(options?.sort) } : {}),\r\n          limits,\r\n          options: { minimal: ['price'], maximum: ['price'] },\r\n        },\r\n        options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female',\r\n      )\r\n      .then(({ data, count: total, maximum, minimal }) => ({\r\n        products: { data: data.map((product) => RoundProductPricesHelper.roundProductPrices(product)), total },\r\n        pages: Math.ceil(total / limits.limit),\r\n        prices: {\r\n          price: { min: +minimal?.price?.price?.toFixed(2), max: +maximum?.price?.price?.toFixed(2) },\r\n          subscriberPrice: {\r\n            min: +minimal?.price?.subscriberPrice?.toFixed(2),\r\n            max: +maximum?.price?.subscriberPrice?.toFixed(2),\r\n          },\r\n        },\r\n      }))\r\n  }\r\n\r\n  private buildFilterQuery = ({\r\n    clubDiscount,\r\n    brands,\r\n    prices,\r\n    gender,\r\n    tags,\r\n    rate,\r\n  }: FetchProductsFilters): RepositoryFindFielters<Product> => {\r\n    const filters = {} as RepositoryFindFielters<Product>\r\n\r\n    if (clubDiscount?.length)\r\n      set(filters, 'price.subscriberDiscountPercentage', { operator: Where.IN, value: clubDiscount })\r\n    if (brands?.length) filters.brand = { operator: Where.IN, value: brands }\r\n    if (gender?.length)\r\n      filters.tags = {\r\n        operator: Where.IN,\r\n        value: gender\r\n          .map((genderOptions) =>\r\n            genderOptions === 'female' ? 'feminino' : genderOptions === 'male' ? 'masculino' : null,\r\n          )\r\n          .filter(Boolean),\r\n      }\r\n    if (prices?.min || prices?.max)\r\n      set(filters, prices.subscriberPrice ? 'price.subscriberPrice' : 'price.price', [\r\n        ...(prices.min ? [{ operator: Where.GTE, value: prices.min }] : []),\r\n        ...(prices.max ? [{ operator: Where.LTE, value: prices.max }] : []),\r\n      ])\r\n    if (rate) filters.rate = { operator: Where.GTE, value: rate }\r\n    if (tags?.length) filters.tags = { operator: Where.LIKE, value: tags }\r\n\r\n    return filters\r\n  }\r\n\r\n  private buildSortQuery = (sort: ProductSort): RepositoryOrderBy<Product> => {\r\n    if (!sort || sort === 'most-relevant') return {}\r\n\r\n    if (sort === 'best-sellers') return { shoppingCount: 'desc' }\r\n    if (sort === 'biggest-price') return { price: 'desc' }\r\n    if (sort === 'lowest-price') return { price: 'asc' }\r\n    if (sort === 'best-rating') return { rate: 'desc' }\r\n    if (sort === 'news') return { createdAt: 'desc' }\r\n  }\r\n\r\n  private buildLimitQuery = (options: { page?: number; perPage?: number }): { limit?: number; offset?: number } => {\r\n    const limit = options?.perPage || 20\r\n\r\n    return {\r\n      limit,\r\n      offset: ((options?.page || 1) - 1) * limit,\r\n    }\r\n  }\r\n}\r\n"]}
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"catalog.service.js","sourceRoot":"","sources":["../../../../../projects/connect-angular/src/services/catalog/catalog.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core'\r\nimport {\r\n  Category,\r\n  Product,\r\n  ProductGender,\r\n  ProductRepository,\r\n  RepositoryFindFielters,\r\n  RepositoryOrderBy,\r\n  RoundProductPricesHelper,\r\n  set,\r\n  Shops,\r\n  Where,\r\n} from '@infrab4a/connect'\r\nimport { CATEGORY_STRUCTURE, DEFAULT_SHOP } from '../../consts'\r\nimport { CategoryStructureAdapter } from './adapters'\r\nimport { ProductSort } from './types/product-sort.type'\r\n\r\ntype FetchProductsFilters = {\r\n  clubDiscount?: number[]\r\n  brands?: string[]\r\n  prices?: { min?: number; max?: number; subscriberPrice?: boolean }\r\n  gender?: ProductGender[]\r\n  rate?: number\r\n  tags?: []\r\n  customOptions?: string[]\r\n}\r\n\r\ntype FetchProductsOptions = {\r\n  page?: number\r\n  perPage?: number\r\n  filters?: FetchProductsFilters\r\n  sort?: ProductSort\r\n  mainGender?: ProductGender\r\n}\r\n\r\ntype FetchProductsResponse = {\r\n  products: { data: Product[]; total: number }\r\n  pages: number\r\n  prices: {\r\n    price: { min: number; max: number }\r\n    subscriberPrice: { min: number; max: number }\r\n  }\r\n}\r\n\r\n@Injectable()\r\nexport class CatalogService {\r\n  constructor(\r\n    @Inject('ProductRepository') private readonly productRepository: ProductRepository,\r\n    @Inject(CATEGORY_STRUCTURE) private readonly categoryStructureAdapter: CategoryStructureAdapter,\r\n    @Inject(DEFAULT_SHOP) private readonly shop: Shops,\r\n  ) {}\r\n\r\n  async fetchProducts(category: Category, options?: FetchProductsOptions): Promise<FetchProductsResponse> {\r\n    const limits = this.buildLimitQuery(options)\r\n\r\n    return await this.productRepository\r\n      .findCatalog(\r\n        {\r\n          filters: {\r\n            ...(await this.categoryStructureAdapter.buildProductFilterByCategory(category)),\r\n            ...this.buildFilterQuery(options?.filters || {}),\r\n          },\r\n          ...(options?.sort ? { orderBy: this.buildSortQuery(options?.sort) } : {}),\r\n          limits,\r\n          options: { minimal: ['price'], maximum: ['price'] },\r\n        },\r\n        options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female',\r\n      )\r\n      .then(({ data, count: total, maximum, minimal }) => ({\r\n        products: { data: data.map((product) => RoundProductPricesHelper.roundProductPrices(product)), total },\r\n        pages: Math.ceil(total / limits.limit),\r\n        prices: {\r\n          price: { min: +minimal?.price?.price?.toFixed(2), max: +maximum?.price?.price?.toFixed(2) },\r\n          subscriberPrice: {\r\n            min: +minimal?.price?.subscriberPrice?.toFixed(2),\r\n            max: +maximum?.price?.subscriberPrice?.toFixed(2),\r\n          },\r\n        },\r\n      }))\r\n  }\r\n\r\n  private buildFilterQuery = ({\r\n    clubDiscount,\r\n    brands,\r\n    prices,\r\n    gender,\r\n    tags,\r\n    rate,\r\n    customOptions,\r\n  }: FetchProductsFilters): RepositoryFindFielters<Product> => {\r\n    const filters = {} as RepositoryFindFielters<Product>\r\n\r\n    if (clubDiscount?.length)\r\n      set(filters, 'price.subscriberDiscountPercentage', { operator: Where.IN, value: clubDiscount })\r\n    if (brands?.length) filters.brand = { operator: Where.IN, value: brands }\r\n    if (gender?.length)\r\n      filters.tags = {\r\n        operator: Where.IN,\r\n        value: gender\r\n          .map((genderOptions) =>\r\n            genderOptions === 'female' ? 'feminino' : genderOptions === 'male' ? 'masculino' : null,\r\n          )\r\n          .filter(Boolean),\r\n      }\r\n    if (prices?.min || prices?.max)\r\n      set(filters, prices.subscriberPrice ? 'price.subscriberPrice' : 'price.price', [\r\n        ...(prices.min ? [{ operator: Where.GTE, value: Math.round(prices.min) }] : []),\r\n        ...(prices.max ? [{ operator: Where.LTE, value: Math.ceil(prices.max) }] : []),\r\n      ])\r\n    if (rate) filters.rate = { operator: Where.GTE, value: rate }\r\n    if (tags?.length) filters.tags = { operator: Where.LIKE, value: tags }\r\n    if (customOptions?.length) filters.filters = { operator: Where.LIKE, value: customOptions }\r\n\r\n    return filters\r\n  }\r\n\r\n  private buildSortQuery = (sort: ProductSort): RepositoryOrderBy<Product> => {\r\n    if (!sort || sort === 'most-relevant') return {}\r\n\r\n    if (sort === 'best-sellers') return { shoppingCount: 'desc' }\r\n    if (sort === 'biggest-price') return { price: 'desc' }\r\n    if (sort === 'lowest-price') return { price: 'asc' }\r\n    if (sort === 'best-rating') return { rate: 'desc' }\r\n    if (sort === 'news') return { createdAt: 'desc' }\r\n  }\r\n\r\n  private buildLimitQuery = (options: { page?: number; perPage?: number }): { limit?: number; offset?: number } => {\r\n    const limit = options?.perPage || 20\r\n\r\n    return {\r\n      limit,\r\n      offset: ((options?.page || 1) - 1) * limit,\r\n    }\r\n  }\r\n}\r\n"]}
|
|
@@ -23,14 +23,9 @@ export class CategoryService {
|
|
|
23
23
|
.then(({ data }) => data.filter((category) => brands.includes(category.conditions.brand)));
|
|
24
24
|
}
|
|
25
25
|
async fetchFilterOptions(category, filters) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.find({ filters: { categoryId: +category.id } })
|
|
30
|
-
.then(({ data }) => data.map((categoryFilter) => categoryFilter.filter));
|
|
31
|
-
return filters?.length
|
|
32
|
-
? categoryFilters.filter((categoryFilter) => !filters || !filters.length || categoryFilter.options.some((option) => filters.includes(option.id)))
|
|
33
|
-
: categoryFilters;
|
|
26
|
+
return await this.categoryFilterRepository
|
|
27
|
+
.find({ filters: { categoryId: +category.id } })
|
|
28
|
+
.then(({ data }) => data.map((categoryFilter) => categoryFilter.filter));
|
|
34
29
|
}
|
|
35
30
|
}
|
|
36
31
|
CategoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CategoryService, deps: [{ token: 'ProductRepository' }, { token: 'CategoryRepository' }, { token: 'CategoryFilterRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -53,4 +48,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
53
48
|
type: Inject,
|
|
54
49
|
args: [DEFAULT_SHOP]
|
|
55
50
|
}] }]; } });
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2F0ZWdvcnkuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Nvbm5lY3QtYW5ndWxhci9zcmMvc2VydmljZXMvY2F0YWxvZy9jYXRlZ29yeS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQ2xELE9BQU8sRUFPTCxLQUFLLEdBQ04sTUFBTSxtQkFBbUIsQ0FBQTtBQUMxQixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsWUFBWSxFQUFFLE1BQU0sY0FBYyxDQUFBOzs7QUFJL0QsTUFBTSxPQUFPLGVBQWU7SUFDMUIsWUFDZ0QsaUJBQW9DLEVBQ25DLGtCQUFzQyxFQUNoQyx3QkFBa0QsRUFDMUQsd0JBQWtELEVBQ3hELElBQVc7UUFKSixzQkFBaUIsR0FBakIsaUJBQWlCLENBQW1CO1FBQ25DLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDaEMsNkJBQXdCLEdBQXhCLHdCQUF3QixDQUEwQjtRQUMxRCw2QkFBd0IsR0FBeEIsd0JBQXdCLENBQTBCO1FBQ3hELFNBQUksR0FBSixJQUFJLENBQU87SUFDakQsQ0FBQztJQUVKLEtBQUssQ0FBQyxXQUFXLENBQUMsUUFBa0IsRUFBRSxVQUEwQjtRQUM5RCxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUI7YUFDeEMsV0FBVyxDQUNWO1lBQ0UsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDLHdCQUF3QixDQUFDLDRCQUE0QixDQUFDLFFBQVEsQ0FBQztZQUNuRixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUM7U0FDbEIsRUFDRCxVQUFVLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FDakU7YUFDQSxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FDakIsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUNoSCxDQUFBO1FBRUgsT0FBTyxJQUFJLENBQUMsa0JBQWtCO2FBQzNCLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQzthQUNwRSxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlGLENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsUUFBa0IsRUFBRSxPQUFrQjtRQUM3RCxPQUFPLE1BQU0sSUFBSSxDQUFDLHdCQUF3QjthQUN2QyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsRUFBRSxVQUFVLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQzthQUMvQyxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUM1RSxDQUFDOzs0R0EvQlUsZUFBZSxrQkFFaEIsbUJBQW1CLGFBQ25CLG9CQUFvQixhQUNwQiwwQkFBMEIsYUFDMUIsa0JBQWtCLGFBQ2xCLFlBQVk7Z0hBTlgsZUFBZTsyRkFBZixlQUFlO2tCQUQzQixVQUFVOzswQkFHTixNQUFNOzJCQUFDLG1CQUFtQjs7MEJBQzFCLE1BQU07MkJBQUMsb0JBQW9COzswQkFDM0IsTUFBTTsyQkFBQywwQkFBMEI7OzBCQUNqQyxNQUFNOzJCQUFDLGtCQUFrQjs7MEJBQ3pCLE1BQU07MkJBQUMsWUFBWSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnXHJcbmltcG9ydCB7XHJcbiAgQ2F0ZWdvcnksXHJcbiAgQ2F0ZWdvcnlGaWx0ZXJSZXBvc2l0b3J5LFxyXG4gIENhdGVnb3J5UmVwb3NpdG9yeSxcclxuICBGaWx0ZXIsXHJcbiAgUHJvZHVjdEdlbmRlcixcclxuICBQcm9kdWN0UmVwb3NpdG9yeSxcclxuICBTaG9wcyxcclxufSBmcm9tICdAaW5mcmFiNGEvY29ubmVjdCdcclxuaW1wb3J0IHsgQ0FURUdPUllfU1RSVUNUVVJFLCBERUZBVUxUX1NIT1AgfSBmcm9tICcuLi8uLi9jb25zdHMnXHJcbmltcG9ydCB7IENhdGVnb3J5U3RydWN0dXJlQWRhcHRlciB9IGZyb20gJy4vYWRhcHRlcnMnXHJcblxyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBDYXRlZ29yeVNlcnZpY2Uge1xyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgQEluamVjdCgnUHJvZHVjdFJlcG9zaXRvcnknKSBwcml2YXRlIHJlYWRvbmx5IHByb2R1Y3RSZXBvc2l0b3J5OiBQcm9kdWN0UmVwb3NpdG9yeSxcclxuICAgIEBJbmplY3QoJ0NhdGVnb3J5UmVwb3NpdG9yeScpIHByaXZhdGUgcmVhZG9ubHkgY2F0ZWdvcnlSZXBvc2l0b3J5OiBDYXRlZ29yeVJlcG9zaXRvcnksXHJcbiAgICBASW5qZWN0KCdDYXRlZ29yeUZpbHRlclJlcG9zaXRvcnknKSBwcml2YXRlIHJlYWRvbmx5IGNhdGVnb3J5RmlsdGVyUmVwb3NpdG9yeTogQ2F0ZWdvcnlGaWx0ZXJSZXBvc2l0b3J5LFxyXG4gICAgQEluamVjdChDQVRFR09SWV9TVFJVQ1RVUkUpIHByaXZhdGUgcmVhZG9ubHkgY2F0ZWdvcnlTdHJ1Y3R1cmVBZGFwdGVyOiBDYXRlZ29yeVN0cnVjdHVyZUFkYXB0ZXIsXHJcbiAgICBASW5qZWN0KERFRkFVTFRfU0hPUCkgcHJpdmF0ZSByZWFkb25seSBzaG9wOiBTaG9wcyxcclxuICApIHt9XHJcblxyXG4gIGFzeW5jIGZldGNoQnJhbmRzKGNhdGVnb3J5OiBDYXRlZ29yeSwgbWFpbkdlbmRlcj86IFByb2R1Y3RHZW5kZXIpOiBQcm9taXNlPENhdGVnb3J5W10+IHtcclxuICAgIGNvbnN0IGJyYW5kcyA9IGF3YWl0IHRoaXMucHJvZHVjdFJlcG9zaXRvcnlcclxuICAgICAgLmZpbmRDYXRhbG9nKFxyXG4gICAgICAgIHtcclxuICAgICAgICAgIGZpbHRlcnM6IGF3YWl0IHRoaXMuY2F0ZWdvcnlTdHJ1Y3R1cmVBZGFwdGVyLmJ1aWxkUHJvZHVjdEZpbHRlckJ5Q2F0ZWdvcnkoY2F0ZWdvcnkpLFxyXG4gICAgICAgICAgZmllbGRzOiBbJ2JyYW5kJ10sXHJcbiAgICAgICAgfSxcclxuICAgICAgICBtYWluR2VuZGVyIHx8IHRoaXMuc2hvcCA9PT0gU2hvcHMuTUVOU01BUktFVCA/ICdtYWxlJyA6ICdmZW1hbGUnLFxyXG4gICAgICApXHJcbiAgICAgIC50aGVuKCh7IGRhdGEgfSkgPT5cclxuICAgICAgICBPYmplY3Qua2V5cyhkYXRhLm1hcCgocHJvZHVjdCkgPT4gcHJvZHVjdC5icmFuZCkucmVkdWNlKChicmFuZHMsIGJyYW5kKSA9PiAoeyAuLi5icmFuZHMsIFticmFuZF06IHRydWUgfSksIHt9KSksXHJcbiAgICAgIClcclxuXHJcbiAgICByZXR1cm4gdGhpcy5jYXRlZ29yeVJlcG9zaXRvcnlcclxuICAgICAgLmZpbmQoeyBmaWx0ZXJzOiB7IGJyYW5kQ2F0ZWdvcnk6IHRydWUgfSwgb3JkZXJCeTogeyBuYW1lOiAnYXNjJyB9IH0pXHJcbiAgICAgIC50aGVuKCh7IGRhdGEgfSkgPT4gZGF0YS5maWx0ZXIoKGNhdGVnb3J5KSA9PiBicmFuZHMuaW5jbHVkZXMoY2F0ZWdvcnkuY29uZGl0aW9ucy5icmFuZCkpKVxyXG4gIH1cclxuXHJcbiAgYXN5bmMgZmV0Y2hGaWx0ZXJPcHRpb25zKGNhdGVnb3J5OiBDYXRlZ29yeSwgZmlsdGVycz86IHN0cmluZ1tdKTogUHJvbWlzZTxGaWx0ZXJbXT4ge1xyXG4gICAgcmV0dXJuIGF3YWl0IHRoaXMuY2F0ZWdvcnlGaWx0ZXJSZXBvc2l0b3J5XHJcbiAgICAgIC5maW5kKHsgZmlsdGVyczogeyBjYXRlZ29yeUlkOiArY2F0ZWdvcnkuaWQgfSB9KVxyXG4gICAgICAudGhlbigoeyBkYXRhIH0pID0+IGRhdGEubWFwKChjYXRlZ29yeUZpbHRlcikgPT4gY2F0ZWdvcnlGaWx0ZXIuZmlsdGVyKSlcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -1434,7 +1434,7 @@ class CatalogService {
|
|
|
1434
1434
|
this.productRepository = productRepository;
|
|
1435
1435
|
this.categoryStructureAdapter = categoryStructureAdapter;
|
|
1436
1436
|
this.shop = shop;
|
|
1437
|
-
this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, }) => {
|
|
1437
|
+
this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, customOptions, }) => {
|
|
1438
1438
|
const filters = {};
|
|
1439
1439
|
if (clubDiscount === null || clubDiscount === void 0 ? void 0 : clubDiscount.length)
|
|
1440
1440
|
set(filters, 'price.subscriberDiscountPercentage', { operator: Where.IN, value: clubDiscount });
|
|
@@ -1449,13 +1449,15 @@ class CatalogService {
|
|
|
1449
1449
|
};
|
|
1450
1450
|
if ((prices === null || prices === void 0 ? void 0 : prices.min) || (prices === null || prices === void 0 ? void 0 : prices.max))
|
|
1451
1451
|
set(filters, prices.subscriberPrice ? 'price.subscriberPrice' : 'price.price', [
|
|
1452
|
-
...(prices.min ? [{ operator: Where.GTE, value: prices.min }] : []),
|
|
1453
|
-
...(prices.max ? [{ operator: Where.LTE, value: prices.max }] : []),
|
|
1452
|
+
...(prices.min ? [{ operator: Where.GTE, value: Math.round(prices.min) }] : []),
|
|
1453
|
+
...(prices.max ? [{ operator: Where.LTE, value: Math.ceil(prices.max) }] : []),
|
|
1454
1454
|
]);
|
|
1455
1455
|
if (rate)
|
|
1456
1456
|
filters.rate = { operator: Where.GTE, value: rate };
|
|
1457
1457
|
if (tags === null || tags === void 0 ? void 0 : tags.length)
|
|
1458
1458
|
filters.tags = { operator: Where.LIKE, value: tags };
|
|
1459
|
+
if (customOptions === null || customOptions === void 0 ? void 0 : customOptions.length)
|
|
1460
|
+
filters.filters = { operator: Where.LIKE, value: customOptions };
|
|
1459
1461
|
return filters;
|
|
1460
1462
|
};
|
|
1461
1463
|
this.buildSortQuery = (sort) => {
|
|
@@ -1542,14 +1544,9 @@ class CategoryService {
|
|
|
1542
1544
|
}
|
|
1543
1545
|
fetchFilterOptions(category, filters) {
|
|
1544
1546
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1545
|
-
|
|
1546
|
-
|
|
1547
|
-
|
|
1548
|
-
.find({ filters: { categoryId: +category.id } })
|
|
1549
|
-
.then(({ data }) => data.map((categoryFilter) => categoryFilter.filter));
|
|
1550
|
-
return (filters === null || filters === void 0 ? void 0 : filters.length)
|
|
1551
|
-
? categoryFilters.filter((categoryFilter) => !filters || !filters.length || categoryFilter.options.some((option) => filters.includes(option.id)))
|
|
1552
|
-
: categoryFilters;
|
|
1547
|
+
return yield this.categoryFilterRepository
|
|
1548
|
+
.find({ filters: { categoryId: +category.id } })
|
|
1549
|
+
.then(({ data }) => data.map((categoryFilter) => categoryFilter.filter));
|
|
1553
1550
|
});
|
|
1554
1551
|
}
|
|
1555
1552
|
}
|