@infrab4a/connect-angular 4.5.3-beta.5 → 4.5.3-beta.7

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1777,22 +1777,15 @@ class CatalogService {
     async findCatalogAndSortByMostRevelant(mostRelevants, productIds, options, limits) {
         console.log('mostRelevant', mostRelevants);
         console.log('productIds', 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.concat(productIds))];
         console.log('mostRelevantProductsIds', mostRelevantProductsIds);
         const totalResult = await this.productRepository.findCatalog({
             fields: ['id', 'stock'],
             filters: {
                 id: { operator: Where.IN, value: mostRelevantProductsIds },
-                ...this.buildFilterQuery(options?.filters || {}),
             },
+            // limits,
+            orderBy: this.buildSortQuery('news'),
             options: {
                 minimal: ['price'],
                 maximum: ['price'],
@@ -1800,22 +1793,38 @@ class CatalogService {
             },
         }, options?.mainGender || this.shop === Shops.MENSMARKET ? 'male' : 'female');
         console.log('totalResult', totalResult.count);
-        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 },
-            },
-        });
+        // 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 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 orderedId = mostRelevantProductsIds.filter((product) => limitedProductId.includes(product))
+        // console.log('orderedId', orderedId)
+        // const productResult = await this.productRepository.findCatalog({
+        //   filters: {
+        //     id: { operator: Where.IN, value: orderedId },
+        //   },
+        // })
+        // const totalResult = categoryMostRelevants.
+        // Pesquisa os most_relevant
+        // Valida stock
+        // Pesquisa os news
+        // Valida stock
+        // Junta e faz o slice
+        // Valida se não tem repetido
+        const resultFinal = categoryMostRelevants.slice(limits.offset, limits.offset + limits.limit);
+        console.log('resultFinal', resultFinal);
         return {
-            data: limitedProductId.map((id) => productResult.data.find((product) => product.id === id)).filter(Boolean),
+            data: resultFinal,
             count: totalResult.count,
             maximum: totalResult.maximum,
             minimal: totalResult.minimal,