@ozdao/martyrs 0.2.604 → 0.2.605

package/src/modules/rents/controllers/services/rents.services.js

@@ -26,6 +26,7 @@ const queryValidatorConfig = {
   },
   productId: { rule: 'optional', validator: Validator.schema().string(), default: null },
   variantId: { rule: 'optional', validator: Validator.schema().string(), default: null },
+  category: { rule: 'optional', validator: Validator.schema().string(), default: null },
 };
 const bodyValidatorConfig = {
   // _id: { rule: 'optional', validator: Validator.schema().string() },
@@ -140,6 +141,21 @@ const controller = db => {
             preserveNullAndEmptyArrays: true,
           },
         },
+        // Добавляем lookup вариантов
+        {
+          $lookup: {
+            from: 'variants',
+            localField: 'variant',
+            foreignField: '_id',
+            as: 'variantDetails',
+          },
+        },
+        {
+          $unwind: {
+            path: '$variantDetails',
+            preserveNullAndEmptyArrays: true,
+          },
+        },
         // Добавляем стейджи для creator и owner
         queryProcessorCore.getCreatorUserLookupStage(),
         queryProcessorCore.getCreatorOrganizationLookupStage(),
@@ -151,7 +167,9 @@ const controller = db => {
         {
           $project: {
             product: 1,
+            variant: 1,
             productDetails: 1,
+            variantDetails: 1,
             quantity: 1,
             startDate: 1,
             endDate: 1,
@@ -289,7 +307,7 @@ const controller = db => {
       const validationResult = queryVerifier.verify(req.query, {
         applyDefaults: true,
         removeInvalid: true,
-        only: ['productId', 'variantId', 'startDate', 'endDate'],
+        only: ['productId', 'variantId', 'startDate', 'endDate', 'category', 'owner'],
       });
       if (!validationResult || !validationResult.isValid) {
         await logger.info(`Invalid query parameters: ${JSON.stringify(validationResult.verificationErrors)}`);
@@ -299,7 +317,80 @@ const controller = db => {
           details: validationResult.verificationErrors,
         });
       }
-      const { productId, variantId, startDate, endDate } = validationResult.verifiedData;
+      const { productId, variantId, startDate, endDate, category, owner: ownerFilter } = validationResult.verifiedData;
+
+      // Режим 2: category-based (variant-per-table) — все продукты зоны с вариантами
+      if (!productId && category && startDate && endDate) {
+        const cacheKey = `availability:cat:${category}:${ownerFilter || 'all'}:${startDate}:${endDate}`;
+        const cachedResult = await cache.get(cacheKey);
+        if (cachedResult) {
+          return res.status(200).json(cachedResult);
+        }
+
+        const productQuery = { category: category, status: 'published', listing: 'rent' };
+        const foundProducts = await db.product.find(productQuery).lean();
+        const productIds = foundProducts.map(p => p._id);
+
+        if (!productIds.length) {
+          return res.status(200).json({ period: { startDate, endDate }, products: [] });
+        }
+
+        const startRaw = startDate instanceof Date ? startDate.toISOString() : String(startDate);
+        const endRaw = endDate instanceof Date ? endDate.toISOString() : String(endDate);
+        const start = startRaw.includes('T') ? new Date(startRaw) : new Date(`${startRaw}T00:00:00Z`);
+        const end = endRaw.includes('T') ? new Date(endRaw) : new Date(`${endRaw}T23:59:59Z`);
+
+        const [foundVariants, activeRents] = await Promise.all([
+          db.variant.find({ product: { $in: productIds }, status: 'published' }).lean(),
+          Rent.find({
+            product: { $in: productIds },
+            status: { $in: ['pending', 'confirmed', 'active'] },
+            startDate: { $lte: end },
+            endDate: { $gte: start },
+          }).lean(),
+        ]);
+
+        const bookedVariantIds = new Set();
+        for (const rent of activeRents) {
+          if (rent.variant) bookedVariantIds.add(rent.variant.toString());
+        }
+
+        const variantsByProduct = {};
+        for (const v of foundVariants) {
+          const pid = v.product.toString();
+          if (!variantsByProduct[pid]) variantsByProduct[pid] = [];
+          variantsByProduct[pid].push({
+            _id: v._id,
+            name: v.name,
+            price: v.price,
+            sku: v.sku,
+            description: v.description,
+            available: !bookedVariantIds.has(v._id.toString()),
+          });
+        }
+
+        const products = foundProducts.map(p => {
+          const pid = p._id.toString();
+          const pVariants = variantsByProduct[pid] || [];
+          return {
+            _id: p._id,
+            name: p.name,
+            description: p.description,
+            images: p.images,
+            attributes: p.attributes,
+            variants: pVariants,
+            totalVariants: pVariants.length,
+            availableVariants: pVariants.filter(v => v.available).length,
+          };
+        });
+
+        const result = { period: { startDate, endDate }, products };
+        const cacheTags = productIds.map(id => `product:${id}`);
+        await cache.setWithTags(cacheKey, result, cacheTags);
+        return res.status(200).json(result);
+      }
+
+      // Режим 1 (существующий): productId required
       if (!productId || !startDate || !endDate) {
         return res.status(400).json({
           errorCode: 'MISSING_REQUIRED_PARAMS',
@@ -402,12 +493,112 @@ const controller = db => {
       });
     }
   };
+  const getZoneAvailability = async (req, res) => {
+    try {
+      const { categoryId, startDate, endDate } = req.query;
+
+      if (!categoryId || !startDate || !endDate) {
+        return res.status(400).json({
+          errorCode: 'MISSING_REQUIRED_PARAMS',
+          message: 'categoryId, startDate, and endDate are required parameters.',
+        });
+      }
+
+      const cacheKey = `zone-availability:${categoryId}:${startDate}:${endDate}`;
+      const cachedResult = await cache.get(cacheKey);
+      if (cachedResult) {
+        return res.status(200).json(cachedResult);
+      }
+
+      // Найти все продукты в категории
+      const foundProducts = await db.product.find({
+        category: categoryId,
+        status: 'published',
+      }).lean();
+
+      if (!foundProducts.length) {
+        return res.status(200).json({ period: { startDate, endDate }, products: [] });
+      }
+
+      const productIds = foundProducts.map(p => p._id);
+
+      // Параллельно: варианты + ренты
+      const zStartRaw = startDate instanceof Date ? startDate.toISOString() : String(startDate);
+      const zEndRaw = endDate instanceof Date ? endDate.toISOString() : String(endDate);
+      const start = zStartRaw.includes('T') ? new Date(zStartRaw) : new Date(`${zStartRaw}T00:00:00Z`);
+      const end = zEndRaw.includes('T') ? new Date(zEndRaw) : new Date(`${zEndRaw}T23:59:59Z`);
+
+      const [foundVariants, activeRents] = await Promise.all([
+        db.variant.find({ product: { $in: productIds }, status: 'published' }).lean(),
+        Rent.find({
+          product: { $in: productIds },
+          status: { $in: ['pending', 'confirmed', 'active'] },
+          startDate: { $lte: end },
+          endDate: { $gte: start },
+        }).lean(),
+      ]);
+
+      // Множество занятых variant IDs
+      const bookedVariantIds = new Set();
+      for (const rent of activeRents) {
+        if (rent.variant) bookedVariantIds.add(rent.variant.toString());
+      }
+
+      // Группируем варианты по продукту
+      const variantsByProduct = {};
+      for (const v of foundVariants) {
+        const pid = v.product.toString();
+        if (!variantsByProduct[pid]) variantsByProduct[pid] = [];
+        const available = !bookedVariantIds.has(v._id.toString());
+        variantsByProduct[pid].push({
+          _id: v._id,
+          name: v.name,
+          price: v.price,
+          sku: v.sku,
+          description: v.description,
+          available,
+        });
+      }
+
+      // Формируем результат
+      const products = foundProducts.map(p => {
+        const pid = p._id.toString();
+        const pVariants = variantsByProduct[pid] || [];
+        return {
+          _id: p._id,
+          name: p.name,
+          description: p.description,
+          images: p.images,
+          listing: p.listing,
+          rentPeriod: p.rentPeriod,
+          attributes: p.attributes,
+          variants: pVariants,
+          totalVariants: pVariants.length,
+          availableVariants: pVariants.filter(v => v.available).length,
+        };
+      });
+
+      const result = { period: { startDate, endDate }, products };
+      const cacheTags = productIds.map(id => `product:${id}`);
+      await cache.setWithTags(cacheKey, result, cacheTags);
+      return res.status(200).json(result);
+    } catch (err) {
+      await logger.error(`Error checking zone availability: ${err.message}`);
+      return res.status(500).json({
+        errorCode: 'INTERNAL_SERVER_ERROR',
+        message: 'Error occurred while checking zone availability.',
+        details: err.message,
+      });
+    }
+  };
+
   return {
     read,
     create,
     update,
     delete: deleteRent,
     getAvailability,
+    getZoneAvailability,
   };
 };
 export default controller;

package/src/modules/rents/models/rent.model.js

@@ -45,5 +45,14 @@ export default (db, additionalFields = {}) => {
     comment: { type: String, default: '' },
     ...additionalFields,
   });
+  // Compound index for availability queries (the main bottleneck)
+  RentSchema.index({ product: 1, status: 1, startDate: 1, endDate: 1 });
+  // Variant-level availability
+  RentSchema.index({ product: 1, variant: 1, status: 1, startDate: 1, endDate: 1 });
+  // Order lookup
+  RentSchema.index({ order: 1 });
+  // Owner queries
+  RentSchema.index({ 'owner.type': 1, 'owner.target': 1, status: 1 });
+
   return db.mongoose.model('Rent', RentSchema);
 };

