@infrab4a/connect-angular 5.0.0-beta.29 → 5.0.0-beta.3

package/fesm2022/infrab4a-connect-angular.mjs

@@ -1,20 +1,20 @@
 import * as i0 from '@angular/core';
 import { NgModule, InjectionToken, PLATFORM_ID, Injectable, Inject } from '@angular/core';
 import * as i1$4 from '@angular/fire/app';
-import { FirebaseApp, provideFirebaseApp, getApp, initializeApp } from '@angular/fire/app';
-import * as i2 from '@angular/fire/storage';
-import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
+import { FirebaseApp, getApp, initializeApp, provideFirebaseApp } from '@angular/fire/app';
 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, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, ProductStockNotificationHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage, FirebaseFileUploaderService } from '@infrab4a/connect';
+import { ProductsIndex, AxiosAdapter, Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, 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, FirebaseFileUploaderService, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage } from '@infrab4a/connect';
 import * as i1 from '@angular/fire/auth';
-import { Auth, provideAuth, getAuth, getIdToken, authState } from '@angular/fire/auth';
+import { Auth, getAuth, provideAuth, getIdToken, authState } from '@angular/fire/auth';
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
 import * as i1$1 from '@angular/fire/firestore';
-import { Firestore, provideFirestore, initializeFirestore, memoryLocalCache, docSnapshots, doc } from '@angular/fire/firestore';
+import { Firestore, getFirestore, memoryLocalCache, initializeFirestore, provideFirestore, doc, docSnapshots } from '@angular/fire/firestore';
+import * as i2 from '@angular/fire/storage';
+import { Storage, getStorage, provideStorage } from '@angular/fire/storage';
+import { combineLatest, of, from, throwError, Subject, iif, forkJoin } from 'rxjs';
+import { map, catchError, mergeMap, concatMap, tap } from 'rxjs/operators';
 import cookie from 'js-cookie';
-import { of, from, combineLatest, throwError, Subject, iif, forkJoin } from 'rxjs';
-import { map, mergeMap, catchError, concatMap, tap } from 'rxjs/operators';
-import { __decorate, __metadata } from 'tslib';
+import { __metadata, __decorate } from 'tslib';
 import { Type } from 'class-transformer';
 import * as i1$3 from '@angular/common/http';
 
@@ -61,8 +61,6 @@ const FIREBASE_OPTIONS = new InjectionToken('firebaseOptions');
 
 const HASURA_OPTIONS = 'HASURA_OPTIONS';
 
-const PERSISTENCE_PROVIDER = 'PERSISTENCE_PROVIDER';
-
 class AngularFirebaseAuthModule {
     static initializeApp(options, nameOrConfig) {
         return {
@@ -171,6 +169,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                 }]
         }] });
 
