@infrab4a/connect-angular 4.14.1-beta.5 → 4.14.2

package/fesm2020/infrab4a-connect-angular.mjs

@@ -5,7 +5,7 @@ import { FirebaseApp, provideFirebaseApp, getApp, initializeApp } from '@angular
 import * as i2 from '@angular/fire/storage';
 import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
 import * as i1$2 from '@infrab4a/connect';
-import { ProductsIndex, AxiosAdapter, Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, ConnectFirestoreService, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, SubscriptionMaterializationFirestoreRepository, SubscriptionSummaryFirestoreRepository, ProductVariantFirestoreRepository, OrderBlockedFirestoreRepository, LogFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, ProductStockNotificationHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, ProductsVertexSearch, VertexAxiosAdapter, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, OrderStatus, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, PersonTypes, WishlistLogType, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage, FirebaseFileUploaderService } from '@infrab4a/connect';
+import { ProductsIndex, AxiosAdapter, Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, ConnectFirestoreService, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, SubscriptionMaterializationFirestoreRepository, SubscriptionSummaryFirestoreRepository, ProductVariantFirestoreRepository, OrderBlockedFirestoreRepository, LogFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, ProductStockNotificationHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, ProductsVertexSearch, VertexAxiosAdapter, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, OrderStatus, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, isEmpty, Category, PersonTypes, WishlistLogType, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage, FirebaseFileUploaderService } from '@infrab4a/connect';
 import * as i1 from '@angular/fire/auth';
 import { Auth, provideAuth, getAuth, getIdToken, authState } from '@angular/fire/auth';
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
@@ -1726,6 +1726,7 @@ class CatalogService {
         this.shop = shop;
         this.productSearch = productSearch;
         this.productsByTerm = {};
+        this.brandsList = {};
         this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, customOptions, }) => {
             const filters = {};
             if (clubDiscount?.length)
@@ -1778,6 +1779,15 @@ class CatalogService {
         this.hasProfile = (options) => 'profile' in options;
         this.hasTerm = (options) => 'term' in options;
         this.hasCategory = (options) => 'category' in options;
+        this.buildIndexBrands = (options) => {
+            if (this.hasCategory(options))
+                return `category-${options.category.id}`;
+            if (this.hasTerm(options))
+                return `term-${options.term}`;
+            if (this.hasProfile(options))
+                return `profile-${options.profile.join(',')}`;
+            return '';
+        };
     }
     async fetchProducts(options) {
         const limits = this.buildLimitQuery(options);
@@ -1787,18 +1797,29 @@ class CatalogService {
             throw new InvalidArgumentError(`It couldn't filled tags when profile is given`);
         if (this.hasTerm(options) && options.filters?.customOptions)
             throw new InvalidArgumentError(`It couldn't filled customOptions when term is given`);
-        return await this.findCatalog(options, limits).then(({ data, count: total, maximum, minimal, distinct }) => ({
-            products: { data: data.map((product) => RoundProductPricesHelper.roundProductPrices(product)), total },
-            pages: Math.ceil(total / limits.limit),
-            prices: {
-                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),
+        return await this.findCatalog(options, limits).then(async ({ data, count: total, maximum, minimal, distinct }) => {
+            const filterBrands = options.filters?.brands;
+            if (isEmpty(distinct?.brand))
+                delete options.filters?.brands;
+            this.brandsList[this.buildIndexBrands(options)] =
+                this.brandsList[this.buildIndexBrands(options)] || distinct?.brand || (await this.fetchBrandsOnly(options));
+            options.filters = {
+                ...options.filters,
+                brands: filterBrands,
+            };
+            return {
+                products: { data: data.map((product) => RoundProductPricesHelper.roundProductPrices(product)), total },
+                pages: Math.ceil(total / limits.limit),
+                prices: {
+                    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),
+                    },
                 },
-            },
-            brands: distinct?.brand,
-        }));
+                brands: this.brandsList[this.buildIndexBrands(options)],
+            };
+        });
     }
     async addCustomerToStockNotification(shop, productId, name, email) {
         return this.productStockNotificationRepository.addCustomerEmail(shop, productId, name, email);
@@ -1831,7 +1852,9 @@ class CatalogService {
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
-                ...(!this.hasCategory(options) ? { distinct: ['brand'] } : {}),
+                ...(!this.brandsList[this.buildIndexBrands(options)] && isEmpty(options.filters?.brands)
+                    ? { distinct: ['brand'] }
+                    : {}),
             },
         };
         if (['biggest-price', 'lowest-price', 'biggest-discount', 'best-rating'].includes(options.sort))
