@infrab4a/connect-angular 4.0.0-beta.31 → 4.0.0-beta.33

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, NgModule, PLATFORM_ID, Injectable, Inject } from '@angular/core';
-import * as i3 from '@infrab4a/connect';
-import { Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, ProductsIndex, AxiosAdapter, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, ProductVariantFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, VariantHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, Category, CheckoutSubscription, Product, RequiredArgumentError, add, Order } from '@infrab4a/connect';
+import * as i1$3 from '@infrab4a/connect';
+import { Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, ProductsIndex, AxiosAdapter, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, ProductVariantFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, VariantHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, Category, CheckoutSubscription, Product, RequiredArgumentError, add, Order } from '@infrab4a/connect';
 import * as i1 from '@angular/fire/app';
 import { provideFirebaseApp, initializeApp } from '@angular/fire/app';
 import * as i1$1 from '@angular/fire/auth';
@@ -17,10 +17,13 @@ import cookie from 'js-cookie';
 import { CustomError } from 'ts-custom-error';
 import { __decorate, __metadata } from 'tslib';
 import { Type } from 'class-transformer';
-import * as i1$3 from '@angular/common/http';
+import * as i1$4 from '@angular/common/http';
+import { Where as Where$1, isNil as isNil$1 } from '@infrab4a/connect/src';
 
 const BACKEND_URL = 'BACKEND_URL';
 
+const CATEGORY_STRUCTURE = 'CATEGORY_STRUCTURE';
+
 const DEFAULT_SHOP = 'DEFAULT_SHOP';
 
 const ES_CONFIG = 'ES_CONFIG';
@@ -717,6 +720,14 @@ AngularHasuraGraphQLModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.
             },
             deps: ['HasuraConfig', FilterOptionHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository],
         },
+        {
+            provide: CategoryCollectionChildrenHasuraGraphQLRepository,
+            useFactory: (options) => new CategoryCollectionChildrenHasuraGraphQLRepository(options.endpoint, options.credentials),
+        },
+        {
+            provide: 'CategoryCollectionChildrenRepository',
+            useExisting: CategoryCollectionChildrenHasuraGraphQLRepository,
+        },
     ] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularHasuraGraphQLModule, decorators: [{
             type: NgModule,
@@ -811,6 +822,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                             },
                             deps: ['HasuraConfig', FilterOptionHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository],
                         },
+                        {
+                            provide: CategoryCollectionChildrenHasuraGraphQLRepository,
+                            useFactory: (options) => new CategoryCollectionChildrenHasuraGraphQLRepository(options.endpoint, options.credentials),
+                        },
+                        {
+                            provide: 'CategoryCollectionChildrenRepository',
+                            useExisting: CategoryCollectionChildrenHasuraGraphQLRepository,
+                        },
                     ],
                 }]
         }] });
@@ -1050,7 +1069,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['CouponRepository']
-                }] }, { type: i3.Shops, decorators: [{
+                }] }, { type: i1$3.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
                 }] }, { type: undefined, decorators: [{
@@ -1119,7 +1138,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['UserRepository']
-                }] }, { type: i3.Shops, decorators: [{
+                }] }, { type: i1$3.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
                 }] }]; } });
@@ -1377,7 +1396,7 @@ CartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15
 CartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CartService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CartService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: AuthService }, { type: CheckoutService }, { type: i3.Shops, decorators: [{
+        }], ctorParameters: function () { return [{ type: AuthService }, { type: CheckoutService }, { type: i1$3.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
                 }] }, { type: undefined, decorators: [{
@@ -1389,16 +1408,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['VariantRepository']
-                }] }, { type: i3.Buy2WinFirestoreRepository, decorators: [{
+                }] }, { type: i1$3.Buy2WinFirestoreRepository, decorators: [{
                     type: Inject,
                     args: ['Buy2WinRepository']
                 }] }]; } });
 
 class CatalogService {
-    constructor(productRepository, categoryRepository) {
+    constructor(productRepository, categoryStructureAdapter, shop) {
         this.productRepository = productRepository;
-        this.categoryRepository = categoryRepository;
-        this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, }) => {
+        this.categoryStructureAdapter = categoryStructureAdapter;
+        this.shop = shop;
+        this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, }) => {
             const filters = {};
             if (clubDiscount?.length)
                 set(filters, 'price.subscriberDiscountPercentage', { operator: Where.IN, value: clubDiscount });
@@ -1416,6 +1436,10 @@ class CatalogService {
                     ...(prices.min ? [{ operator: Where.GTE, value: prices.min }] : []),
                     ...(prices.max ? [{ operator: Where.LTE, value: prices.max }] : []),
                 ]);
