@infrab4a/connect-angular 4.5.3-beta.10 → 4.5.3-beta.2

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1736,11 +1736,10 @@ class CatalogService {
             return this.findCatalogAndSortByMostRevelantByTerm(productsIds, options, limits);
         }
         if (this.hasCategory(options) && options.sort === 'most-relevant') {
-            const mostRelevant = options.category.mostRelevant ?? [];
+            const { mostRelevant } = options.category;
             console.log('mostRelevant', mostRelevant);
             const productsIds = await this.productRepository
                 .find({
-                fields: ['id'],
                 filters: {
                     ...(await this.buildMainFilter(options)),
                 },
@@ -1776,26 +1775,43 @@ class CatalogService {
                 .then((data) => ({ id: { operator: Where.IN, value: data.hits.map(({ _source }) => _source.id) } }));
     }
     async findCatalogAndSortByMostRevelant(mostRelevants, productIds, options, limits) {
-        console.log('mostRelevant', mostRelevants);
-        console.log('productIds', productIds);
-        const mostRelevantProductsIds = [...new Set(mostRelevants.concat(productIds))];
+        const { offset } = limits;
+        if (offset === 0) {
+            limits.limit -= mostRelevants.length;
+        }
+        if (offset > 0) {
+            limits.offset -= mostRelevants.length;
+        }
+        console.log('limits', limits);
+        const mostRelevantProductsIds = [...new Set(...mostRelevants, ...productIds)];
         const totalResult = await this.productRepository.findCatalog({
+            fields: ['id', 'stock'],
             filters: {
                 id: { operator: Where.IN, value: mostRelevantProductsIds },
+                ...this.buildFilterQuery(options?.filters || {}),
             },
-            orderBy: this.buildSortQuery('news'),
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
                 distinct: ['brand'],
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
-        const firstProducts = totalResult.data.filter((product) => mostRelevants.includes(product.id));
-        const lastProducts = totalResult.data.filter((product) => !mostRelevants.includes(product.id));
-        const categoryMostRelevants = firstProducts.concat(lastProducts);
-        const resultFinal = categoryMostRelevants.slice(limits.offset, limits.offset + limits.limit);
+        const stockData = totalResult.data.filter((product) => product.stock.quantity > 0);
+        const stockOut = totalResult.data.filter((product) => product.stock.quantity <= 0);
+        const productIdsStock = mostRelevantProductsIds.filter((product) => stockData.some((result) => result.id == product));
+        const productIdsStockOut = mostRelevantProductsIds.filter((product) => stockOut.some((result) => result.id == product));
+        const limitedProductId = productIdsStock
+            .concat(productIdsStockOut)
+            .slice(limits.offset, limits.offset + limits.limit);
+        const orderedId = mostRelevantProductsIds.filter((product) => limitedProductId.includes(product));
+        console.log('orderedId', orderedId);
+        const productResult = await this.productRepository.findCatalog({
+            filters: {
+                id: { operator: Where.IN, value: orderedId },
+            },
+        });
         return {
-            data: resultFinal,
+            data: limitedProductId.map((id) => productResult.data.find((product) => product.id === id)).filter(Boolean),
             count: totalResult.count,
             maximum: totalResult.maximum,
             minimal: totalResult.minimal,