@infrab4a/connect-angular 3.10.6 → 3.11.0

package/angular-connect.module.d.ts

@@ -3,9 +3,10 @@ import { AngularFireModule, FirebaseAppConfig, FirebaseOptions } from '@angular/
 import { AxiosElasticSearchConfig, Shops } from '@infrab4a/connect';
 import { HasuraGraphQLOptions } from './angular-hasura-graphql.module';
 import * as i0 from "@angular/core";
-import * as i1 from "@angular/fire";
-import * as i2 from "./angular-firestore.module";
-import * as i3 from "./angular-hasura-graphql.module";
+import * as i1 from "./angular-elastic-search.module";
+import * as i2 from "@angular/fire";
+import * as i3 from "./angular-firestore.module";
+import * as i4 from "./angular-hasura-graphql.module";
 export declare class AngularConnectModule {
     static initializeApp(defaultShop: Shops, options: {
         firebase: FirebaseOptions;
@@ -15,6 +16,6 @@ export declare class AngularConnectModule {
         oldCategoryStructure?: boolean;
     }, nameOrConfig?: string | FirebaseAppConfig): ModuleWithProviders<AngularFireModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<AngularConnectModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AngularConnectModule, never, [typeof i1.AngularFireModule, typeof i2.AngularFirestoreModule, typeof i3.AngularHasuraGraphQLModule], never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AngularConnectModule, never, [typeof i1.AngularElasticSeachModule, typeof i2.AngularFireModule, typeof i3.AngularFirestoreModule, typeof i4.AngularHasuraGraphQLModule], never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AngularConnectModule>;
 }

package/bundles/infrab4a-connect-angular.umd.js

@@ -1861,10 +1861,11 @@
         } });
 
     var CatalogService = /** @class */ (function () {
-        function CatalogService(productRepository, categoryStructureAdapter, shop) {
+        function CatalogService(productRepository, categoryStructureAdapter, shop, productIndex) {
             this.productRepository = productRepository;
             this.categoryStructureAdapter = categoryStructureAdapter;
             this.shop = shop;
+            this.productIndex = productIndex;
             this.buildFilterQuery = function (_j) {
                 var clubDiscount = _j.clubDiscount, brands = _j.brands, prices = _j.prices, gender = _j.gender, tags = _j.tags, rate = _j.rate, customOptions = _j.customOptions;
                 var filters = {};
@@ -1910,47 +1911,89 @@
                     offset: (((options === null || options === void 0 ? void 0 : options.page) || 1) - 1) * limit,
                 };
             };
+            this.hasProfile = function (options) { return 'profile' in options; };
+            this.hasTerm = function (options) { return 'term' in options; };
+            this.hasCategory = function (options) { return 'category' in options; };
         }
-        CatalogService.prototype.fetchProducts = function (category, options) {
+        CatalogService.prototype.fetchProducts = function (options) {
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var limits, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
-                return __generator(this, function (_w) {
-                    switch (_w.label) {
+                var limits;
+                return __generator(this, function (_j) {
+                    switch (_j.label) {
                         case 0:
                             limits = this.buildLimitQuery(options);
-                            _k = (_j = this.productRepository)
-                                .findCatalog;
+                            if (this.hasProfile(options) && ((_a = options.filters) === null || _a === void 0 ? void 0 : _a.customOptions))
+                                throw new i1.InvalidArgumentError("It couldn't filled customOptions when profile is given");
+                            if (this.hasProfile(options) && ((_b = options.filters) === null || _b === void 0 ? void 0 : _b.tags))
+                                throw new i1.InvalidArgumentError("It couldn't filled tags when profile is given");
+                            if (this.hasTerm(options) && ((_c = options.filters) === null || _c === void 0 ? void 0 : _c.customOptions))
+                                throw new i1.InvalidArgumentError("It couldn't filled customOptions when term is given");
+                            return [4 /*yield*/, this.findCatalog(options, limits).then(function (_j) {
+                                    var data = _j.data, total = _j.count, maximum = _j.maximum, minimal = _j.minimal, distinct = _j.distinct;
+                                    var _a, _b, _c, _d, _e, _f, _g, _h;
+                                    return ({
+                                        products: { data: data.map(function (product) { return i1.RoundProductPricesHelper.roundProductPrices(product); }), total: total },
+                                        pages: Math.ceil(total / limits.limit),
+                                        prices: {
+                                            price: { min: +((_b = (_a = minimal === null || minimal === void 0 ? void 0 : minimal.price) === null || _a === void 0 ? void 0 : _a.price) === null || _b === void 0 ? void 0 : _b.toFixed(2)), max: +((_d = (_c = maximum === null || maximum === void 0 ? void 0 : maximum.price) === null || _c === void 0 ? void 0 : _c.price) === null || _d === void 0 ? void 0 : _d.toFixed(2)) },
+                                            subscriberPrice: {
+                                                min: +((_f = (_e = minimal === null || minimal === void 0 ? void 0 : minimal.price) === null || _e === void 0 ? void 0 : _e.subscriberPrice) === null || _f === void 0 ? void 0 : _f.toFixed(2)),
+                                                max: +((_h = (_g = maximum === null || maximum === void 0 ? void 0 : maximum.price) === null || _g === void 0 ? void 0 : _g.subscriberPrice) === null || _h === void 0 ? void 0 : _h.toFixed(2)),
+                                            },
+                                        },
+                                        brands: distinct === null || distinct === void 0 ? void 0 : distinct.brand,
+                                    });
+                                })];
+                        case 1: return [2 /*return*/, _j.sent()];
+                    }
+                });
+            });
+        };
+        CatalogService.prototype.findCatalog = function (options, limits) {
+            return __awaiter(this, void 0, void 0, function () {
+                var repoParams, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+                return __generator(this, function (_u) {
+                    switch (_u.label) {
+                        case 0:
+                            _k = (_j = Object).assign;
                             _m = (_l = Object).assign;
-                            _p = (_o = Object).assign;
-                            _q = {};
+                            _o = {};
+                            _q = (_p = Object).assign;
                             _s = (_r = Object).assign;
-                            _u = (_t = Object).assign;
-                            _v = [{}];
-                            return [4 /*yield*/, this.categoryStructureAdapter.buildProductFilterByCategory(category)];
-                        case 1: return [4 /*yield*/, _k.apply(_j, [_m.apply(_l, [_p.apply(_o, [(_q.filters = _s.apply(_r, [_u.apply(_t, _v.concat([(_w.sent())])), this.buildFilterQuery((options === null || options === void 0 ? void 0 : options.filters) || {})]), _q), ((options === null || options === void 0 ? void 0 : options.sort) ? { orderBy: this.buildSortQuery(options === null || options === void 0 ? void 0 : options.sort) } : {})]), { limits: limits, options: { minimal: ['price'], maximum: ['price'] } }]), (options === null || options === void 0 ? void 0 : options.mainGender) || this.shop === i1.Shops.MENSMARKET ? 'male' : 'female'])
-                                .then(function (_j) {
-                                var data = _j.data, total = _j.count, maximum = _j.maximum, minimal = _j.minimal;
-                                var _a, _b, _c, _d, _e, _f, _g, _h;
-                                return ({
-                                    products: { data: data.map(function (product) { return i1.RoundProductPricesHelper.roundProductPrices(product); }), total: total },
-                                    pages: Math.ceil(total / limits.limit),
-                                    prices: {
-                                        price: { min: +((_b = (_a = minimal === null || minimal === void 0 ? void 0 : minimal.price) === null || _a === void 0 ? void 0 : _a.price) === null || _b === void 0 ? void 0 : _b.toFixed(2)), max: +((_d = (_c = maximum === null || maximum === void 0 ? void 0 : maximum.price) === null || _c === void 0 ? void 0 : _c.price) === null || _d === void 0 ? void 0 : _d.toFixed(2)) },
-                                        subscriberPrice: {
-                                            min: +((_f = (_e = minimal === null || minimal === void 0 ? void 0 : minimal.price) === null || _e === void 0 ? void 0 : _e.subscriberPrice) === null || _f === void 0 ? void 0 : _f.toFixed(2)),
-                                            max: +((_h = (_g = maximum === null || maximum === void 0 ? void 0 : maximum.price) === null || _g === void 0 ? void 0 : _g.subscriberPrice) === null || _h === void 0 ? void 0 : _h.toFixed(2)),
-                                        },
-                                    },
-                                });
-                            })];
-                        case 2: return [2 /*return*/, _w.sent()];
+                            _t = [{}];
+                            return [4 /*yield*/, this.buildMainFilter(options)];
+                        case 1:
+                            repoParams = _k.apply(_j, [_m.apply(_l, [(_o.filters = _q.apply(_p, [_s.apply(_r, _t.concat([(_u.sent())])), this.buildFilterQuery((options === null || options === void 0 ? void 0 : options.filters) || {})]), _o), ((options === null || options === void 0 ? void 0 : options.sort) ? { orderBy: this.buildSortQuery(options === null || options === void 0 ? void 0 : options.sort) } : {})]), { limits: limits, options: Object.assign({ minimal: ['price'], maximum: ['price'] }, (!this.hasCategory(options) ? { distinct: ['brand'] } : {})) }]);
+                            if (['biggest-price', 'lowest-price', 'biggest-discount', 'best-rating'].includes(options.sort))
+                                return [2 /*return*/, this.productRepository.findCatalog(repoParams)];
+                            return [2 /*return*/, this.productRepository.findCatalog(repoParams, (options === null || options === void 0 ? void 0 : options.mainGender) || this.shop === i1.Shops.MENSMARKET ? 'male' : 'female')];
                     }
                 });
             });
         };
+        CatalogService.prototype.buildMainFilter = function (_j) {
+            var category = _j.category, profile = _j.profile, term = _j.term;
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_j) {
+                    if (category)
+                        return [2 /*return*/, this.categoryStructureAdapter.buildProductFilterByCategory(category)];
+                    if (profile)
+                        return [2 /*return*/, { tags: { operator: i1.Where.LIKE, value: profile } }];
+                    if (term)
+                        return [2 /*return*/, this.productIndex
+                                .search(term, 9999, this.shop)
+                                .then(function (data) { return ({ id: { operator: i1.Where.IN, value: data.hits.map(function (_j) {
+                                        var _source = _j._source;
+                                        return _source.id;
+                                    }) } }); })];
+                    return [2 /*return*/];
+                });
+            });
+        };
         return CatalogService;
     }());
