@infrab4a/connect-angular 4.5.4-beta.0 → 4.5.4-beta.2

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1733,9 +1733,10 @@ class CatalogService {
     async findCatalog(options, limits) {
         if (this.hasTerm(options) && options.sort === 'most-relevant') {
             const productsIds = await this.findCatalogIdsByElasticSearch(options.term);
-            return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
+            return this.findCatalogAndSortByMostRevelantByTerm(productsIds, options, limits);
         }
         if (this.hasCategory(options) && options.sort === 'most-relevant') {
+            const mostRelevant = options.category.mostRelevant ?? [];
             const productsIds = await this.productRepository
                 .find({
                 fields: ['id'],
@@ -1744,7 +1745,7 @@ class CatalogService {
                 },
             })
                 .then((products) => products.data.map((product) => product.id));
-            return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
+            return this.findCatalogAndSortByMostRevelant(mostRelevant, productsIds, options, limits);
         }
         const repoParams = {
             filters: {
@@ -1773,7 +1774,32 @@ class CatalogService {
                 .search(term, 999, this.shop)
                 .then((data) => ({ id: { operator: Where.IN, value: data.hits.map(({ _source }) => _source.id) } }));
     }
-    async findCatalogAndSortByMostRevelant(productIds, options, limits) {
+    async findCatalogAndSortByMostRevelant(mostRelevants, productIds, options, limits) {
+        const mostRelevantProductsIds = [...new Set(mostRelevants.concat(productIds))];
+        const totalResult = await this.productRepository.findCatalog({
+            filters: {
+                id: { operator: Where.IN, value: mostRelevantProductsIds },
+            },
+            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);
+        return {
+            data: resultFinal,
+            count: totalResult.count,
+            maximum: totalResult.maximum,
+            minimal: totalResult.minimal,
+            distinct: totalResult.distinct,
+        };
+    }
+    async findCatalogAndSortByMostRevelantByTerm(productIds, options, limits) {
         const totalResult = await this.productRepository.findCatalog({
             fields: ['id', 'stock'],
             filters: {