+const STORAGE_BASE_URL = 'STORAGE_BASE_URL';
+
 class MobileOperationSystemCheckerHelper {
     static isAppleDevice() {
         return (['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'].includes(navigator?.platform) ||
@@ -190,12 +190,12 @@ class AngularFirestoreModule {
         };
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: AngularFirestoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.3", ngImport: i0, type: AngularFirestoreModule, imports: [AngularElasticSeachModule, i1$1.FirestoreModule] }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.3", ngImport: i0, type: AngularFirestoreModule, imports: [AngularElasticSeachModule, i1$1.FirestoreModule, i2.StorageModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: AngularFirestoreModule, providers: [
             {
                 provide: 'FirestoreOptions',
                 useFactory: (firestore, platformId) => ({
-                    firestore: new ConnectFirestoreService(firestore),
+                    firestore,
                     interceptors: {
                         request: (request) => {
                             if (isPlatformBrowser(platformId))
@@ -403,20 +403,27 @@ class AngularFirestoreModule {
                 },
                 deps: ['FirestoreOptions', ProductFirestoreRepository],
             },
+            {
+                provide: 'FileUploaderService',
+                useFactory: (storage, baseUrl) => {
+                    return new FirebaseFileUploaderService(storage, baseUrl);
+                },
+                deps: [Storage, STORAGE_BASE_URL],
+            },
         ], imports: [AngularElasticSeachModule,
             provideFirestore((injector) => {
                 const platformId = injector.get(PLATFORM_ID);
-                if (isPlatformServer(platformId) || !MobileOperationSystemCheckerHelper.isAppleDevice())
-                    return initializeFirestore(injector.get(FirebaseApp), {
-                        ignoreUndefinedProperties: true,
-                    });
+                if (isPlatformServer(platformId))
+                    return getFirestore(injector.get(FirebaseApp));
+                if (!MobileOperationSystemCheckerHelper.isAppleDevice())
+                    return getFirestore(injector.get(FirebaseApp));
                 const firestore = initializeFirestore(injector.get(FirebaseApp), {
                     experimentalForceLongPolling: true,
-                    ignoreUndefinedProperties: true,
                     localCache: memoryLocalCache(),
                 });
                 return firestore;
-            })] }); }
+            }),
+            provideStorage(() => getStorage())] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: AngularFirestoreModule, decorators: [{
             type: NgModule,
@@ -425,23 +432,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                         AngularElasticSeachModule,
                         provideFirestore((injector) => {
                             const platformId = injector.get(PLATFORM_ID);
-                            if (isPlatformServer(platformId) || !MobileOperationSystemCheckerHelper.isAppleDevice())
-                                return initializeFirestore(injector.get(FirebaseApp), {
-                                    ignoreUndefinedProperties: true,
-                                });
+                            if (isPlatformServer(platformId))
+                                return getFirestore(injector.get(FirebaseApp));
+                            if (!MobileOperationSystemCheckerHelper.isAppleDevice())
+                                return getFirestore(injector.get(FirebaseApp));
                             const firestore = initializeFirestore(injector.get(FirebaseApp), {
                                 experimentalForceLongPolling: true,
-                                ignoreUndefinedProperties: true,
                                 localCache: memoryLocalCache(),
                             });
                             return firestore;
                         }),
+                        provideStorage(() => getStorage()),
                     ],
                     providers: [
                         {
                             provide: 'FirestoreOptions',
                             useFactory: (firestore, platformId) => ({
-                                firestore: new ConnectFirestoreService(firestore),
+                                firestore,
                                 interceptors: {
                                     request: (request) => {
                                         if (isPlatformBrowser(platformId))
@@ -649,6 +656,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                             },
                             deps: ['FirestoreOptions', ProductFirestoreRepository],
                         },
+                        {
+                            provide: 'FileUploaderService',
+                            useFactory: (storage, baseUrl) => {
+                                return new FirebaseFileUploaderService(storage, baseUrl);
+                            },
+                            deps: [Storage, STORAGE_BASE_URL],
+                        },
                     ],
                 }]
         }] });
@@ -730,17 +744,6 @@ class AngularHasuraGraphQLModule {
                 },
                 deps: ['HasuraConfig'],
             },
-            {
-                provide: 'ProductStockNotificationRepository',
-                useExisting: ProductStockNotificationHasuraGraphQLRepository,
-            },
-            {
-                provide: ProductStockNotificationHasuraGraphQLRepository,
-                useFactory: (hasuraConfig) => {
-                    return new ProductStockNotificationHasuraGraphQLRepository(hasuraConfig);
-                },
-                deps: ['HasuraConfig'],
-            },
             {
                 provide: 'CategoryFilterRepository',
                 useExisting: CategoryFilterHasuraGraphQLRepository,
@@ -867,17 +870,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                             },
                             deps: ['HasuraConfig'],
                         },
-                        {
-                            provide: 'ProductStockNotificationRepository',
-                            useExisting: ProductStockNotificationHasuraGraphQLRepository,
-                        },
-                        {
-                            provide: ProductStockNotificationHasuraGraphQLRepository,
-                            useFactory: (hasuraConfig) => {
-                                return new ProductStockNotificationHasuraGraphQLRepository(hasuraConfig);
-                            },
-                            deps: ['HasuraConfig'],
-                        },
                         {
                             provide: 'CategoryFilterRepository',
                             useExisting: CategoryFilterHasuraGraphQLRepository,
@@ -935,25 +927,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                 }]
         }] });
 
