@infrab4a/connect-angular 4.3.7-beta.8 → 4.3.7-beta.9

package/fesm2020/infrab4a-connect-angular.mjs

@@ -12,7 +12,7 @@ import { Firestore, provideFirestore, getFirestore, initializeFirestore, memoryL
 import * as i2 from '@angular/fire/storage';
 import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
 import cookie from 'js-cookie';
-import { combineLatest, from, of, throwError, Subject, iif, forkJoin } from 'rxjs';
+import { from, combineLatest, of, 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';
@@ -930,14 +930,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
         }] });
 
 class CookieDataPersistence {
-    async get(key) {
-        return cookie.get(key);
+    get(key) {
+        return from(cookie.get(key));
     }
-    async remove(key) {
+    remove(key) {
         cookie.remove(key);
+        return;
     }
-    async set(key, value) {
-        await cookie.set(key, value);
+    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 });
@@ -1206,18 +1207,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'))));
@@ -1229,8 +1229,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)));
@@ -1244,26 +1243,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 {
@@ -1946,28 +1945,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
@@ -1977,8 +1966,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
@@ -1987,7 +1984,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 {