@infrab4a/connect-angular 5.0.0-beta.67 → 5.0.0-beta.69

package/fesm2022/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, CategoryProductHasuraGraphQLRepository, 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';
@@ -813,12 +813,23 @@ class AngularHasuraGraphQLModule {
                 provide: 'CategoryCollectionChildrenRepository',
                 useExisting: CategoryCollectionChildrenHasuraGraphQLRepository,
             },
+            {
+                provide: CategoryProductHasuraGraphQLRepository,
+                useFactory: (options) => {
+                    return new CategoryProductHasuraGraphQLRepository(options);
+                },
+                deps: ['HasuraConfig'],
+            },
+            {
+                provide: 'CategoryProductRepository',
+                useExisting: CategoryProductHasuraGraphQLRepository,
+            },
             {
                 provide: WishlistHasuraGraphQLRepository,
-                useFactory: (options, categoryFilterRepository) => {
-                    return new WishlistHasuraGraphQLRepository(options, categoryFilterRepository);
+                useFactory: (options, categoryProductRepository) => {
+                    return new WishlistHasuraGraphQLRepository(options, categoryProductRepository);
                 },
-                deps: ['HasuraConfig', CategoryFilterHasuraGraphQLRepository],
+                deps: ['HasuraConfig', CategoryProductHasuraGraphQLRepository],
             },
             {
                 provide: 'WishlistRepository',
@@ -950,12 +961,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                             provide: 'CategoryCollectionChildrenRepository',
                             useExisting: CategoryCollectionChildrenHasuraGraphQLRepository,
                         },
+                        {
+                            provide: CategoryProductHasuraGraphQLRepository,
+                            useFactory: (options) => {
+                                return new CategoryProductHasuraGraphQLRepository(options);
+                            },
+                            deps: ['HasuraConfig'],
+                        },
+                        {
+                            provide: 'CategoryProductRepository',
+                            useExisting: CategoryProductHasuraGraphQLRepository,
+                        },
                         {
                             provide: WishlistHasuraGraphQLRepository,
-                            useFactory: (options, categoryFilterRepository) => {
-                                return new WishlistHasuraGraphQLRepository(options, categoryFilterRepository);
+                            useFactory: (options, categoryProductRepository) => {
+                                return new WishlistHasuraGraphQLRepository(options, categoryProductRepository);
                             },
-                            deps: ['HasuraConfig', CategoryFilterHasuraGraphQLRepository],
+                            deps: ['HasuraConfig', CategoryProductHasuraGraphQLRepository],
                         },
                         {
                             provide: 'WishlistRepository',
@@ -1137,7 +1159,7 @@ class CouponService {
         let discount = 0;
         if (type == CouponTypes.SHIPPING) {
             const subTotal = checkout.shipping.ShippingPrice;
-            const discount = subTotal * ((value > 100 ? 100 : value) / 100);
+            const discount = +(subTotal * ((value > 100 ? 100 : value) / 100)).toFixed(2);
             return { discount, lineItems: checkout.lineItems };
         }
         let lineItensElegibleForDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
@@ -1146,7 +1168,7 @@ class CouponService {
             discount = value > subTotal ? subTotal : value;
         }
         else {
-            discount = subTotal * ((value > 100 ? 100 : value) / 100);
+            discount = +(subTotal * ((value > 100 ? 100 : value) / 100)).toFixed(2);
         }
         const lineItems = this.calcLineItenDiscount(type, lineItensElegibleForDiscount, value, subTotal);
         return { discount, lineItems };
@@ -1165,10 +1187,12 @@ class CouponService {
             return true;
         }
         const couponCategories = await this.getCouponCategoriesId(coupon.productsCategories);
-        const hasCategories = checkout.lineItems?.filter((i) => {
-            if (!i.categories || !i.categories?.length)
+        const hasCategories = checkout.lineItems?.filter((item) => {
+            if (item.isGift)
+                return false;
+            if (!item.categories || !item.categories?.length)
                 return true;
-            return i.categories.some((c) => couponCategories.some((cat) => cat == c));
+            return item.categories.some((c) => couponCategories.some((cat) => cat == c));
         });
         return hasCategories.length ? true : false;
     }
@@ -1211,20 +1235,24 @@ class CouponService {
         let lineItensDiscount = [];
         const couponCategories = await this.getCouponCategoriesId(productsCategories);
         if (productsCategories && productsCategories.length) {
-            lineItensDiscount = checkout.lineItems?.filter((i) => {
-                if (i.categories?.length) {
-                    return i.categories.some((c) => couponCategories.some((cat) => cat == c));
+            lineItensDiscount = checkout.lineItems?.filter((item) => {
+                if (item.isGift)
+                    return false;
+                if (item.categories?.length) {
+                    return item.categories.some((c) => couponCategories.some((cat) => cat == c));
                 }
                 return true;
             });
         }
         else {
-            lineItensDiscount = checkout.lineItems;
+            lineItensDiscount = checkout.lineItems.filter((item) => !item.isGift);
         }
         return lineItensDiscount;
     }
     calcCheckoutSubtotal(lineItens, user) {
-        return (lineItens?.reduce((acc, curr) => user?.isSubscriber && curr.price.subscriberPrice
+        return (lineItens
+            ?.filter((item) => !item.isGift)
+            .reduce((acc, curr) => user?.isSubscriber && curr.price.subscriberPrice
             ? acc + curr.price?.subscriberPrice * curr.quantity
             : acc + curr.pricePaid * curr.quantity, 0) || 0);
     }
@@ -1489,10 +1517,6 @@ class CartService {
         }), concatMap((checkout) => this.checkoutService.updateCheckoutLineItems(checkout)), map((checkout) => this.generateCartObject(checkout.lineItems)), tap((cart) => this.cartSubject.next(cart)));
     }
     updateUserCart(user) {
-        const isSameUserId = !user?.id || this.user?.id === user?.id;
-        const isSameUser = isSameUserId && !!this.user?.isSubscriber === !!user?.isSubscriber;
-        if (isSameUser)
-            return this.getCart();
         return this.checkoutService.getCheckout().pipe(concatMap((checkout) => this.checkoutService.updateCheckoutUser(Checkout.toInstance({ ...checkout.toPlain(), user }))), concatMap(async (checkout) => await this.checkoutService
             .updateCheckoutLineItems(Checkout.toInstance({
             ...checkout.toPlain(),
@@ -1726,6 +1750,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 +1803,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 +1821,21 @@ 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 }) => {
+            await this.setBrandsList(options, distinct?.brand);
+            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 +1868,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 +1888,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 +1899,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 +1911,20 @@ class CatalogService {
             .concat(mostRelevantWithouyStock);
         const categoryMostRelevants = firstProducts.concat(lastProducts);
         const resultFinal = categoryMostRelevants.slice(limits.offset, limits.offset + limits.limit);
+        await this.setBrandsList(options, totalResult.distinct?.brand);
         return {
             data: resultFinal,
             count: totalResult.count,
             maximum: totalResult.maximum,
             minimal: totalResult.minimal,
-            distinct: totalResult.distinct,
+            distinct: {
+                ...totalResult.distinct,
+                brand: this.brandsList[this.buildIndexBrands(options)],
+            },
         };
     }
     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 +1935,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 +1958,16 @@ class CatalogService {
                 id: { operator: Where.IN, value: orderedId },
             },
         });
+        await this.setBrandsList(options, totalResult.distinct?.brand);
         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: this.brandsList[this.buildIndexBrands(options)],
+            },
         };
     }
     async findCatalogIdsBySearch(term, preview = false) {
@@ -1928,6 +1977,35 @@ 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;
+        });
+    }
+    async setBrandsList(options, brands) {
+        const filterBrands = options.filters?.brands;
+        if (isEmpty(brands))
+            delete options.filters?.brands;
+        this.brandsList[this.buildIndexBrands(options)] =
+            this.brandsList[this.buildIndexBrands(options)] || brands || (await this.fetchBrandsOnly(options));
+        this.brandsList[this.buildIndexBrands(options)] = this.brandsList[this.buildIndexBrands(options)].filter(Boolean);
+        options.filters = {
+            ...options.filters,
+            brands: filterBrands,
+        };
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: 'ProductStockNotificationRepository' }, { token: 'CategoryRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: 'ProductSearch' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService }); }
 }
@@ -2123,7 +2201,7 @@ class WishlistService {
         await this.createWishlistLog(WishlistLogType.ADD_PRODUCT, wishlistData, productData);
         if (!hasProduct) {
             wishlist.products = [...wishlist.products, productId];
-            return this.wishlistRepository.update({ id: wishlistId, products: wishlist.products });
+            await this.wishlistRepository.addProduct(wishlistId, productId);
         }
         return wishlist;
     }
@@ -2135,9 +2213,7 @@ class WishlistService {
             const wishlistData = await this.findById(wishlistId);
             const productData = await this.findProductById(productId);
             await this.createWishlistLog(WishlistLogType.REMOVE_PRODUCT, wishlistData, productData);
-            if (!wishlist.products.length)
-                return this.wishlistRepository.update({ id: wishlistId, products: { action: 'remove' } });
-            return this.wishlistRepository.update({ id: wishlistId, products: wishlist.products });
+            await this.wishlistRepository.removeProduct(wishlistId, productId);
         }
         return wishlist;
     }