-const STORAGE_BASE_URL = 'STORAGE_BASE_URL';
-
-class CookieDataPersistence {
-    get(key) {
-        return of(cookie.get(key));
-    }
-    remove(key) {
-        return of(cookie.remove(key));
-    }
-    set(key, value) {
-        return from(cookie.set(key, value)).pipe(map(() => { }));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CookieDataPersistence, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CookieDataPersistence }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CookieDataPersistence, decorators: [{
-            type: Injectable
-        }] });
-
 class AuthService {
     constructor(angularFireAuth, userRepository) {
         this.angularFireAuth = angularFireAuth;
@@ -1060,33 +1033,32 @@ class CouponService {
         return of(discount);
     }
     async calcDiscountShopping(coupon, checkout) {
-        let discountInfo = null;
+        let discount = 0;
         if (checkout.user.isSubscriber && coupon.discount.subscriber.value) {
-            discountInfo = await this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
+            discount = await this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
         }
         else {
-            discountInfo = await this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
+            discount = await this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
         }
-        return { discount: discountInfo.discount, lineItems: discountInfo.lineItems };
+        return discount;
     }
     async calcDiscountByType(type, value, categories, checkout) {
         let discount = 0;
-        let lineItensElegibleForDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
-        const subTotal = this.calcCheckoutSubtotal(lineItensElegibleForDiscount, checkout.user);
+        let lineItensDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
+        const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user, checkout.shop);
         if (type == CouponTypes.ABSOLUTE) {
             discount = value > subTotal ? subTotal : value;
         }
         else {
             discount = subTotal * (value / 100);
         }
-        const lineItems = this.calcLineItenDiscount(type, lineItensElegibleForDiscount, value, subTotal);
-        return { discount, lineItems };
+        return discount;
     }
     async hasMinSubTotal(coupon, checkout) {
         if (!coupon.minSubTotalValue)
             return true;
         let lineItensDiscount = await this.getLineItensEligebleForDiscount(coupon.productsCategories, checkout);
-        const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user);
+        const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user, checkout.shop);
         if (coupon.minSubTotalValue <= subTotal)
             return true;
         return false;
@@ -1154,7 +1126,7 @@ class CouponService {
         }
         return lineItensDiscount;
     }
-    calcCheckoutSubtotal(lineItens, user) {
+    calcCheckoutSubtotal(lineItens, user, shop) {
         return (lineItens?.reduce((acc, curr) => user?.isSubscriber && curr.price.subscriberPrice
             ? acc + curr.price?.subscriberPrice * curr.quantity
             : acc + curr.pricePaid * curr.quantity, 0) || 0);
@@ -1192,30 +1164,6 @@ class CouponService {
         }
         return couponUseLimits;
     }
-    calcLineItenDiscount(type, lineItems, couponDiscount, subTotal) {
-        let lineItemsDiscount = [];
-        if (type === CouponTypes.ABSOLUTE) {
-            const couponDiscountMax = couponDiscount > subTotal ? subTotal : couponDiscount;
-            lineItemsDiscount = lineItems.map((item) => {
-                const totalItemPercentage = item.pricePaid / subTotal;
-                const discountItem = couponDiscountMax * totalItemPercentage;
-                return {
-                    ...item,
-                    discount: Number(discountItem.toFixed(2)),
-                };
-            });
-        }
-        else {
-            lineItemsDiscount = lineItems.map((item) => {
-                const discountItem = item.pricePaid * (couponDiscount / 100);
-                return {
-                    ...item,
-                    discount: Number(discountItem.toFixed(2)),
-                };
-            });
-        }
-        return lineItemsDiscount;
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CouponService, deps: [{ token: 'CouponRepository' }, { token: DEFAULT_SHOP }, { token: 'OrderRepository' }, { token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CouponService, providedIn: 'root' }); }
 }