package/src/modules/rents/views/components/pages/Gant/GanttBar.vue

@@ -1,12 +1,12 @@
 <template>
-  <div 
-    class="gantt-bar pos-absolute radius-small cursor-pointer shadow-small ease-out hover:scale-[1.015]"
+  <div
+    class="gantt-bar pos-absolute radius-extra cursor-pointer ease-out hover:opacity-80 o-hidden"
     :class="barClass"
     :style="barStyle"
     @click="$emit('click')"
   >
-    <div class="pd-micro t-micro t-white truncate">
-      {{ bar.item.productDetails.name || 'Task' }}
+    <div class="pd-l-thin pd-r-thin t-micro truncate gantt-bar__label">
+      {{ bar.item.customer?.profile?.name || bar.item.customer?.phone || bar.item.customer?.email || 'No customer' }}
     </div>
   </div>
 </template>
@@ -16,22 +16,28 @@ import { computed } from 'vue'
 
 const props = defineProps({
   bar: { type: Object, required: true },
-  view: { type: String, required: true }
+  view: { type: String, required: true },
+  labelKey: { type: String, default: '' }
 })
 
 const emit = defineEmits(['click'])
 
+const getLabel = (item) => {
+  if (!props.labelKey) return null
+  return props.labelKey.split('.').reduce((obj, key) => obj?.[key], item)
+}
+
 // Bar class based on status
 const barClass = computed(() => {
   const statusMap = {
-    active: 'bg-main',
-    completed: 'bg-green',
+    pending: 'bg-yellow',
+    confirmed: 'bg-second',
+    active: 'bg-green',
+    completed: 'bg-grey',
     canceled: 'bg-red',
-    pending : 'bg-grey',
-    default: 'bg-second'
   }
-  
-  return statusMap[props.bar.status] || statusMap.default
+
+  return statusMap[props.bar.status] || 'bg-second'
 })
 
 // Bar style
@@ -49,4 +55,15 @@ const barStyle = computed(() => ({
   max-height: 20px;
   line-height: 20px;
 }
+
+.gantt-bar__label {
+  color: rgb(var(--white));
+  line-height: 20px;
+  white-space: nowrap;
+}
+
+.gantt-bar.bg-yellow .gantt-bar__label,
+.gantt-bar.bg-grey .gantt-bar__label {
+  color: rgb(var(--black));
+}
 </style>