@infrab4a/connect-angular 4.10.0-beta.6 → 4.10.0-beta.8

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1744,6 +1744,7 @@ class CatalogService {
             throw new InvalidArgumentError(`It couldn't filled tags when profile is given`);
         if (this.hasTerm(options) && options.filters?.customOptions)
             throw new InvalidArgumentError(`It couldn't filled customOptions when term is given`);
+        console.log('fetchProducts', options);
         return await this.findCatalog(options, limits).then(({ data, count: total, maximum, minimal, distinct }) => ({
             products: { data: data.map((product) => RoundProductPricesHelper.roundProductPrices(product)), total },
             pages: Math.ceil(total / limits.limit),
@@ -1762,8 +1763,8 @@ class CatalogService {
     }
     async findCatalog(options, limits) {
         if (this.hasTerm(options) && options.sort === 'most-relevant') {
-            console.log('findCatalogIdsBySearch', options.term, options.perPage, options.perPage === 9);
-            const productsIds = await this.findCatalogIdsBySearch(options.term, options.perPage === 9);
+            // console.log('Step 1')
+            const productsIds = await this.findCatalogIdsBySearch(options.term);
             return this.findCatalogAndSortByMostRevelantByTerm(productsIds, options, limits);
         }
         if (this.hasCategory(options) && options.sort === 'most-relevant') {
@@ -1838,10 +1839,18 @@ class CatalogService {
         };
     }
     async findCatalogAndSortByMostRevelantByTerm(productIds, options, limits) {
+        // console.log('findCatalogAndSortByMostRevelantByTerm', this.shop, options, limits)
+        // console.log(
+        //   'productIds from search',
+        //   productIds.length,
+        //   'preview -> ',
+        //   productIds.slice(limits.offset, limits.offset + limits.limit),
+        // )
         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: {
@@ -1850,19 +1859,50 @@ class CatalogService {
                 distinct: ['brand'],
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
+        const productsTotalResult = totalResult.data.slice(limits.offset, limits.offset + limits.limit);
+        // console.log(
+        //   'productsTotalResult',
+        //   productsTotalResult.map((p) => {
+        //     return {
+        //       id: p.id,
+        //       stock: p.stock.quantity,
+        //     }
+        //   }),
+        // )
+        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)));
+        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);
+        // console.log('limitedProductId', limitedProductId)
         const orderedId = productIds.filter((product) => limitedProductId.includes(product));
         const productResult = await this.productRepository.findCatalog({
             filters: {
                 id: { operator: Where.IN, value: orderedId },
             },
         });
+        const finalResult = limitedProductId
+            .map((id) => productResult.data.find((product) => product.id === id))
+            .filter(Boolean);
+        // console.log(
+        //   'finalResult',
+        //   finalResult.map((p) => {
+        //     return {
+        //       id: p.id,
+        //       name: p.name,
+        //       brand: p.brand,
+        //     }
+        //   }),
+        // )
         return {
             data: limitedProductId.map((id) => productResult.data.find((product) => product.id === id)).filter(Boolean),
             count: totalResult.count,
@@ -1871,17 +1911,24 @@ class CatalogService {
             distinct: totalResult.distinct,
         };
     }
-    async findCatalogIdsBySearch(term, preview) {
+    async findCatalogIdsBySearch(term, preview = false) {
         if (this.productsByTerm[term])
             return this.productsByTerm[term];
         return (this.productsByTerm[term] = await this.productSearch
-            .search(term, preview ? 9 : 9999, this.shop == Shops.GLAMSHOP ? 'female' : 'male')
-            .then((products) => {
-            const withStock = products.filter((_source) => _source.stock > 0);
-            const withOutStock = products.filter((_source) => _source.stock <= 0);
-            const sorted = [...withStock, ...withOutStock];
-            return [...new Set(sorted.map((products) => products.id))];
-        }));
+            .search(term, 999, this.shop == Shops.GLAMSHOP ? 'female' : 'male')
+            .then((products) => [...new Set(products.map((product) => product.id))]));
+    }
+    prepareSearchResult(resultDb, searchIds, options, limits) {
+        const stockData = resultDb.filter((product) => product.stock.quantity > 0);
+        const stockOut = resultDb.filter((product) => product.stock.quantity <= 0);
+        if (options.filters?.gender) {
+        }
+        const productIdsStock = searchIds.filter((product) => stockData.some((result) => result.id === product));
+        const productIdsStockOut = searchIds.filter((product) => stockOut.some((result) => result.id === product));
+        const limitedProductId = productIdsStock
+            .concat(productIdsStockOut)
+            .slice(limits.offset, limits.offset + limits.limit);
+        return limitedProductId;
     }
 }
 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 });
@@ -1973,11 +2020,12 @@ __decorate([
 ], CategoryWithTree.prototype, "children", void 0);
 
 class WishlistService {
-    constructor(wishlistRepository, shop, productRepository, categoryFilterRepository, categoryRepository, productStockNotificationRepository, productVertexSearch) {
+    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, productVertexSearch);
+        this.catalogService = new CatalogService(productRepository, productStockNotificationRepository, categoryRepository, categoryStructureAdapter, shop, productSearch);
         this.categoryService = new CategoryService(productRepository, categoryRepository, categoryFilterRepository, categoryStructureAdapter, shop);
     }
     getCatalogService() {
@@ -2069,7 +2117,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.ProductsVertexSearch }], 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
@@ -2091,7 +2139,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['ProductStockNotificationRepository']
-                }] }, { type: i1$2.ProductsVertexSearch }]; } });
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['ProductSearch']
+                }] }]; } });
 
 class CheckoutSubscriptionService {
     constructor(checkoutSubscriptionRepository, dataPersistence, couponService) {