@@ -1849,6 +1872,7 @@ class CatalogService {
                 .then((data) => ({ id: { operator: Where.IN, value: data.map((_source) => _source.id) } }));
     }
     async findCatalogAndSortByMostRevelant(mostRelevants, productIds, options, limits) {
+        const brandsList = this.brandsList[this.buildIndexBrands(options)];
         const mostRelevantProductsIds = [...new Set(mostRelevants.concat(productIds))];
         const totalResult = await this.productRepository.findCatalog({
             filters: {
@@ -1859,7 +1883,7 @@ class CatalogService {
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
-                distinct: ['brand'],
+                ...(!brandsList && isEmpty(options.filters?.brands) ? { distinct: ['brand'] } : {}),
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
         const mostRelevantWithouyStock = totalResult.data.filter((product) => mostRelevants.includes(product.id) && product.stock.quantity <= 0);
@@ -1871,15 +1895,21 @@ class CatalogService {
             .concat(mostRelevantWithouyStock);
         const categoryMostRelevants = firstProducts.concat(lastProducts);
         const resultFinal = categoryMostRelevants.slice(limits.offset, limits.offset + limits.limit);
+        if (!brandsList && !isEmpty(options.filters?.brands))
+            delete options.filters.brands;
         return {
             data: resultFinal,
             count: totalResult.count,
             maximum: totalResult.maximum,
             minimal: totalResult.minimal,
-            distinct: totalResult.distinct,
+            distinct: {
+                ...totalResult.distinct,
+                brand: brandsList || totalResult.distinct?.brand || (await this.fetchBrandsOnly(options, productIds)),
+            },
         };
     }
     async findCatalogAndSortByMostRevelantByTerm(productIds, options, limits) {
+        const brandsList = this.brandsList[this.buildIndexBrands(options)];
         const totalResult = await this.productRepository.findCatalog({
             fields: ['id', 'stock', 'gender'],
             filters: {
@@ -1890,7 +1920,7 @@ class CatalogService {
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
-                distinct: ['brand'],
+                ...(!brandsList && isEmpty(options.filters?.brands) ? { distinct: ['brand'] } : {}),
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
         const defaultGender = options?.filters?.gender
@@ -1913,12 +1943,17 @@ class CatalogService {
                 id: { operator: Where.IN, value: orderedId },
             },
         });
+        if (!brandsList && !isEmpty(options.filters?.brands))
+            delete options.filters.brands;
         return {
             data: limitedProductId.map((id) => productResult.data.find((product) => product.id === id)).filter(Boolean),
             count: totalResult.count,
             maximum: totalResult.maximum,
             minimal: totalResult.minimal,
-            distinct: totalResult.distinct,
+            distinct: {
+                ...totalResult.distinct,
+                brand: brandsList || totalResult.distinct?.brand || (await this.fetchBrandsOnly(options, productIds)),
+            },
         };
     }
     async findCatalogIdsBySearch(term, preview = false) {
@@ -1928,6 +1963,23 @@ class CatalogService {
             .search(term, 999, this.shop == Shops.GLAMSHOP ? 'female' : 'male')
             .then((products) => [...new Set(products.map((product) => product.id))]));
     }
+    async fetchBrandsOnly(options, productIds = []) {
+        return this.productRepository
+            .findCatalog({
+            fields: ['id'],
+            filters: {
+                ...(!isEmpty(productIds) ? { id: { operator: Where.IN, value: productIds } } : {}),
+                published: { operator: Where.EQUALS, value: true },
+                ...this.buildFilterQuery(options?.filters || {}),
+            },
+            options: {
+                distinct: ['brand'],
+            },
+        }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female')
+            .then((result) => {
+            return result.distinct.brand;
+        });
+    }
 }
 CatalogService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: 'ProductStockNotificationRepository' }, { token: 'CategoryRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: 'ProductSearch' }], target: i0.ɵɵFactoryTarget.Injectable });
 CatalogService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService });