@infrab4a/connect-angular 4.10.0 → 4.11.1

package/fesm2020/infrab4a-connect-angular.mjs

@@ -5,7 +5,7 @@ import { FirebaseApp, provideFirebaseApp, getApp, initializeApp } from '@angular
 import * as i2 from '@angular/fire/storage';
 import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
 import * as i1$2 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, OrderBlockedFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, ProductStockNotificationHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, OrderStatus, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, PersonTypes, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage, FirebaseFileUploaderService } 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, OrderBlockedFirestoreRepository, CategoryHasuraGraphQLRepository, ProductHasuraGraphQLRepository, CategoryFilterHasuraGraphQLRepository, ProductReviewsHasuraGraphQLRepository, VariantHasuraGraphQLRepository, ProductStockNotificationHasuraGraphQLRepository, FilterOptionHasuraGraphQLRepository, FilterHasuraGraphQLRepository, CategoryCollectionChildrenHasuraGraphQLRepository, WishlistHasuraGraphQLRepository, ProductsVertexSearch, VertexAxiosAdapter, Where, Shops, CheckoutTypes, CouponTypes, Exclusivities, OrderStatus, isNil, NotFoundError, Checkout, pick, LineItem, RoundProductPricesHelper, set, InvalidArgumentError, Category, PersonTypes, Wishlist, CheckoutSubscription, Product, RequiredArgumentError, add, Order, UpdateUserImage, FirebaseFileUploaderService } 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';
@@ -63,6 +63,8 @@ const HASURA_OPTIONS = 'HASURA_OPTIONS';
 
 const PERSISTENCE_PROVIDER = 'PERSISTENCE_PROVIDER';
 
+const VERTEX_CONFIG = 'VERTEX_CONFIG';
+
 class AngularFirebaseAuthModule {
     static initializeApp(options, nameOrConfig) {
         return {
@@ -949,6 +951,36 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }]
         }] });
 
