@infrab4a/connect-angular 4.0.0-beta.19 → 4.0.0-beta.20

package/fesm2020/infrab4a-connect-angular.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, Inject, InjectionToken, NgModule, PLATFORM_ID } from '@angular/core';
 import * as i1 from '@angular/fire/auth';
 import { getIdToken, authState, Auth, provideAuth, getAuth } from '@angular/fire/auth';
-import { combineLatest, of, from, 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 * as i3 from '@infrab4a/connect';
 import { Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, isNil, NotFoundError, Checkout, pick, LineItem, CheckoutSubscription, Category, Product, RequiredArgumentError, add, Order, Authentication, AuthenticationFirebaseAuthService, Register, RegisterFirebaseAuthService, SignOut, RecoveryPassword, ProductsIndex, AxiosAdapter, UserBeautyProfileFirestoreRepository, Buy2WinFirestoreRepository, CategoryFirestoreRepository, CheckoutFirestoreRepository, CheckoutSubscriptionFirestoreRepository, CouponFirestoreRepository, CampaignHashtagFirestoreRepository, CampaignDashboardFirestoreRepository, SubscriptionEditionFirestoreRepository, HomeFirestoreRepository, LeadFirestoreRepository, LegacyOrderFirestoreRepository, ShopMenuFirestoreRepository, OrderFirestoreRepository, PaymentFirestoreRepository, ProductFirestoreRepository, ShopSettingsFirestoreRepository, SubscriptionPaymentFirestoreRepository, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionFirestoreRepository, UserFirestoreRepository, UserAddressFirestoreRepository, UserPaymentMethodFirestoreRepository, ProductVariantFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, VariantHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository } from '@infrab4a/connect';
@@ -30,7 +30,7 @@ class AuthService {
         })));
     }
     getUser() {
-        return this.getFireUser().pipe(map((user) => user?.uid), mergeMap((id) => (id ? this.userRepository.get({ id }) : of(null))), catchError(() => of(null)));
+        return this.getFireUser().pipe(map((user) => user?.uid), mergeMap((id) => (id ? from(this.userRepository.get({ id })).pipe(catchError(() => of(null))) : of(null))));
     }
     getTokenId() {
         return from(getIdToken(this.angularFireAuth.currentUser));
@@ -358,13 +358,13 @@ class CartService {
                 .updateCheckoutLineItems(checkoutLoaded)
                 .pipe(map((updatedCheckout) => this.generateCartObject(updatedCheckout.lineItems)));
         }));
-        this.generateCartObject = (items) => items.reduce((cart, item) => ({
+        this.generateCartObject = (items) => items?.reduce((cart, item) => ({
             ...cart,
             [item.id]: LineItem.toInstance({
                 ...(cart[item.id] || item),
                 quantity: (cart[item.id]?.quantity || 0) + (item.quantity ? item.quantity : 1),
             }),
-        }), {});
+        }), {}) || {};
         this.buildLineItem = async ({ checkout, item, quantity, }) => {
             const product = await this.getProductData(item.id);
             item.quantity = item?.quantity || checkout?.lineItems?.find((lineItem) => lineItem.id === item.id)?.quantity || 0;
@@ -479,6 +479,10 @@ class CartService {
     }
     getGifts() {
         return this.checkoutService.getCheckout().pipe(mergeMap(async (checkout) => {
+            const notGiftItems = checkout.lineItems ? checkout.lineItems.filter((item) => !item.isGift) : [];
+            if (!notGiftItems.length)
+                return { ...checkout, lineItems: [] };
+            const cartTotal = notGiftItems.reduce((a, b) => a + b.pricePaid * b.quantity, 0);
             const campaigns = await this.buy2WinRepository
                 .find({
                 filters: {
@@ -487,10 +491,8 @@ class CartService {
                 },
             })
                 .then((data) => data.data);
-            const notGiftItems = checkout.lineItems.filter((item) => !item.isGift);
             if (!campaigns.length)
                 return { ...checkout, lineItems: notGiftItems };
-            const cartTotal = notGiftItems.reduce((a, b) => a + b.pricePaid * b.quantity, 0);
             const elegibleCampaigns = [];
             for (const campaign of campaigns) {
                 const today = new Date();
@@ -522,10 +524,13 @@ class CartService {
             for (const campaign of elegibleCampaigns) {
                 let elegibleProducts = [];
                 for (const product of campaign.products) {
-                    const productData = await this.productRepository.get({ sku: product });
-                    if (!productData)
+                    const { data: productData } = await this.productRepository.find({ filters: { sku: product } });
+                    if (!productData.length)
+                        continue;
+                    const gift = productData.shift();
+                    if (gift.stock.quantity < 1)
                         continue;
-                    elegibleProducts.push(productData);
+                    elegibleProducts.push(gift);
                 }
                 campaingnProducts.push(elegibleProducts);
             }
@@ -971,9 +976,7 @@ AngularElasticSeachModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0
 AngularElasticSeachModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularElasticSeachModule, providers: [
         {
             provide: ProductsIndex,
-            useFactory: (configuration) => {
-                return new ProductsIndex(new AxiosAdapter(configuration));
-            },
+            useFactory: (configuration) => new ProductsIndex(new AxiosAdapter(configuration)),
             deps: [ES_CONFIG],
         },
     ] });
@@ -983,9 +986,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                     providers: [
                         {
                             provide: ProductsIndex,
-                            useFactory: (configuration) => {
-                                return new ProductsIndex(new AxiosAdapter(configuration));
-                            },
+                            useFactory: (configuration) => new ProductsIndex(new AxiosAdapter(configuration)),
                             deps: [ES_CONFIG],
                         },
                     ],