@ozdao/martyrs 0.2.509 → 0.2.511

package/src/modules/products/controllers/queries/products.queries.js

@@ -122,48 +122,41 @@ function getAttributeFiltersStage(filtersString) {
 
 /**
  * Обрабатывает фильтрацию по цене вариантов
- * @param {string} prices - строка с ценовыми диапазонами
+ * @param {string} priceMin - минимальная цена
+ * @param {string} priceMax - максимальная цена
  * @returns {Array} этапы агрегации для фильтрации по ценам вариантов
  */
-function getVariantPriceFilterStage(prices) {
-  if (!prices) return [];
+function getVariantPriceFilterStage(priceMin, priceMax) {
+  // Проверяем что хотя бы одно значение существует и не пустое
+  const hasValidMin = priceMin && priceMin.trim() !== '';
+  const hasValidMax = priceMax && priceMax.trim() !== '';
+  
+  if (!hasValidMin && !hasValidMax) return [];
   
   try {
-    const priceRanges = prices.split(',');
-    const priceConditions = [];
-    
-    priceRanges.forEach(priceRange => {
-      if (priceRange.startsWith('<')) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $lt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else if (priceRange.startsWith('>')) {
-        priceConditions.push({
-          variants: {
-            $elemMatch: {
-              price: { $gt: parseFloat(priceRange.slice(1)) }
-            }
-          }
-        });
-      } else {
-        const [min, max] = priceRange.split('-').map(Number);
-        if (!isNaN(min) && !isNaN(max)) {
-          priceConditions.push({
-            variants: {
-              $elemMatch: {
-                price: { $gte: min, $lte: max }
-              }
-            }
-          });
+    const priceCondition = {
+      variants: {
+        $elemMatch: {
+          price: {}
         }
       }
-    });
+    };
+    
+    if (hasValidMin) {
+      const minPrice = parseFloat(priceMin);
+      if (!isNaN(minPrice)) {
+        priceCondition.variants.$elemMatch.price.$gte = minPrice;
+      }
+    }
+    
+    if (hasValidMax) {
+      const maxPrice = parseFloat(priceMax);
+      if (!isNaN(maxPrice)) {
+        priceCondition.variants.$elemMatch.price.$lte = maxPrice;
+      }
+    }
     
-    return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+    return [{ $match: priceCondition }];
   } catch (error) {
     console.error('Error parsing price filters:', error);
     return [];
@@ -182,36 +175,47 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
   const startDate = new Date(dateStart);
   const endDate = new Date(dateEnd);
   
+  // Проверяем валидность дат
+  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+    console.warn('Invalid dates provided for availability filter:', { dateStart, dateEnd });
+    return [];
+  }
+  
+  
   return [
     {
       $lookup: {
         from: 'rents',
-        let: { productId: '$_id' },
+        let: { 
+          productId: '$_id',
+          dateStart: startDate,
+          dateEnd: endDate
+        },
         pipeline: [
           {
             $match: {
               $expr: {
                 $and: [
                   { $eq: ['$product', '$$productId'] },
-                  { $in: ['$status', ['confirmed', 'active']] },
+                  { $in: ['$status', ['pending', 'confirmed', 'active']] },
                   {
                     $or: [
                       {
                         $and: [
-                          { $gte: ['$startDate', startDate] },
-                          { $lte: ['$startDate', endDate] }
+                          { $gte: ['$startDate', '$$dateStart'] },
+                          { $lte: ['$startDate', '$$dateEnd'] }
                         ]
                       },
                       {
                         $and: [
-                          { $gte: ['$endDate', startDate] },
-                          { $lte: ['$endDate', endDate] }
+                          { $gte: ['$endDate', '$$dateStart'] },
+                          { $lte: ['$endDate', '$$dateEnd'] }
                         ]
                       },
                       {
                         $and: [
-                          { $lte: ['$startDate', startDate] },
-                          { $gte: ['$endDate', endDate] }
+                          { $lte: ['$startDate', '$$dateStart'] },
+                          { $gte: ['$endDate', '$$dateEnd'] }
                         ]
                       }
                     ]
@@ -223,7 +227,7 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
           {
             $group: {
               _id: null,
-              totalRented: { $sum: { $ifNull: ['$quantity', 1] } }
+              totalRented: { $sum: { $ifNull: ['$available', 1] } }
             }
           }
         ],
@@ -237,21 +241,25 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
         },
         availableQuantity: {
           $subtract: [
-            { $ifNull: ['$quantity', 1] },
+            { $ifNull: ['$available', 0] },
             { $ifNull: [{ $arrayElemAt: ['$rentInfo.totalRented', 0] }, 0] }
           ]
-        }
+        },
       }
     },
     {
       $match: {
-        availableQuantity: { $gt: 0 }
+        $or: [
+          { availableQuantity: { $gt: 0 } },
+          { $and: [{ rentedQuantity: 0 }, { $or: [{ available: { $gt: 0 } }, { available: { $exists: false } }] }] }
+        ]
       }
     },
     {
       $project: {
         rentInfo: 0,
-        rentedQuantity: 0
+        rentedQuantity: 0,
+        availableQuantity: 0
       }
     }
   ];

package/src/modules/products/models/product.model.js

@@ -1,8 +1,11 @@
 import applyCommonSchema from '@martyrs/src/modules/globals/models/schemas/common.schema.js';
 import applyOwnershipSchema from '@martyrs/src/modules/globals/models/schemas/ownership.schema.js';
+import applyEngagementSchema from '@martyrs/src/modules/globals/models/schemas/engagement.schema.js';
 
 import discountschema from './schemas/discount.schema.js';
 
+
+
 export default db => {
   const DiscountSchema = discountschema(db);
 
@@ -51,6 +54,7 @@ export default db => {
 
   applyCommonSchema(ProductSchema, db);
   applyOwnershipSchema(ProductSchema, db);
+  applyEngagementSchema(ProductSchema, db);
 
    // Текстовый индекс для поиска
   ProductSchema.index({ name: 'text', description: 'text' });

package/src/modules/products/store/products.js

@@ -49,20 +49,20 @@ const state = reactive({
     ],
   },
   sort: {
-    param: 'distance',
+    param: 'popularity',
     order: 'asc',
     options: [
       {
-        label: 'Distance',
-        value: 'distance',
+        label: 'Price',
+        value: 'variants.price',
       },
       {
         label: 'Popularity',
         value: 'views',
       },
       {
-        label: 'Products',
-        value: 'numberOfProducts',
+        label: 'New',
+        value: 'createdAt',
       },
     ],
   },