+class AngularVertexSeachModule {
+    static initializeApp(options) {
+        return {
+            ngModule: AngularVertexSeachModule,
+            providers: [{ provide: VERTEX_CONFIG, useValue: options }],
+        };
+    }
+}
+AngularVertexSeachModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularVertexSeachModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+AngularVertexSeachModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.1.0", ngImport: i0, type: AngularVertexSeachModule });
+AngularVertexSeachModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularVertexSeachModule, providers: [
+        {
+            provide: ProductsVertexSearch,
+            useFactory: (configuration) => new ProductsVertexSearch(new VertexAxiosAdapter(configuration)),
+            deps: [VERTEX_CONFIG],
+        },
+    ] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularVertexSeachModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    providers: [
+                        {
+                            provide: ProductsVertexSearch,
+                            useFactory: (configuration) => new ProductsVertexSearch(new VertexAxiosAdapter(configuration)),
+                            deps: [VERTEX_CONFIG],
+                        },
+                    ],
+                }]
+        }] });
+
 const STORAGE_BASE_URL = 'STORAGE_BASE_URL';
 
 class CookieDataPersistence {
@@ -1650,13 +1682,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }]; } });
 
 class CatalogService {
-    constructor(productRepository, productStockNotificationRepository, categoryRepository, categoryStructureAdapter, shop, productIndex) {
+    constructor(productRepository, productStockNotificationRepository, categoryRepository, categoryStructureAdapter, shop, productSearch) {
         this.productRepository = productRepository;
         this.productStockNotificationRepository = productStockNotificationRepository;
         this.categoryRepository = categoryRepository;
         this.categoryStructureAdapter = categoryStructureAdapter;
         this.shop = shop;
-        this.productIndex = productIndex;
+        this.productSearch = productSearch;
         this.productsByTerm = {};
         this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, customOptions, }) => {
             const filters = {};
@@ -1737,7 +1769,7 @@ class CatalogService {
     }
     async findCatalog(options, limits) {
         if (this.hasTerm(options) && options.sort === 'most-relevant') {
-            const productsIds = await this.findCatalogIdsByElasticSearch(options.term);
+            const productsIds = await this.findCatalogIdsBySearch(options.term);
             return this.findCatalogAndSortByMostRevelantByTerm(productsIds, options, limits);
         }
         if (this.hasCategory(options) && options.sort === 'most-relevant') {
@@ -1776,9 +1808,9 @@ class CatalogService {
         if (profile)
             return { tags: { operator: Where.LIKE, value: profile } };
         if (term)
-            return this.productIndex
-                .search(term, 999, this.shop)
-                .then((data) => ({ id: { operator: Where.IN, value: data.hits.map(({ _source }) => _source.id) } }));
+            return this.productSearch
+                .search(term, 999, this.shop == Shops.GLAMSHOP ? 'female' : 'male')
+                .then((data) => ({ id: { operator: Where.IN, value: data.map((_source) => _source.id) } }));
     }
     async findCatalogAndSortByMostRevelant(mostRelevants, productIds, options, limits) {
         const mostRelevantProductsIds = [...new Set(mostRelevants.concat(productIds))];
@@ -1813,9 +1845,10 @@ class CatalogService {
     }
     async findCatalogAndSortByMostRevelantByTerm(productIds, options, limits) {
         const totalResult = await this.productRepository.findCatalog({
-            fields: ['id', 'stock'],
+            fields: ['id', 'stock', 'gender'],
             filters: {
                 id: { operator: Where.IN, value: productIds },
+                published: { operator: Where.EQUALS, value: true },
                 ...this.buildFilterQuery(options?.filters || {}),
             },
             options: {
@@ -1824,10 +1857,17 @@ class CatalogService {
                 distinct: ['brand'],
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
+        const defaultGender = options?.filters?.gender
+            ? options?.filters?.gender.at(0)
+            : this.shop === Shops.GLAMSHOP
+                ? 'female'
+                : 'male';
         const stockData = totalResult.data.filter((product) => product.stock.quantity > 0);
         const stockOut = totalResult.data.filter((product) => product.stock.quantity <= 0);
-        const productIdsStock = productIds.filter((product) => stockData.some((result) => result.id == product));
-        const productIdsStockOut = productIds.filter((product) => stockOut.some((result) => result.id == product));
+        const productIdsStockGender = productIds.filter((product) => stockData.some((result) => result.id === product && (result.gender?.includes(defaultGender) || result.gender?.includes('unisex'))));
+        const productIdsStockNotGender = productIds.filter((product) => stockData.some((result) => result.id === product && !result.gender?.includes(defaultGender) && !result.gender?.includes('unisex')));
+        const productIdsStock = productIdsStockGender.concat(productIdsStockNotGender);
+        const productIdsStockOut = productIds.filter((product) => stockOut.some((result) => result.id === product));
         const limitedProductId = productIdsStock
             .concat(productIdsStockOut)
             .slice(limits.offset, limits.offset + limits.limit);
@@ -1845,20 +1885,15 @@ class CatalogService {
             distinct: totalResult.distinct,
         };
     }
-    async findCatalogIdsByElasticSearch(term) {
+    async findCatalogIdsBySearch(term, preview = false) {
         if (this.productsByTerm[term])
             return this.productsByTerm[term];
-        return (this.productsByTerm[term] = await this.productIndex
-            .search(term, 999, this.shop)
-            .then(({ hits: products }) => {
-            const withStock = products.filter(({ _source }) => _source.stock.quantity > 0);
-            const withOutStock = products.filter(({ _source }) => _source.stock.quantity <= 0);
-            const sorted = [...withStock, ...withOutStock];
-            return [...new Set(sorted.map(({ _source }) => _source.id))];
-        }));
+        return (this.productsByTerm[term] = await this.productSearch
+            .search(term, 999, this.shop == Shops.GLAMSHOP ? 'female' : 'male')
+            .then((products) => [...new Set(products.map((product) => product.id))]));
     }
 }
-CatalogService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: 'ProductStockNotificationRepository' }, { token: 'CategoryRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: i1$2.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable });
+CatalogService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: 'ProductStockNotificationRepository' }, { token: 'CategoryRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: 'ProductSearch' }], target: i0.ɵɵFactoryTarget.Injectable });
 CatalogService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CatalogService, decorators: [{
             type: Injectable
@@ -1877,7 +1912,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: i1$2.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
-                }] }, { type: i1$2.ProductsIndex }]; } });
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['ProductSearch']
+                }] }]; } });
 
 class CategoryService {
     constructor(productRepository, categoryRepository, categoryFilterRepository, categoryStructureAdapter, shop) {
@@ -1944,11 +1982,12 @@ __decorate([
 ], CategoryWithTree.prototype, "children", void 0);
 
 class WishlistService {
-    constructor(wishlistRepository, shop, productRepository, categoryFilterRepository, categoryRepository, productStockNotificationRepository, productIndex) {
+    constructor(wishlistRepository, shop, productRepository, categoryFilterRepository, categoryRepository, productStockNotificationRepository, productSearch) {
         this.wishlistRepository = wishlistRepository;
         this.shop = shop;
+        this.productSearch = productSearch;
         const categoryStructureAdapter = new NewCategoryStructureAdapter(wishlistRepository);
-        this.catalogService = new CatalogService(productRepository, productStockNotificationRepository, categoryRepository, categoryStructureAdapter, shop, productIndex);
+        this.catalogService = new CatalogService(productRepository, productStockNotificationRepository, categoryRepository, categoryStructureAdapter, shop, productSearch);
         this.categoryService = new CategoryService(productRepository, categoryRepository, categoryFilterRepository, categoryStructureAdapter, shop);
     }
     getCatalogService() {
@@ -1981,6 +2020,21 @@ class WishlistService {
             personType: personType ?? PersonTypes.NONE,
             personIsSubscriber: personIsSubscriber ?? false,
         };
+        const hasWishlist = await this.wishlistRepository
+            .find({
+            filters: {
+                personId,
+            },
+            options: {
+                enableCount: false,
+            },
+            orderBy: {
+                id: 'asc',
+            },
+        })
+            .then((res) => res.data);
+        if (hasWishlist.length)
+            return hasWishlist.at(0);
         const newWishlist = await this.wishlistRepository.create(data);
         await this.wishlistRepository.update({ id: newWishlist.id, slug: newWishlist.id });
         return Wishlist.toInstance({ ...newWishlist.toPlain(), slug: newWishlist.id });
@@ -2040,7 +2094,7 @@ class WishlistService {
         return wishlist;
     }
 }
-WishlistService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: 'CategoryRepository' }, { token: 'ProductStockNotificationRepository' }, { token: i1$2.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable });
+WishlistService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: 'CategoryRepository' }, { token: 'ProductStockNotificationRepository' }, { token: 'ProductSearch' }], target: i0.ɵɵFactoryTarget.Injectable });
 WishlistService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService, decorators: [{
             type: Injectable
@@ -2062,7 +2116,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['ProductStockNotificationRepository']
-                }] }, { type: i1$2.ProductsIndex }]; } });
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['ProductSearch']
+                }] }]; } });
 
 class CheckoutSubscriptionService {
     constructor(checkoutSubscriptionRepository, dataPersistence, couponService) {
@@ -2367,6 +2424,7 @@ class AngularConnectModule {
                 ...(isNil(options?.firebase) ? [] : [{ provide: FIREBASE_OPTIONS, useValue: options?.firebase }]),
                 ...(isNil(options?.firebase) ? [] : [{ provide: FIREBASE_APP_NAME, useValue: nameOrConfig }]),
                 ...(isNil(options?.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]),
+                ...(isNil(options?.vertexConfig) ? [] : [{ provide: VERTEX_CONFIG, useValue: options.vertexConfig }]),
                 ...(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 }]),
@@ -2376,6 +2434,7 @@ class AngularConnectModule {
 }
 AngularConnectModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: AngularConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
 AngularConnectModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.1.0", ngImport: i0, type: AngularConnectModule, imports: [i1$4.FirebaseAppModule, i2.StorageModule, AngularElasticSeachModule,
+        AngularVertexSeachModule,
         AngularFirebaseAuthModule,
         AngularFirestoreModule,
         AngularHasuraGraphQLModule] });
