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

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1538,23 +1538,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({
+        const totalResult = await this.productRepository.findCatalog({
+            fields: ['id'],
             filters: {
-                id: { operator: Where.IN, value: limitedProductId },
+                id: { operator: Where.IN, value: productIds },
                 ...this.buildFilterQuery(options?.filters || {}),
             },
-        }, 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 },
             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,