@infrab4a/connect-angular 4.4.0 → 4.4.1-beta.1

package/fesm2020/infrab4a-connect-angular.mjs

@@ -8,12 +8,12 @@ import * as i1 from '@angular/fire/auth';
 import { Auth, provideAuth, getAuth, getIdToken, authState } from '@angular/fire/auth';
 import { isPlatformBrowser, isPlatformServer } from '@angular/common';
 import * as i1$1 from '@angular/fire/firestore';
-import { Firestore, provideFirestore, getFirestore, initializeFirestore, memoryLocalCache, docSnapshots, doc } from '@angular/fire/firestore';
+import { Firestore, provideFirestore, initializeFirestore, memoryLocalCache, docSnapshots, doc } from '@angular/fire/firestore';
 import * as i2 from '@angular/fire/storage';
 import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
-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 { of, from, combineLatest, throwError, Subject, iif, forkJoin } from 'rxjs';
+import { map, mergeMap, catchError, concatMap, tap } from 'rxjs/operators';
 import { __decorate, __metadata } from 'tslib';
 import { Type } from 'class-transformer';
 import * as i1$3 from '@angular/common/http';
@@ -61,6 +61,8 @@ const FIREBASE_OPTIONS = new InjectionToken('firebaseOptions');
 
 const HASURA_OPTIONS = 'HASURA_OPTIONS';
 