-    CatalogService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    CatalogService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: i1__namespace$1.ProductsIndex }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     CatalogService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: CatalogService });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: CatalogService, decorators: [{
                 type: i0.Injectable
@@ -1964,7 +2007,7 @@
                         }] }, { type: i1__namespace$1.Shops, decorators: [{
                             type: i0.Inject,
                             args: [DEFAULT_SHOP]
-                        }] }];
+                        }] }, { type: i1__namespace$1.ProductsIndex }];
         } });
 
     var CategoryService = /** @class */ (function () {
@@ -2206,11 +2249,11 @@
         } });
 
     var WishlistService = /** @class */ (function () {
-        function WishlistService(wishlistRepository, shop, productRepository, categoryFilterRepository, categoryCollectionChildrenRepository) {
+        function WishlistService(wishlistRepository, shop, productRepository, categoryFilterRepository, categoryCollectionChildrenRepository, productIndex) {
             this.wishlistRepository = wishlistRepository;
             this.shop = shop;
             var categoryStructureAdapter = new NewCategoryStructureAdapter(wishlistRepository, categoryCollectionChildrenRepository);
-            this.catalogService = new CatalogService(productRepository, categoryStructureAdapter, shop);
+            this.catalogService = new CatalogService(productRepository, categoryStructureAdapter, shop, productIndex);
             this.categoryService = new CategoryService(productRepository, wishlistRepository, categoryFilterRepository, categoryStructureAdapter, shop);
         }
         WishlistService.prototype.getCatalogService = function () {
@@ -2309,7 +2352,7 @@
         };
         return WishlistService;
     }());
-    WishlistService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: 'CategoryCollectionChildrenRepository' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    WishlistService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: 'CategoryCollectionChildrenRepository' }, { token: i1__namespace$1.ProductsIndex }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     WishlistService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: WishlistService });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: WishlistService, decorators: [{
                 type: i0.Injectable
@@ -2329,7 +2372,7 @@
                         }] }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['CategoryCollectionChildrenRepository']
