@infrab4a/connect-angular 4.3.0-beta.2 → 4.3.0-beta.4

package/fesm2020/infrab4a-connect-angular.mjs

@@ -3,12 +3,14 @@ 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, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, CheckoutSubscription, Product, RequiredArgumentError, add, Order } 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, CheckoutSubscription, Product, RequiredArgumentError, add, Order } 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';
 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 { combineLatest, from, of, throwError, Subject, iif, forkJoin } from 'rxjs';
 import { map, mergeMap, catchError, concatMap, tap } from 'rxjs/operators';
 import cookie from 'js-cookie';
@@ -167,6 +169,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", 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) ||
@@ -187,7 +191,7 @@ class AngularFirestoreModule {
     }
 }
 AngularFirestoreModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularFirestoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-AngularFirestoreModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.1.0", ngImport: i0, type: AngularFirestoreModule, imports: [AngularElasticSeachModule, i1$1.FirestoreModule] });
+AngularFirestoreModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.1.0", ngImport: i0, type: AngularFirestoreModule, imports: [AngularElasticSeachModule, i1$1.FirestoreModule, i2.StorageModule] });
 AngularFirestoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularFirestoreModule, providers: [
         {
             provide: 'FirestoreOptions',
@@ -400,6 +404,13 @@ AngularFirestoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0",
             },
             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);
@@ -412,7 +423,8 @@ AngularFirestoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0",
                 localCache: memoryLocalCache(),
             });
             return firestore;
-        })] });
+        }),
+        provideStorage(() => getStorage())] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularFirestoreModule, decorators: [{
             type: NgModule,
             args: [{
@@ -430,6 +442,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                             });
                             return firestore;
                         }),
+                        provideStorage(() => getStorage()),
                     ],
                     providers: [
                         {
@@ -643,6 +656,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                             },
                             deps: ['FirestoreOptions', ProductFirestoreRepository],
                         },
+                        {
+                            provide: 'FileUploaderService',
+                            useFactory: (storage, baseUrl) => {
+                                return new FirebaseFileUploaderService(storage, baseUrl);
+                            },
+                            deps: [Storage, STORAGE_BASE_URL],
+                        },
                     ],
                 }]
         }] });
@@ -1385,8 +1405,8 @@ class CartService {
                 return { ...checkout, lineItems: notGiftItems };
             const elegibleCampaigns = [];
             for (const campaign of campaigns) {
-                const today = new Date().getDate();
-                if (!(campaign.startDate.getDate() <= today) && !(campaign.endDate.getDate() >= today))
+                const today = new Date().getTime();
+                if (!(campaign.startDate.getTime() <= today) && !(campaign.endDate.getTime() >= today))
                     continue;
                 if (campaign.activeCategory) {
                     const categoriesCampaing = campaign.categories.map((c) => c.id.toString());
@@ -1588,20 +1608,27 @@ class CatalogService {
     }
     async findCatalogByTermAndSortByMostRevelant(options, limits) {
         const productIds = await this.findCatalogIdsByElasticSearch(options.term);
-        const limitedProductId = productIds.slice(limits.offset, limits.offset + limits.limit);
-        const productResult = await this.productRepository.findCatalog({
-            filters: { id: { operator: Where.IN, value: limitedProductId } },
-        }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
         const totalResult = await this.productRepository.findCatalog({
             fields: ['id'],
-            filters: { id: { operator: Where.IN, value: productIds } },
-            limits: { limit: 1, offset: 0 },
+            filters: {
+                id: { operator: Where.IN, value: productIds },
+                ...this.buildFilterQuery(options?.filters || {}),
+            },
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
                 distinct: ['brand'],
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
+        const limitedProductId = totalResult.data
+            .slice(limits.offset, limits.offset + limits.limit)
+            .map((product) => product.id);
+        const orderedId = productIds.filter((product) => limitedProductId.includes(product));
+        const productResult = await this.productRepository.findCatalog({
+            filters: {
+                id: { operator: Where.IN, value: orderedId },
+            },
+        });
         return {
             data: limitedProductId.map((id) => productResult.data.find((product) => product.id === id)).filter(Boolean),
             count: totalResult.count,
@@ -2154,6 +2181,7 @@ class AngularConnectModule {
                 ...(isNil(options?.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]),
                 ...(isNil(options?.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]),
                 ...(isNil(options?.backendUrl) ? [] : [{ provide: BACKEND_URL, useValue: options.backendUrl }]),
+                ...(isNil(options?.storageBaseUrl) ? [] : [{ provide: STORAGE_BASE_URL, useValue: options.storageBaseUrl }]),
             ],
         };
     }