+const PERSISTENCE_PROVIDER = 'PERSISTENCE_PROVIDER';
+
 class AngularFirebaseAuthModule {
     static initializeApp(options, nameOrConfig) {
         return {
@@ -414,12 +416,13 @@ AngularFirestoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0",
     ], imports: [AngularElasticSeachModule,
         provideFirestore((injector) => {
             const platformId = injector.get(PLATFORM_ID);
-            if (isPlatformServer(platformId))
-                return getFirestore(injector.get(FirebaseApp));
-            if (!MobileOperationSystemCheckerHelper.isAppleDevice())
-                return getFirestore(injector.get(FirebaseApp));
+            if (isPlatformServer(platformId) || !MobileOperationSystemCheckerHelper.isAppleDevice())
+                return initializeFirestore(injector.get(FirebaseApp), {
+                    ignoreUndefinedProperties: true,
+                });
             const firestore = initializeFirestore(injector.get(FirebaseApp), {
                 experimentalForceLongPolling: true,
+                ignoreUndefinedProperties: true,
                 localCache: memoryLocalCache(),
             });
             return firestore;
@@ -432,12 +435,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                         AngularElasticSeachModule,
                         provideFirestore((injector) => {
                             const platformId = injector.get(PLATFORM_ID);
-                            if (isPlatformServer(platformId))
-                                return getFirestore(injector.get(FirebaseApp));
-                            if (!MobileOperationSystemCheckerHelper.isAppleDevice())
-                                return getFirestore(injector.get(FirebaseApp));
+                            if (isPlatformServer(platformId) || !MobileOperationSystemCheckerHelper.isAppleDevice())
+                                return initializeFirestore(injector.get(FirebaseApp), {
+                                    ignoreUndefinedProperties: true,
+                                });
                             const firestore = initializeFirestore(injector.get(FirebaseApp), {
                                 experimentalForceLongPolling: true,
+                                ignoreUndefinedProperties: true,
                                 localCache: memoryLocalCache(),
                             });
                             return firestore;
@@ -927,6 +931,23 @@ 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;
@@ -1033,26 +1054,27 @@ class CouponService {
         return of(discount);
     }
     async calcDiscountShopping(coupon, checkout) {
-        let discount = 0;
+        let discountInfo = null;
         if (checkout.user.isSubscriber && coupon.discount.subscriber.value) {
-            discount = await this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
+            discountInfo = await this.calcDiscountByType(coupon.discount.subscriber.type, coupon.discount.subscriber.value, coupon.productsCategories, checkout);
         }
         else {
-            discount = await this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
+            discountInfo = await this.calcDiscountByType(coupon.discount.non_subscriber.type, coupon.discount.non_subscriber.value, coupon.productsCategories, checkout);
         }
-        return discount;
+        return { discount: discountInfo.discount, lineItems: discountInfo.lineItems };
     }
     async calcDiscountByType(type, value, categories, checkout) {
         let discount = 0;
-        let lineItensDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
-        const subTotal = this.calcCheckoutSubtotal(lineItensDiscount, checkout.user, checkout.shop);
+        let lineItensElegibleForDiscount = await this.getLineItensEligebleForDiscount(categories, checkout);
+        const subTotal = this.calcCheckoutSubtotal(lineItensElegibleForDiscount, checkout.user, checkout.shop);
         if (type == CouponTypes.ABSOLUTE) {
             discount = value > subTotal ? subTotal : value;
         }
         else {
             discount = subTotal * (value / 100);
         }
-        return discount;
+        const lineItems = this.calcLineItenDiscount(type, lineItensElegibleForDiscount, value, checkout.subTotalPrice);
+        return { discount, lineItems };
     }
     async hasMinSubTotal(coupon, checkout) {
         if (!coupon.minSubTotalValue)
@@ -1164,6 +1186,31 @@ class CouponService {
         }
         return couponUseLimits;
     }
+    calcLineItenDiscount(type, lineItems, couponDiscount, subTotal) {
+        let lineItemsDiscount = [];
+        if (type == CouponTypes.ABSOLUTE) {
+            lineItemsDiscount = lineItems.map((item) => {
+                const totalItemPercentage = item.pricePaid / subTotal;
+                const discountItem = item.pricePaid - couponDiscount * totalItemPercentage;
+                return {
+                    ...item,
+                    discount: discountItem,
+                    pricePaid: item.pricePaid - discountItem,
+                };
+            });
+        }
+        else {
+            lineItemsDiscount = lineItems.map((item) => {
+                const discountItem = item.pricePaid * (couponDiscount / 100);
+                return {
+                    ...item,
+                    discount: discountItem,
+                    pricePaid: item.pricePaid - discountItem,
+                };
+            });
+        }
+        return lineItemsDiscount;
+    }
 }
 CouponService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CouponService, deps: [{ token: 'CouponRepository' }, { token: DEFAULT_SHOP }, { token: 'OrderRepository' }, { token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
 CouponService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CouponService, providedIn: 'root' });
@@ -1187,18 +1234,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }]; } });
 
 class CheckoutService {
-    constructor(couponService, checkoutRepository, orderRepository, userRepository, defaultShop) {
+    constructor(couponService, checkoutRepository, userRepository, defaultShop, dataPersistence) {
         this.couponService = couponService;
         this.checkoutRepository = checkoutRepository;
-        this.orderRepository = orderRepository;
         this.userRepository = userRepository;
         this.defaultShop = defaultShop;
+        this.dataPersistence = dataPersistence;
     }
     getCheckout(checkoutData) {
-        const checkoutId = cookie.get('checkoutId');
-        if (!isNil(checkoutId))
-            return from(this.checkoutRepository.get({ id: checkoutId }));
-        return from(this.createCheckout(checkoutData));
+        return this.dataPersistence
+            .get('checkoutId')
+            .pipe(concatMap((id) => (!isNil(id) ? this.checkoutRepository.get({ id }) : 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'))));
@@ -1210,8 +1256,7 @@ class CheckoutService {
         return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, user: checkout.user })));
     }
     clearCheckoutFromSession() {
-        cookie.remove('checkoutId');
-        return of();
+        return this.dataPersistence.remove('checkoutId');
     }
     calcDiscount(coupon) {
         return this.getCheckout().pipe(concatMap(async (checkout) => await this.couponService.calcDiscountShopping(coupon, checkout)));
@@ -1225,26 +1270,26 @@ class CheckoutService {
             ...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
             shop: checkoutData?.shop || this.defaultShop,
         });
-        cookie.set('checkoutId', checkout.id);
+        await this.dataPersistence.set('checkoutId', checkout.id).toPromise();
         return checkout;
     }
 }
-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.ɵ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.ɵ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 {
@@ -1306,6 +1351,8 @@ class CartService {
                     weight: weight ?? product.weight,
                     quantity: (item.quantity || 0) + (quantity || 0),
                     pricePaid,
+                    pricePaidOriginal: pricePaid,
+                    discount: 0,
                     categories: product.categories ?? [],
                     isGift: isGift ?? null,
                     costPrice: product.costPrice ?? 0,
@@ -1541,9 +1588,11 @@ class NewCategoryStructureAdapter {
             .then((categories) => categories.map((category) => category.id.toString()));
     }
     async getCategory(category) {
-        return isNil(category.isCollection) || (category.isCollection && !category.products?.length)
-            ? this.categoryRepository.get({ id: category.id })
-            : category;
+        const collectionCategory = category.isCollection ||
+            (isNil(category.isCollection) && !category.products?.length) ||
+            category.isWishlist ||
+            category.brandCategory;
+        return collectionCategory ? 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 });
@@ -1608,17 +1657,22 @@ class CatalogService {
             if (!sort || sort === 'most-relevant')
                 return {};
             if (sort === 'best-sellers')
-                return { shoppingCount: 'desc' };
+                return {
+                    shoppingCount: 'desc',
+                    rate: 'desc',
+                    stock: 'desc',
+                    name: 'asc',
+                };
             if (sort === 'biggest-price')
-                return { subscriberPrice: 'desc' };
+                return { subscriberPrice: 'desc', rate: 'desc', shoppingCount: 'desc' };
             if (sort === 'lowest-price')
-                return { subscriberPrice: 'asc' };
+                return { subscriberPrice: 'asc', rate: 'desc', shoppingCount: 'desc' };
             if (sort === 'best-rating')
-                return { rate: 'desc' };
+                return { rate: 'desc', shoppingCount: 'desc', stock: 'desc', name: 'asc' };
             if (sort === 'news')
                 return { createdAt: 'desc' };
             if (sort === 'biggest-discount')
-                return { subscriberDiscountPercentage: 'desc' };
+                return { subscriberDiscountPercentage: 'desc', rate: 'desc', shoppingCount: 'desc' };
         };
         this.buildLimitQuery = (options) => {
             const limit = options?.perPage || 20;
@@ -1658,9 +1712,13 @@ class CatalogService {
             return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
         }
         if (this.hasCategory(options) && options.sort === 'most-relevant') {
-            const productsIds = options.category.products?.length
-                ? options.category.products
-                : await this.categoryRepository.get({ id: options.category.id }).then((categoryFound) => categoryFound.products);
+            const productsIds = await this.productRepository
+                .find({
+                filters: {
+                    ...(await this.buildMainFilter(options)),
+                },
+            })
+                .then((products) => products.data.map((product) => product.id));
             return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
         }
         const repoParams = {
@@ -1927,28 +1985,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: i1$2.ProductsIndex }]; } });
 
 class CheckoutSubscriptionService {
-    constructor(checkoutSubscriptionRepository, subscriptionRepository, couponService) {
+    constructor(checkoutSubscriptionRepository, dataPersistence, couponService) {
         this.checkoutSubscriptionRepository = checkoutSubscriptionRepository;
-        this.subscriptionRepository = subscriptionRepository;
+        this.dataPersistence = dataPersistence;
         this.couponService = couponService;
     }
     getCheckoutSubscription(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;
+        return this.dataPersistence
+            .get('checkoutSubscriptionId')
+            .pipe(concatMap((id) => !isNil(id) ? this.checkoutSubscriptionRepository.get({ id }) : this.createCheckoutSubscription(checkoutData)));
     }
     clearCheckoutSubscriptionFromSession() {
-        cookie.remove('checkoutSubscriptionId');
-        return of();
+        return this.dataPersistence.remove('checkoutSubscriptionId');
     }
     checkCoupon(nickname, userEmail) {
         return this.getCheckoutSubscription().pipe(concatMap((checkout) => this.couponService
@@ -1958,8 +2006,16 @@ 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: 'SubscriptionRepository' }, { 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: PERSISTENCE_PROVIDER }, { 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
@@ -1968,7 +2024,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                     args: ['CheckoutSubscriptionRepository']
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
-                    args: ['SubscriptionRepository']
+                    args: [PERSISTENCE_PROVIDER]
                 }] }, { type: CouponService }]; } });
 
 class UtilHelper {
@@ -2226,6 +2282,7 @@ 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 }]),
@@ -2319,5 +2376,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, CouponService, HomeShopService, NewCategoryStructureAdapter, OldCategoryStructureAdapter, OrderService, ProductSorts, ShippingService, UtilHelper, WishlistService };
+export { AngularConnectModule, AngularFirebaseAuthModule, AngularFirestoreModule, AngularHasuraGraphQLModule, AuthService, CartService, CatalogService, CategoryService, CategoryWithTree, CheckoutService, CheckoutSubscriptionService, CookieDataPersistence, CouponService, HomeShopService, NewCategoryStructureAdapter, OldCategoryStructureAdapter, OrderService, ProductSorts, ShippingService, UtilHelper, WishlistService };
 //# sourceMappingURL=infrab4a-connect-angular.mjs.map