-                        }] }];
+                        }] }, { type: i1__namespace$1.ProductsIndex }];
         } });
 
     var CheckoutSubscriptionService = /** @class */ (function () {
@@ -2656,7 +2699,7 @@
         return AngularConnectModule;
     }());
     AngularConnectModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: AngularConnectModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
-    AngularConnectModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: AngularConnectModule, imports: [fire.AngularFireModule, AngularFirestoreModule, AngularHasuraGraphQLModule] });
+    AngularConnectModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: AngularConnectModule, imports: [AngularElasticSeachModule, fire.AngularFireModule, AngularFirestoreModule, AngularHasuraGraphQLModule] });
     AngularConnectModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: AngularConnectModule, providers: [
             AuthService,
             CartService,
@@ -2669,11 +2712,11 @@
             OrderService,
             ShippingService,
             WishlistService,
-        ], imports: [[fire.AngularFireModule, AngularFirestoreModule, AngularHasuraGraphQLModule]] });
+        ], imports: [[AngularElasticSeachModule, fire.AngularFireModule, AngularFirestoreModule, AngularHasuraGraphQLModule]] });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: AngularConnectModule, decorators: [{
                 type: i0.NgModule,
                 args: [{
-                        imports: [fire.AngularFireModule, AngularFirestoreModule, AngularHasuraGraphQLModule],
+                        imports: [AngularElasticSeachModule, fire.AngularFireModule, AngularFirestoreModule, AngularHasuraGraphQLModule],
                         providers: [
                             AuthService,
                             CartService,