@@ -2405,6 +2464,10 @@ AngularConnectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", ve
             },
             deps: [Storage, STORAGE_BASE_URL],
         },
+        {
+            provide: 'ProductSearch',
+            useExisting: ProductsVertexSearch,
+        },
     ], imports: [provideFirebaseApp((injector) => {
             const appName = injector.get(FIREBASE_APP_NAME) || '[DEFAULT]';
             try {
@@ -2416,6 +2479,7 @@ AngularConnectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", ve
         }),
         provideStorage((injector) => getStorage(injector.get(FirebaseApp))),
         AngularElasticSeachModule,
+        AngularVertexSeachModule,
         AngularFirebaseAuthModule,
         AngularFirestoreModule,
         AngularHasuraGraphQLModule] });
@@ -2434,6 +2498,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                         }),
                         provideStorage((injector) => getStorage(injector.get(FirebaseApp))),
                         AngularElasticSeachModule,
+                        AngularVertexSeachModule,
                         AngularFirebaseAuthModule,
                         AngularFirestoreModule,
                         AngularHasuraGraphQLModule,
@@ -2464,6 +2529,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                             },
                             deps: [Storage, STORAGE_BASE_URL],
                         },
+                        {
+                            provide: 'ProductSearch',
+                            useExisting: ProductsVertexSearch,
+                        },
                     ],
                 }]
         }] });