@infrab4a/connect-angular 4.14.4-beta.1 → 4.15.0-beta.0

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, isEmpty, 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, SequenceFirestoreRepository, 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 * as i1 from '@angular/fire/auth';
 import { Auth, provideAuth, getAuth, getIdToken, authState } from '@angular/fire/auth';
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
@@ -420,6 +420,13 @@ AngularFirestoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0",
             },
             deps: ['FirestoreOptions'],
         },
+        {
+            provide: 'SequenceRepository',
+            useFactory: (options) => {
+                return new SequenceFirestoreRepository(options);
+            },
+            deps: ['FirestoreOptions'],
+        },
     ], imports: [AngularElasticSeachModule,
         provideFirestore((injector) => {
             const platformId = injector.get(PLATFORM_ID);
@@ -679,6 +686,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                             },
                             deps: ['FirestoreOptions'],
                         },
+                        {
+                            provide: 'SequenceRepository',
+                            useFactory: (options) => {
+                                return new SequenceFirestoreRepository(options);
+                            },
+                            deps: ['FirestoreOptions'],
+                        },
                     ],
                 }]
         }] });
@@ -1137,16 +1151,16 @@ class CouponService {
         let discount = 0;
         if (type == CouponTypes.SHIPPING) {
             const subTotal = checkout.shipping.ShippingPrice;
-            const discount = +(subTotal * ((value > 100 ? 100 : value) / 100)).toFixed(2);
+            const discount = subTotal * ((value > 100 ? 100 : value) / 100);
             return { discount, lineItems: checkout.lineItems };
         }
-        let lineItensElegibleForDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
+        const lineItensElegibleForDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
         const subTotal = this.calcCheckoutSubtotal(lineItensElegibleForDiscount, checkout.user);
         if (type == CouponTypes.ABSOLUTE) {
             discount = value > subTotal ? subTotal : value;
         }
         else {
-            discount = +(subTotal * ((value > 100 ? 100 : value) / 100)).toFixed(2);
+            discount = subTotal * ((value > 100 ? 100 : value) / 100);
         }
         const lineItems = this.calcLineItenDiscount(type, lineItensElegibleForDiscount, value, subTotal);
         return { discount, lineItems };
@@ -1154,7 +1168,7 @@ class CouponService {
     async hasMinSubTotal(coupon, checkout) {
         if (!coupon.minSubTotalValue)
             return true;
-        let lineItensDiscount = await this.getLineItensEligebleForDiscount(coupon.productsCategories, checkout);
+        const lineItensDiscount = await this.getLineItensEligebleForDiscount(coupon.productsCategories, checkout);
         const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user);
         if (coupon.minSubTotalValue <= subTotal)
             return true;
@@ -1277,6 +1291,8 @@ class CouponService {
         if (type === CouponTypes.ABSOLUTE) {
             const couponDiscountMax = couponDiscount > subTotal ? subTotal : couponDiscount;
             lineItemsDiscount = lineItems.map((item) => {
+                if (item.isGift)
+                    return item;
                 const totalItemPercentage = item.pricePaid / subTotal;
                 const discountItem = couponDiscountMax * totalItemPercentage;
                 return {
@@ -1287,6 +1303,8 @@ class CouponService {
         }
         else {
             lineItemsDiscount = lineItems.map((item) => {
+                if (item.isGift)
+                    return item;
                 const discountItem = item.pricePaid * (couponDiscount / 100);
                 return {
                     ...item,
@@ -1495,9 +1513,10 @@ 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()
+        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(),
@@ -1731,7 +1750,6 @@ 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)
@@ -1784,15 +1802,6 @@ 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);
@@ -1802,21 +1811,18 @@ 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(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),
-                    },
+        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),
                 },
-                brands: this.brandsList[this.buildIndexBrands(options)],
-            };
-        });
+            },
+            brands: distinct?.brand,
+        }));
     }
     async addCustomerToStockNotification(shop, productId, name, email) {
         return this.productStockNotificationRepository.addCustomerEmail(shop, productId, name, email);
@@ -1849,9 +1855,7 @@ class CatalogService {
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
-                ...(!this.brandsList[this.buildIndexBrands(options)] && isEmpty(options.filters?.brands)
-                    ? { distinct: ['brand'] }
-                    : {}),
+                ...(!this.hasCategory(options) ? { distinct: ['brand'] } : {}),
             },
         };
         if (['biggest-price', 'lowest-price', 'biggest-discount', 'best-rating'].includes(options.sort))
@@ -1869,7 +1873,6 @@ 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: {
@@ -1880,7 +1883,7 @@ class CatalogService {
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
-                ...(!brandsList && isEmpty(options.filters?.brands) ? { distinct: ['brand'] } : {}),
+                distinct: ['brand'],
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
         const mostRelevantWithouyStock = totalResult.data.filter((product) => mostRelevants.includes(product.id) && product.stock.quantity <= 0);
@@ -1892,20 +1895,15 @@ 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,
-                brand: this.brandsList[this.buildIndexBrands(options)],
-            },
+            distinct: totalResult.distinct,
         };
     }
     async findCatalogAndSortByMostRevelantByTerm(productIds, options, limits) {
-        const brandsList = this.brandsList[this.buildIndexBrands(options)];
         const totalResult = await this.productRepository.findCatalog({
             fields: ['id', 'stock', 'gender'],
             filters: {
@@ -1916,7 +1914,7 @@ class CatalogService {
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
-                ...(!brandsList && isEmpty(options.filters?.brands) ? { distinct: ['brand'] } : {}),
+                distinct: ['brand'],
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
         const defaultGender = options?.filters?.gender
@@ -1939,16 +1937,12 @@ 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,
-                brand: this.brandsList[this.buildIndexBrands(options)],
-            },
+            distinct: totalResult.distinct,
         };
     }
     async findCatalogIdsBySearch(term, preview = false) {
@@ -1958,35 +1952,6 @@ 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,
-        };
-    }
 }
 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 });