@@ -1239,17 +1187,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                 }] }] });
 
 class CheckoutService {
-    constructor(couponService, checkoutRepository, userRepository, defaultShop, dataPersistence) {
+    constructor(couponService, checkoutRepository, orderRepository, userRepository, defaultShop) {
         this.couponService = couponService;
         this.checkoutRepository = checkoutRepository;
+        this.orderRepository = orderRepository;
         this.userRepository = userRepository;
         this.defaultShop = defaultShop;
-        this.dataPersistence = dataPersistence;
     }
     getCheckout(checkoutData) {
-        return this.dataPersistence
-            .get('checkoutId')
-            .pipe(concatMap((id) => (!isNil(id) ? this.checkoutRepository.get({ id }) : this.createCheckout(checkoutData))));
+        const checkoutId = cookie.get('checkoutId');
+        if (!isNil(checkoutId))
+            return from(this.checkoutRepository.get({ id: checkoutId }));
+        return from(this.createCheckout(checkoutData));
     }
     getUserByCheckout(checkoutId) {
         return from(this.checkoutRepository.get({ id: checkoutId })).pipe(concatMap((checkout) => checkout?.user?.id ? of(checkout.user) : from(this.userRepository.get({ id: checkout.user.id }))), concatMap((user) => of(user) || throwError(() => new NotFoundError('User is not found'))));
@@ -1261,7 +1210,8 @@ class CheckoutService {
         return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, user: checkout.user })));
     }
     clearCheckoutFromSession() {
-        return this.dataPersistence.remove('checkoutId');
+        cookie.remove('checkoutId');
+        return of();
     }
     calcDiscount(coupon) {
         return this.getCheckout().pipe(concatMap(async (checkout) => await this.couponService.calcDiscountShopping(coupon, checkout)));
@@ -1275,10 +1225,10 @@ class CheckoutService {
             ...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
             shop: checkoutData?.shop || this.defaultShop,
         });
