@ozdao/martyrs 0.2.473 → 0.2.474

package/src/modules/spots/controllers/queries/getIsOpenNowStage.js

@@ -0,0 +1,109 @@
+// getIsOpenNowStage.js
+
+/**
+ * Создает шаг агрегации для расчета поля isOpenNow
+ * @returns {Object} Объект этапа агрегации MongoDB
+ */
+module.exports = function getIsOpenNowStage() {
+  const now = new Date();
+  const currentDay = now.getDay();
+  const currentTime = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
+  
+  return {
+    $addFields: {
+      isOpenNow: {
+        $let: {
+          vars: {
+            // Найдем особую дату на сегодня, если она есть
+            specialDay: {
+              $filter: {
+                input: { $ifNull: ["$worktime.special", []] },
+                as: "special",
+                cond: {
+                  $eq: [
+                    { $dateToString: { format: "%Y-%m-%d", date: "$$special.date" } },
+                    { $dateToString: { format: "%Y-%m-%d", date: new Date() } }
+                  ]
+                }
+              }
+            }
+          },
+          in: {
+            $cond: {
+              if: { $gt: [{ $size: "$$specialDay" }, 0] },
+              then: {
+                $let: {
+                  vars: { day: { $arrayElemAt: ["$$specialDay", 0] } },
+                  in: {
+                    $cond: {
+                      if: "$$day.isOpen",
+                      then: {
+                        $anyElementTrue: {
+                          $map: {
+                            input: { $ifNull: ["$$day.periods", []] },
+                            as: "period",
+                            in: {
+                              $and: [
+                                { $lte: ["$$period.open", currentTime] },
+                                { $gt: ["$$period.close", currentTime] }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      else: false
+                    }
+                  }
+                }
+              },
+              else: {
+                $let: {
+                  vars: {
+                    regularDay: {
+                      $filter: {
+                        input: { $ifNull: ["$worktime.regular", []] },
+                        as: "day",
+                        cond: { $eq: ["$$day.dayOfWeek", currentDay] }
+                      }
+                    }
+                  },
+                  in: {
+                    $cond: {
+                      if: { $gt: [{ $size: "$$regularDay" }, 0] },
+                      then: {
+                        $let: {
+                          vars: { day: { $arrayElemAt: ["$$regularDay", 0] } },
+                          in: {
+                            $cond: {
+                              if: "$$day.isOpen",
+                              then: {
+                                $anyElementTrue: {
+                                  $map: {
+                                    input: { $ifNull: ["$$day.periods", []] },
+                                    as: "period",
+                                    in: {
+                                      $and: [
+                                        { $lte: ["$$period.open", currentTime] },
+                                        { $gt: ["$$period.close", currentTime] }
+                                      ]
+                                    }
+                                  }
+                                }
+                              },
+                              else: false
+                            }
+                          }
+                        }
+                      },
+                      else: false
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  };
+};

package/src/modules/spots/controllers/spots.controller.js

@@ -1,5 +1,5 @@
 const queryProcessorGlobals = require('@martyrs/src/modules/globals/controllers/utils/queryProcessor');
-
+const getIsOpenNowStage = require('./queries/getIsOpenNowStage'); 
 
 const controllerFactory = (db) => {
   const Spot = db.spot;
@@ -10,6 +10,7 @@ const controllerFactory = (db) => {
       ...queryProcessorGlobals.getBasicOptions(
         req.query
       ), 
+      getIsOpenNowStage(),
       // Tags
       ...queryProcessorGlobals.getTagsOptions(req.query.tags), 
       // For creator

package/src/modules/spots/models/spot.model.js

@@ -34,13 +34,29 @@ module.exports = (db) => {
         required: true
       }
     },
-    worktime: [{
-      day: String,
-      time: {
-        start: String,
-        end: String
-      }
-    }],
+    // Обновленная структура для часов работы
+    worktime: {
+      // Стандартные часы работы
+      regular: [{
+        // 0 = воскресенье, 6 = суббота (соответствует JavaScript Date.getDay())
+        dayOfWeek: { type: Number, min: 0, max: 6, required: true },
+        isOpen: { type: Boolean, default: true },
+        periods: [{
+          open: { type: String, required: true }, // формат "HH:MM" 24-часовой
+          close: { type: String, required: true } // формат "HH:MM" 24-часовой
+        }]
+      }],
+      // Особые даты (праздники, особые события и т.д.)
+      special: [{
+        date: { type: Date, required: true },
+        isOpen: { type: Boolean, default: false },
+        periods: [{
+          open: { type: String }, // формат "HH:MM" 24-часовой
+          close: { type: String } // формат "HH:MM" 24-часовой
+        }],
+        description: { type: String } // описание особого дня (например, "Новый год")
+      }]
+    },
     // Marketplace options
     delivery: [String],
     payment: [String],
@@ -63,13 +79,43 @@ module.exports = (db) => {
       },
     ],
   });
-
-  spotSchema.index({ organization: 1 })
-
+  
+  // Индексы
+  spotSchema.index({ organization: 1 });
   spotSchema.index({ location: '2dsphere' });
+  
+  // Виртуальное свойство для проверки открыт ли спот в данный момент
+  spotSchema.virtual('isOpenNow').get(function() {
+    const now = new Date();
+    const currentDay = now.getDay();
+    const currentTime = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
+    
+    // Проверка особых дат
+    const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    const specialDay = this.worktime?.special?.find(special => 
+      special.date.getTime() === today.getTime()
+    );
+    
+    if (specialDay) {
+      if (!specialDay.isOpen) return false;
+      return specialDay.periods.some(period => 
+        period.open <= currentTime && period.close > currentTime
+      );
+    }
+    
+    // Проверка обычных часов работы
+    const regularHours = this.worktime?.regular?.find(day => day.dayOfWeek === currentDay);
+    if (!regularHours || !regularHours.isOpen) return false;
+    
+    return regularHours.periods.some(period => 
+      period.open <= currentTime && period.close > currentTime
+    );
+  });
 
+  spotSchema.set('toJSON', { virtuals: true });
+  spotSchema.set('toObject', { virtuals: true });
 
+  
   const Spot = db.mongoose.model('Spot', spotSchema);
-
-  return Spot
-}
+  return Spot;
+};

package/src/modules/spots/store/spots.js

@@ -26,7 +26,10 @@ const state = reactive({
     address: undefined,
     location: undefined,
 
-    worktime: [],
+    worktime: {
+      regular: [],
+      special: []
+    },
     delivery: [],
     payment: [],
     members: [],

package/src/modules/products/middlewares/index.js

@@ -1,11 +0,0 @@
-// middlewareIndexFactory.js
-
-const middlewareIndexFactory = (db) => {
-  const verifyCategory = require("./verifyCategory")(db);
-  
-  return {
-    verifyCategory
-  };
-};
-
-module.exports = middlewareIndexFactory;

package/src/modules/products/middlewares/verifyCategory.js

@@ -1,25 +0,0 @@
-// middlewareFactory.js
-const middlewareFactory = (db) => {
-  const Category = db.category;
-
-  const checkCategoryExistOrNot = async (req, res, next) => {
-    try {
-      const category = await Category.findOne({ url: req.body.url });
-      
-      if (category) {
-        res.status(400).send({ message: "Failed! Category with this URL is already in use!" });
-        return;
-      }
-
-      next();
-    } catch (err) {
-      res.status(500).send({ message: err });
-    }
-  };
-
-  return {
-    checkCategoryExistOrNot
-  };
-};
-
-module.exports = middlewareFactory;