@infrab4a/connect-angular 4.3.14 → 4.4.0-beta.11

package/fesm2020/infrab4a-connect-angular.mjs

@@ -3,7 +3,7 @@ import { NgModule, InjectionToken, PLATFORM_ID, Injectable, Inject } from '@angu
 import * as i1$4 from '@angular/fire/app';
 import { FirebaseApp, provideFirebaseApp, getApp, initializeApp } from '@angular/fire/app';
 import * as i1$2 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 { 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, 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 { isPlatformBrowser, isPlatformServer } from '@angular/common';
@@ -11,9 +11,9 @@ import * as i1$1 from '@angular/fire/firestore';
 import { Firestore, provideFirestore, getFirestore, initializeFirestore, memoryLocalCache, docSnapshots, doc } from '@angular/fire/firestore';
 import * as i2 from '@angular/fire/storage';
 import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
-import cookie from 'js-cookie';
-import { of, from, combineLatest, throwError, Subject, iif, forkJoin } from 'rxjs';
+import { combineLatest, from, of, throwError, Subject, iif, forkJoin } from 'rxjs';
 import { map, mergeMap, catchError, concatMap, tap } from 'rxjs/operators';
+import cookie from 'js-cookie';
 import { __decorate, __metadata } 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 {
@@ -198,7 +196,7 @@ AngularFirestoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0",
         {
             provide: 'FirestoreOptions',
             useFactory: (firestore, platformId) => ({
-                firestore,
+                firestore: new ConnectFirestoreService(firestore),
                 interceptors: {
                     request: (request) => {
                         if (isPlatformBrowser(platformId))
@@ -450,7 +448,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                         {
                             provide: 'FirestoreOptions',
                             useFactory: (firestore, platformId) => ({
-                                firestore,
+                                firestore: new ConnectFirestoreService(firestore),
                                 interceptors: {
                                     request: (request) => {
                                         if (isPlatformBrowser(platformId))
@@ -929,23 +927,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }]
         }] });
 
-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(() => { }));
-    }
-}
-CookieDataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CookieDataPersistence, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-CookieDataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CookieDataPersistence });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CookieDataPersistence, decorators: [{
-            type: Injectable
-        }] });
-
 class AuthService {
     constructor(angularFireAuth, userRepository) {
         this.angularFireAuth = angularFireAuth;
@@ -1206,17 +1187,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", 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'))));
@@ -1228,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)));
@@ -1242,26 +1225,26 @@ 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;
     }
 }
-CheckoutService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, deps: [{ token: CouponService }, { token: 'CheckoutRepository' }, { token: 'UserRepository' }, { token: DEFAULT_SHOP }, { token: PERSISTENCE_PROVIDER }], target: i0.ɵɵFactoryTarget.Injectable });
+CheckoutService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, deps: [{ token: CouponService }, { token: 'CheckoutRepository' }, { token: 'OrderRepository' }, { token: 'UserRepository' }, { token: DEFAULT_SHOP }], target: i0.ɵɵFactoryTarget.Injectable });
 CheckoutService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ 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 {
@@ -1558,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;
     }
 }
 NewCategoryStructureAdapter.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter, deps: [{ token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -1627,22 +1608,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;
@@ -1682,13 +1658,9 @@ class CatalogService {
             return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
         }
         if (this.hasCategory(options) && options.sort === 'most-relevant') {
-            const productsIds = await this.productRepository
-                .find({
-                filters: {
-                    ...(await this.buildMainFilter(options)),
-                },
-            })
-                .then((products) => products.data.map((product) => product.id));
+            const productsIds = options.category.products?.length
+                ? options.category.products
+                : await this.categoryRepository.get({ id: options.category.id }).then((categoryFound) => categoryFound.products);
             return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
         }
         const repoParams = {
@@ -1955,18 +1927,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { 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
@@ -1976,16 +1958,8 @@ 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;
-    }
 }
-CheckoutSubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token: PERSISTENCE_PROVIDER }, { token: CouponService }], target: i0.ɵɵFactoryTarget.Injectable });
+CheckoutSubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token: 'SubscriptionRepository' }, { token: CouponService }], target: i0.ɵɵFactoryTarget.Injectable });
 CheckoutSubscriptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, decorators: [{
             type: Injectable
@@ -1994,7 +1968,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                     args: ['CheckoutSubscriptionRepository']
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
-                    args: [PERSISTENCE_PROVIDER]
+                    args: ['SubscriptionRepository']
                 }] }, { type: CouponService }]; } });
 
 class UtilHelper {
@@ -2252,7 +2226,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 }]),
@@ -2346,5 +2319,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", 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