+            if (rate)
+                filters.rate = { operator: Where.GTE, value: rate };
+            if (tags?.length)
+                filters.tags = { operator: Where.LIKE, value: tags };
             return filters;
         };
         this.buildSortQuery = (sort) => {
@@ -1429,6 +1453,8 @@ class CatalogService {
                 return { price: 'asc' };
             if (sort === 'best-rating')
                 return { rate: 'desc' };
+            if (sort === 'news')
+                return { createdAt: 'desc' };
         };
         this.buildLimitQuery = (options) => {
             const limit = options?.perPage || 20;
@@ -1439,32 +1465,31 @@ class CatalogService {
         };
     }
     async fetchProducts(category, options) {
-        const productsIds = category.products?.length
-            ? category.products
-            : await this.categoryRepository.get({ id: category.id }).then((categoryFound) => categoryFound.products);
         const limits = this.buildLimitQuery(options);
         return await this.productRepository
-            .find({
+            .findCatalog({
             filters: {
-                id: { operator: Where.IN, value: productsIds },
-                published: true,
+                ...(await this.categoryStructureAdapter.buildProductFilterByCategory(category)),
                 ...this.buildFilterQuery(options?.filters || {}),
             },
             ...(options?.sort ? { orderBy: this.buildSortQuery(options?.sort) } : {}),
             limits,
             options: { minimal: ['price'], maximum: ['price'] },
-        })
+        }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female')
             .then(({ data, count: total, maximum, minimal }) => ({
-            products: { data, total },
+            products: { data: data.map((product) => RoundProductPricesHelper.roundProductPrices(product)), total },
             pages: Math.ceil(total / limits.limit),
             prices: {
-                price: { min: minimal.price.price, max: maximum.price.price },
-                subscriberPrice: { min: minimal.price.subscriberPrice, max: maximum.price.subscriberPrice },
+                price: { min: +minimal?.price?.price?.toFixed(2), max: +maximum?.price?.price?.toFixed(2) },
+                subscriberPrice: {
+                    min: +minimal?.price?.subscriberPrice?.toFixed(2),
+                    max: +maximum?.price?.subscriberPrice?.toFixed(2),
+                },
             },
         }));
     }
 }
-CatalogService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
+CatalogService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }], target: i0.ɵɵFactoryTarget.Injectable });
 CatalogService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService, decorators: [{
             type: Injectable
@@ -1473,35 +1498,31 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                     args: ['ProductRepository']
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
-                    args: ['CategoryRepository']
+                    args: [CATEGORY_STRUCTURE]
+                }] }, { type: i1$3.Shops, decorators: [{
+                    type: Inject,
+                    args: [DEFAULT_SHOP]
                 }] }]; } });
 
 class CategoryService {
-    constructor(productRepository, categoryRepository, categoryFilterRepository) {
+    constructor(productRepository, categoryRepository, categoryFilterRepository, categoryStructureAdapter, shop) {
         this.productRepository = productRepository;
         this.categoryRepository = categoryRepository;
         this.categoryFilterRepository = categoryFilterRepository;
+        this.categoryStructureAdapter = categoryStructureAdapter;
+        this.shop = shop;
     }
-    async fetchBrands(category) {
-        const productsIds = category.products?.length
-            ? category.products
-            : await this.categoryRepository.get({ id: category.id }).then((categoryFound) => categoryFound.products);
+    async fetchBrands(category, mainGender) {
         const brands = await this.productRepository
-            .find({
-            filters: {
-                id: { operator: Where.IN, value: productsIds },
-                published: true,
-            },
+            .findCatalog({
+            filters: await this.categoryStructureAdapter.buildProductFilterByCategory(category),
             fields: ['brand'],
-        })
+        }, mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female')
             .then(({ data }) => Object.keys(data.map((product) => product.brand).reduce((brands, brand) => ({ ...brands, [brand]: true }), {})));
         return this.categoryRepository
             .find({ filters: { brandCategory: true }, orderBy: { name: 'asc' } })
             .then(({ data }) => data.filter((category) => brands.includes(category.conditions.brand)));
     }
-    async fetchSubCategories(category) {
-        return [];
-    }
     async fetchFilterOptions(category, filters) {
         const categoryFilters = category.filters && category.filters.length
             ? category.filters
@@ -1513,7 +1534,7 @@ class CategoryService {
             : categoryFilters;
     }
 }
-CategoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CategoryService, deps: [{ token: 'ProductRepository' }, { token: 'CategoryRepository' }, { token: 'CategoryFilterRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
+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 });
 CategoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CategoryService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CategoryService, decorators: [{
             type: Injectable
@@ -1526,6 +1547,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['CategoryFilterRepository']
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [CATEGORY_STRUCTURE]
+                }] }, { type: i1$3.Shops, decorators: [{
+                    type: Inject,
+                    args: [DEFAULT_SHOP]
                 }] }]; } });
 
 var ProductSorts;