-        await this.dataPersistence.set('checkoutId', checkout.id).toPromise();
+        cookie.set('checkoutId', checkout.id);
         return checkout;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutService, deps: [{ token: CouponService }, { token: 'CheckoutRepository' }, { token: 'UserRepository' }, { token: DEFAULT_SHOP }, { token: PERSISTENCE_PROVIDER }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutService, deps: [{ token: CouponService }, { token: 'CheckoutRepository' }, { token: 'OrderRepository' }, { token: 'UserRepository' }, { token: DEFAULT_SHOP }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutService, decorators: [{
@@ -1286,15 +1236,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
         }], ctorParameters: () => [{ type: CouponService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['CheckoutRepository']
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['OrderRepository']
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['UserRepository']
                 }] }, { type: i1$2.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: [PERSISTENCE_PROVIDER]
                 }] }] });
 
 class CartService {
@@ -1356,7 +1306,6 @@ class CartService {
                     weight: weight ?? product.weight,
                     quantity: (item.quantity || 0) + (quantity || 0),
                     pricePaid,
-                    discount: 0,
                     categories: product.categories ?? [],
                     isGift: isGift ?? null,
                     costPrice: product.costPrice ?? 0,
@@ -1408,7 +1357,7 @@ class CartService {
         }), concatMap((checkout) => this.checkoutService.updateCheckoutLineItems(checkout)), map((checkout) => this.generateCartObject(checkout.lineItems)), tap((cart) => this.cartSubject.next(cart)));
     }
     updateUserCart(user) {
-        return this.checkoutService.getCheckout().pipe(concatMap((checkout) => this.checkoutService.updateCheckoutUser(Checkout.toInstance({ ...checkout.toPlain(), user }))), concatMap(async (checkout) => await this.checkoutService
+        return this.checkoutService.getCheckout().pipe(concatMap((checkout) => this.checkoutService.updateCheckoutUser(Checkout.toInstance({ ...checkout.toPlain(), user }))), concatMap(async (checkout) => this.checkoutService
             .updateCheckoutLineItems(Checkout.toInstance({
             ...checkout.toPlain(),
             lineItems: checkout.lineItems?.length
@@ -1592,11 +1541,9 @@ class NewCategoryStructureAdapter {
             .then((categories) => categories.map((category) => category.id.toString()));
     }
     async getCategory(category) {
-        const collectionCategory = category.isCollection ||
-            (isNil(category.isCollection) && !category.products?.length) ||
-            category.isWishlist ||
-            category.brandCategory;
-        return collectionCategory ? this.categoryRepository.get({ id: category.id }) : category;
+        return isNil(category.isCollection) || (category.isCollection && !category.products?.length)
+            ? this.categoryRepository.get({ id: category.id })
+            : category;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: NewCategoryStructureAdapter, deps: [{ token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: NewCategoryStructureAdapter }); }
@@ -1629,10 +1576,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                 }] }] });
 
 class CatalogService {
-    constructor(productRepository, productStockNotificationRepository, categoryRepository, categoryStructureAdapter, shop, productIndex) {
+    constructor(productRepository, categoryStructureAdapter, shop, productIndex) {
         this.productRepository = productRepository;
-        this.productStockNotificationRepository = productStockNotificationRepository;
-        this.categoryRepository = categoryRepository;
         this.categoryStructureAdapter = categoryStructureAdapter;
         this.shop = shop;
         this.productIndex = productIndex;
@@ -1662,22 +1607,17 @@ class CatalogService {
             if (!sort || sort === 'most-relevant')
                 return {};
             if (sort === 'best-sellers')
-                return {
-                    shoppingCount: 'desc',
-                    rate: 'desc',
-                    stock: 'desc',
-                    name: 'asc',
-                };
+                return { shoppingCount: 'desc' };
             if (sort === 'biggest-price')
-                return { subscriberPrice: 'desc', rate: 'desc', shoppingCount: 'desc' };
+                return { subscriberPrice: 'desc' };
             if (sort === 'lowest-price')
-                return { subscriberPrice: 'asc', rate: 'desc', shoppingCount: 'desc' };
+                return { subscriberPrice: 'asc' };
             if (sort === 'best-rating')
-                return { rate: 'desc', shoppingCount: 'desc', stock: 'desc', name: 'asc' };
+                return { rate: 'desc' };
             if (sort === 'news')
                 return { createdAt: 'desc' };
             if (sort === 'biggest-discount')
-                return { subscriberDiscountPercentage: 'desc', rate: 'desc', shoppingCount: 'desc' };
+                return { subscriberDiscountPercentage: 'desc' };
         };
         this.buildLimitQuery = (options) => {
             const limit = options?.perPage || 20;
@@ -1711,27 +1651,9 @@ class CatalogService {
             brands: distinct?.brand,
         }));
     }
-    async addCustomerToStockNotification(shop, productId, name, email) {
-        return this.productStockNotificationRepository.addCustomerEmail(shop, productId, name, email);
-    }
     async findCatalog(options, limits) {
-        if (this.hasTerm(options) && options.sort === 'most-relevant') {
-            const productsIds = await this.findCatalogIdsByElasticSearch(options.term);
-            return this.findCatalogAndSortByMostRevelantByTerm(productsIds, options, limits);
-        }
-        if (this.hasCategory(options) && options.sort === 'most-relevant') {
-            const mostRelevant = options.category.mostRelevant ?? [];
-            const productsIds = await this.productRepository
-                .findCatalog({
-                fields: ['id'],
-                filters: {
-                    ...(await this.buildMainFilter(options)),
-                    ...this.buildFilterQuery(options?.filters || {}),
-                },
-            })
-                .then((products) => products.data.map((product) => product.id));
-            return this.findCatalogAndSortByMostRevelant(mostRelevant, productsIds, options, limits);
-        }
+        if (this.hasTerm(options) && options.sort === 'most-relevant')
+            return this.findCatalogByTermAndSortByMostRevelant(options, limits);
         const repoParams = {
             filters: {
                 ...(await this.buildMainFilter(options)),
@@ -1759,33 +1681,8 @@ class CatalogService {
                 .search(term, 999, this.shop)
                 .then((data) => ({ id: { operator: Where.IN, value: data.hits.map(({ _source }) => _source.id) } }));
     }
-    async findCatalogAndSortByMostRevelant(mostRelevants, productIds, options, limits) {
-        const mostRelevantProductsIds = [...new Set(mostRelevants.concat(productIds))];
-        const totalResult = await this.productRepository.findCatalog({
-            filters: {
-                id: { operator: Where.IN, value: mostRelevantProductsIds },
-                ...this.buildFilterQuery(options?.filters || {}),
-            },
-            orderBy: this.buildSortQuery('news'),
-            options: {
-                minimal: ['price'],
-                maximum: ['price'],
-                distinct: ['brand'],
-            },
-        }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
-        const firstProducts = totalResult.data.filter((product) => mostRelevants.includes(product.id));
-        const lastProducts = totalResult.data.filter((product) => !mostRelevants.includes(product.id));
-        const categoryMostRelevants = firstProducts.concat(lastProducts);
-        const resultFinal = categoryMostRelevants.slice(limits.offset, limits.offset + limits.limit);
-        return {
-            data: resultFinal,
-            count: totalResult.count,
-            maximum: totalResult.maximum,
-            minimal: totalResult.minimal,
-            distinct: totalResult.distinct,
-        };
-    }
-    async findCatalogAndSortByMostRevelantByTerm(productIds, options, limits) {
+    async findCatalogByTermAndSortByMostRevelant(options, limits) {
+        const productIds = await this.findCatalogIdsByElasticSearch(options.term);
         const totalResult = await this.productRepository.findCatalog({
             fields: ['id', 'stock'],
             filters: {
@@ -1831,7 +1728,7 @@ class CatalogService {
             return [...new Set(sorted.map(({ _source }) => _source.id))];
         }));
     }
-    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: i1$2.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: i1$2.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService, decorators: [{
@@ -1839,12 +1736,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['ProductRepository']
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['ProductStockNotificationRepository']
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['CategoryRepository']
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [CATEGORY_STRUCTURE]
@@ -1861,15 +1752,15 @@ class CategoryService {
         this.categoryStructureAdapter = categoryStructureAdapter;
         this.shop = shop;
     }
-    async fetchBrands(category, options) {
+    async fetchBrands(category, mainGender) {
         const brands = await this.productRepository
             .findCatalog({
             filters: await this.categoryStructureAdapter.buildProductFilterByCategory(category),
             fields: ['brand'],
-        }, options?.mainGender ? options?.mainGender : this.shop === Shops.MENSMARKET ? 'male' : 'female')
+        }, 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, shop: options?.shop || this.shop }, orderBy: { name: 'asc' } })
+            .find({ filters: { brandCategory: true, shop: this.shop }, orderBy: { name: 'asc' } })
             .then(({ data }) => data.filter((category) => brands.includes(category.conditions.brand)));
     }
     async fetchFilterOptions(category) {
@@ -1918,11 +1809,12 @@ __decorate([
 ], CategoryWithTree.prototype, "children", void 0);
 
 class WishlistService {
-    constructor(wishlistRepository, shop, productRepository, categoryFilterRepository, categoryRepository, productStockNotificationRepository, productIndex) {
+    constructor(wishlistRepository, categoryRepository, shop, productRepository, categoryFilterRepository, productIndex) {
         this.wishlistRepository = wishlistRepository;
+        this.categoryRepository = categoryRepository;
         this.shop = shop;
         const categoryStructureAdapter = new NewCategoryStructureAdapter(wishlistRepository);
-        this.catalogService = new CatalogService(productRepository, productStockNotificationRepository, categoryRepository, categoryStructureAdapter, shop, productIndex);
+        this.catalogService = new CatalogService(productRepository, categoryStructureAdapter, shop, productIndex);
         this.categoryService = new CategoryService(productRepository, categoryRepository, categoryFilterRepository, categoryStructureAdapter, shop);
     }
     getCatalogService() {
@@ -1931,7 +1823,7 @@ class WishlistService {
     getCategoryService() {
         return this.categoryService;
     }
-    async create({ personId, title, description, published, userFullName, userPhoto, theme, bannerUrl, }) {
+    async create({ personId, title, description, userFullName, userPhoto, theme, bannerUrl, }) {
         const data = {
             slug: '',
             name: title,
@@ -1946,7 +1838,7 @@ class WishlistService {
             personName: userFullName,
             personPhoto: userPhoto,
             brandCategory: false,
-            published,
+            published: true,
             theme,
             bannerUrl,
         };
@@ -1954,12 +1846,11 @@ class WishlistService {
         await this.wishlistRepository.update({ id: newWishlist.id, slug: newWishlist.id });
         return Wishlist.toInstance({ ...newWishlist.toPlain(), slug: newWishlist.id });
     }
-    update({ id, title, description, published, userFullName, userPhoto, theme, bannerUrl, }) {
+    update({ id, title, description, userFullName, userPhoto, theme, bannerUrl, }) {
         const data = {
             id,
             name: title,
             description,
-            published,
             metadata: {
                 title: `${userFullName} - ${title}`,
                 description: `${userFullName} - ${description}`,
@@ -2003,7 +1894,7 @@ class WishlistService {
         }
         return wishlist;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: 'CategoryRepository' }, { token: 'ProductStockNotificationRepository' }, { token: i1$2.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: 'CategoryRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: i1$2.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: WishlistService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: WishlistService, decorators: [{
@@ -2011,6 +1902,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['WishlistRepository']
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['CategoryRepository']
                 }] }, { type: i1$2.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
@@ -2020,27 +1914,31 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['CategoryFilterRepository']
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['CategoryRepository']
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['ProductStockNotificationRepository']
                 }] }, { type: i1$2.ProductsIndex }] });
 
 class CheckoutSubscriptionService {
-    constructor(checkoutSubscriptionRepository, dataPersistence, couponService) {
+    constructor(checkoutSubscriptionRepository, subscriptionRepository, couponService) {
         this.checkoutSubscriptionRepository = checkoutSubscriptionRepository;
-        this.dataPersistence = dataPersistence;
+        this.subscriptionRepository = subscriptionRepository;
         this.couponService = couponService;
     }
     getCheckoutSubscription(checkoutData) {
-        return this.dataPersistence
-            .get('checkoutSubscriptionId')
-            .pipe(concatMap((id) => !isNil(id) ? this.checkoutSubscriptionRepository.get({ id }) : this.createCheckoutSubscription(checkoutData)));
+        const checkoutId = cookie.get('checkoutSubscriptionId');
+        if (!isNil(checkoutId))
+            return from(this.checkoutSubscriptionRepository.get({ id: checkoutId }));
+        return from(this.createCheckoutSubscription(checkoutData));
+    }
+    async createCheckoutSubscription(checkoutData) {
+        const checkout = await this.checkoutSubscriptionRepository.create({
+            createdAt: new Date(),
+            ...CheckoutSubscription.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
+        });
+        cookie.set('checkoutSubscriptionId', checkout.id);
+        return checkout;
     }
     clearCheckoutSubscriptionFromSession() {
-        return this.dataPersistence.remove('checkoutSubscriptionId');
+        cookie.remove('checkoutSubscriptionId');
+        return of();
     }
     checkCoupon(nickname, userEmail) {
         return this.getCheckoutSubscription().pipe(concatMap((checkout) => this.couponService
@@ -2050,15 +1948,7 @@ class CheckoutSubscriptionService {
     calcDiscountSubscription(coupon) {
         return this.getCheckoutSubscription().pipe(concatMap((checkout) => this.couponService.calcDiscountSubscription(coupon, checkout).pipe()));
     }
-    async createCheckoutSubscription(checkoutData) {
-        const checkout = await this.checkoutSubscriptionRepository.create({
-            createdAt: new Date(),
-            ...CheckoutSubscription.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
-        });
-        await this.dataPersistence.set('checkoutSubscriptionId', checkout.id).toPromise();
-        return checkout;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token: PERSISTENCE_PROVIDER }, { token: CouponService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token: 'SubscriptionRepository' }, { token: CouponService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutSubscriptionService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CheckoutSubscriptionService, decorators: [{
@@ -2068,7 +1958,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                     args: ['CheckoutSubscriptionRepository']
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
-                    args: [PERSISTENCE_PROVIDER]
+                    args: ['SubscriptionRepository']
                 }] }, { type: CouponService }] });
 
 class UtilHelper {
@@ -2326,7 +2216,6 @@ class AngularConnectModule {
                         ? OldCategoryStructureAdapter
                         : NewCategoryStructureAdapter,
                 },
-                { provide: PERSISTENCE_PROVIDER, useClass: options?.persistenceProvider || CookieDataPersistence },
                 ...(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 }]),
@@ -2338,7 +2227,7 @@ class AngularConnectModule {
         };
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: AngularConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.3", ngImport: i0, type: AngularConnectModule, imports: [i1$4.FirebaseAppModule, i2.StorageModule, AngularElasticSeachModule,
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.3", ngImport: i0, type: AngularConnectModule, imports: [i1$4.FirebaseAppModule, AngularElasticSeachModule,
             AngularFirebaseAuthModule,
             AngularFirestoreModule,
             AngularHasuraGraphQLModule] }); }
@@ -2361,13 +2250,6 @@ class AngularConnectModule {
                 },
                 deps: ['UserRepository', 'FileUploaderService'],
             },
-            {
-                provide: 'FileUploaderService',
-                useFactory: (storage, baseUrl) => {
-                    return new FirebaseFileUploaderService(storage, baseUrl);
-                },
-                deps: [Storage, STORAGE_BASE_URL],
-            },
         ], imports: [provideFirebaseApp((injector) => {
                 const appName = injector.get(FIREBASE_APP_NAME) || '[DEFAULT]';
                 try {
@@ -2377,7 +2259,6 @@ class AngularConnectModule {
                     return initializeApp(injector.get(FIREBASE_OPTIONS), appName);
                 }
             }),
-            provideStorage((injector) => getStorage(injector.get(FirebaseApp))),
             AngularElasticSeachModule,
             AngularFirebaseAuthModule,
             AngularFirestoreModule,
@@ -2396,7 +2277,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                                 return initializeApp(injector.get(FIREBASE_OPTIONS), appName);
                             }
                         }),
-                        provideStorage((injector) => getStorage(injector.get(FirebaseApp))),
                         AngularElasticSeachModule,
                         AngularFirebaseAuthModule,
                         AngularFirestoreModule,
@@ -2421,13 +2301,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                             },
                             deps: ['UserRepository', 'FileUploaderService'],
                         },
-                        {
-                            provide: 'FileUploaderService',
-                            useFactory: (storage, baseUrl) => {
-                                return new FirebaseFileUploaderService(storage, baseUrl);
-                            },
-                            deps: [Storage, STORAGE_BASE_URL],
-                        },
                     ],
                 }]
         }] });
@@ -2436,5 +2309,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AngularConnectModule, AngularFirebaseAuthModule, AngularFirestoreModule, AngularHasuraGraphQLModule, AuthService, CartService, CatalogService, CategoryService, CategoryWithTree, CheckoutService, CheckoutSubscriptionService, CookieDataPersistence, CouponService, HomeShopService, NewCategoryStructureAdapter, OldCategoryStructureAdapter, OrderService, ProductSorts, ShippingService, UtilHelper, WishlistService };
+export { AngularConnectModule, AngularFirebaseAuthModule, AngularFirestoreModule, AngularHasuraGraphQLModule, AuthService, CartService, CatalogService, CategoryService, CategoryWithTree, CheckoutService, CheckoutSubscriptionService, CouponService, HomeShopService, NewCategoryStructureAdapter, OldCategoryStructureAdapter, OrderService, ProductSorts, ShippingService, UtilHelper, WishlistService };
 //# sourceMappingURL=infrab4a-connect-angular.mjs.map