@@ -1536,6 +1563,7 @@ var ProductSorts;
     ProductSorts["LOWEST_PRICE"] = "lowest-price";
     ProductSorts["BIGGEST_DISCOUNT"] = "biggest-discount";
     ProductSorts["BEST_RATING"] = "best-rating";
+    ProductSorts["NEWS"] = "news";
 })(ProductSorts || (ProductSorts = {}));
 
 class CategoryWithTree extends Category {
@@ -1692,7 +1720,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['ProductRepository']
-                }] }, { type: i3.Shops, decorators: [{
+                }] }, { type: i1$3.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
                 }] }]; } });
@@ -1714,7 +1742,7 @@ OrderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "1
 OrderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: OrderService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: OrderService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1$2.Firestore }, { type: i3.OrderFirestoreRepository, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1$2.Firestore }, { type: i1$3.OrderFirestoreRepository, decorators: [{
                     type: Inject,
                     args: ['OrderRepository']
                 }] }]; } });
@@ -1796,20 +1824,85 @@ class ShippingService {
         return false;
     }
 }
-ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token: BACKEND_URL }, { token: HomeShopService }], target: i0.ɵɵFactoryTarget.Injectable });
+ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: ShippingService, deps: [{ token: i1$4.HttpClient }, { token: BACKEND_URL }, { token: HomeShopService }], target: i0.ɵɵFactoryTarget.Injectable });
 ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: ShippingService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: ShippingService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1$4.HttpClient }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [BACKEND_URL]
                 }] }, { type: HomeShopService }]; } });
 
+class NewCategoryStructureAdapter {
+    constructor(categoryRepository, categoryCollectionChildrenRepository) {
+        this.categoryRepository = categoryRepository;
+        this.categoryCollectionChildrenRepository = categoryCollectionChildrenRepository;
+    }
+    async buildProductFilterByCategory(category) {
+        const categoriesIds = (await this.isCollection(category))
+            ? await this.getAllCategoriesIdFromCollection(category)
+            : [...(await this.getAllCategoriesIdFromCategory(category)), category.id.toString()];
+        return { category: { id: { operator: Where$1.IN, value: categoriesIds } } };
+    }
+    async getAllCategoriesIdFromCategory(category) {
+        return this.categoryRepository
+            .getChildren(+category.id)
+            .then((categories) => categories.map((category) => category.id.toString()));
+    }
+    async getAllCategoriesIdFromCollection(category) {
+        return this.categoryCollectionChildrenRepository
+            .find({ filters: { collectionId: +category.id } })
+            .then(({ data }) => data.map((categoryCollection) => categoryCollection.categoryId.toString()));
+    }
+    async isCollection(category) {
+        return !isNil$1(category.isCollection)
+            ? category.isCollection
+            : this.categoryRepository.get({ id: category.id }).then((category) => category.isCollection);
+    }
+}
+NewCategoryStructureAdapter.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter, deps: [{ token: 'CategoryRepository' }, { token: 'CategoryCollectionChildrenRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
+NewCategoryStructureAdapter.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['CategoryRepository']
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['CategoryCollectionChildrenRepository']
+                }] }]; } });
+
+class OldCategoryStructureAdapter {
+    constructor(categoryRepository) {
+        this.categoryRepository = categoryRepository;
+    }
+    async buildProductFilterByCategory(category) {
+        const productsIds = category.products?.length
+            ? category.products
+            : await this.categoryRepository.get({ id: category.id }).then((categoryFound) => categoryFound.products);
+        return { id: { operator: Where$1.IN, value: productsIds } };
+    }
+}
+OldCategoryStructureAdapter.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: OldCategoryStructureAdapter, deps: [{ token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
+OldCategoryStructureAdapter.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: OldCategoryStructureAdapter });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: OldCategoryStructureAdapter, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['CategoryRepository']
+                }] }]; } });
+
 class AngularConnectModule {
     static initializeApp(defaultShop, options, nameOrConfig) {
         return {
             ngModule: AngularConnectModule,
             providers: [
+                {
+                    provide: CATEGORY_STRUCTURE,
+                    useClass: isNil(options?.oldCategoryStructure) || options?.oldCategoryStructure
+                        ? OldCategoryStructureAdapter
+                        : NewCategoryStructureAdapter,
+                },
                 ...(isNil(defaultShop) ? [] : [{ provide: DEFAULT_SHOP, useValue: defaultShop }]),
                 ...(isNil(options?.firebase) ? [] : [{ provide: FIREBASE_OPTIONS, useValue: options?.firebase }]),
                 ...(isNil(options?.firebase) ? [] : [{ provide: FIREBASE_APP_NAME, useValue: nameOrConfig }]),