@ozdao/martyrs 0.2.473 → 0.2.475

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/dist/martyrs/src/components/Chips/Chips.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Chips.vue2.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Chips/Chips.vue2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Chips.vue2.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Dropdown/Dropdown.vue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Dropdown.vue.js","sources":["../../../../../src/components/Dropdown/Dropdown.vue"],"sourcesContent":["<template>\n  <div class=\"dropdown pos-relative\" v-click-outside=\"clickedOutside\" @click.stop=\"isOpen = !isOpen\">\n    <div v-if=\"isComponentLabel\" class=\"w-100 h-100 flex-center flex\">\n      <component :is=\"label.component\" v-bind=\"label.props\" :class=\"label.class\"></component>\n    </div>\n    <div v-else>\n      {{ label }}\n    </div>\n    <transition name=\"TransitionTranslateY\" mode=\"out-in\">\n      <div \n        v-show=\"isOpen\" \n        :style=\"{ left: align === 'left' ? '0' : 'auto', right: align === 'right' ? '0' : 'auto' }\" \n        class=\"dropdown-content radius-big\" \n      >\n        <slot></slot>\n      </div>\n    </transition>\n  </div>\n</template>\n\n<script setup>\nimport { ref, computed } from 'vue';\nimport clickOutside from '../FieldPhone/click-outside';\n\nlet vClickOutside = clickOutside\n\nconst props = defineProps({\n  label: {\n    type: [String, Object],\n    default: 'Open'\n  },\n  align: {\n    type: String,\n    default: 'left'\n  }\n})\n\nconst isOpen = ref(false);\nconst isComponentLabel = computed(() => typeof props.label === 'object');\n\nfunction clickedOutside () {\n  isOpen.value = false\n}\n</script>\n\n<style >\n.dropdown-content {\n  display: block;\n  position: absolute;\n  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);\n  z-index: 1;\n}\n\n/*.dropdown:hover .dropdown-content {\n  display: block;\n}*/\n</style>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAwBA,QAAI,gBAAgB;AAEpB,UAAM,QAAQ;AAWd,UAAM,SAAS,IAAI,KAAK;AACxB,UAAM,mBAAmB,SAAS,MAAM,OAAO,MAAM,UAAU,QAAQ;AAEvE,aAAS,iBAAkB;AACzB,aAAO,QAAQ;AAAA,IACjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/martyrs/src/components/Loader/Loader.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Loader.vue2.cjs","sources":["../../../../../src/components/Loader/Loader.vue"],"sourcesContent":["<template>\n  <div class=\"circular-loader\" :class=\"{ 'circular-loader-centered': centered }\">\n    <svg viewBox=\"25 25 50 50\">\n      <circle class=\"circular-loader-fill\" cx=\"50\" cy=\"50\" r=\"20\" fill=\"none\" stroke-width=\"4\" stroke-miterlimit=\"10\" />\n      <circle class=\"circular-loader-circle\" cx=\"50\" cy=\"50\" r=\"20\" fill=\"none\" stroke-width=\"4\" stroke-miterlimit=\"10\" />\n    </svg>\n    <div v-if=\"progress\" class=\"progress-text\">{{ progress }}</div>\n    <div v-if=\"status\" class=\"uppercase t-semi w-m-10r status-text\">{{ status }}</div>\n  </div>\n</template>\n\n<script>\nexport default {\n  props: {\n    progress: {\n      type: Number,\n      default: null,\n    },\n    status: {\n      type: String,\n      default: null,\n    },\n    centered: {\n      type: Boolean,\n      default: true, // По умолчанию лоадер центрирован (для обратной совместимости)\n    },\n  },\n};\n</script>\n\n<style>\n.circular-loader {\n  position: relative;\n  z-index: 50;\n  height: 2rem;\n  width: 2rem;\n}\n\n.circular-loader-centered {\n  top: calc(50% - 1rem);\n  left: calc(50% - 1rem);\n}\n\n.circular-loader svg {\n  animation: rotate 2s linear infinite;\n}\n\n.circular-loader-circle {\n  stroke-dasharray: 1, 200;\n  stroke-dashoffset: 0;\n  stroke-linecap: round;\n  stroke: rgb(var(--main));\n  animation: dash 1.5s ease-in-out infinite;\n}\n\n.circular-loader-fill {\n  stroke-linecap: round;\n  stroke: rgba(var(--black),0.2);\n}\n\n.progress-text {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  font-size: 0.8rem;\n  color: rgb(var(--main));;\n}\n\n.status-text {\n  position: absolute;\n  top: 120%;\n  left: calc(50% - 5rem);\n  font-size: 0.8rem;\n  width: 10rem !important;\n  text-align: center;\n}\n\n@keyframes rotate {\n  100% {\n    transform: rotate(360deg);\n  }\n}\n\n@keyframes dash {\n  0% {\n    stroke-dasharray: 1, 200;\n    stroke-dashoffset: 0;\n  }\n  50% {\n    stroke-dasharray: 89, 200;\n    stroke-dashoffset: -35;\n  }\n  100% {\n    stroke-dasharray: 1, 200;\n    stroke-dashoffset: -124;\n  }\n}\n</style>"],"names":["_createElementBlock","_normalizeClass","_createElementVNode","_toDisplayString","_createCommentVNode"],"mappings":";;;;;AAYA,MAAK,YAAU;AAAA,EACb,OAAO;AAAA,IACL,UAAU;AAAA,MACR,MAAM;AAAA,MACN,SAAS;AAAA,IACV;AAAA,IACD,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,SAAS;AAAA,IACV;AAAA,IACD,UAAU;AAAA,MACR,MAAM;AAAA,MACN,SAAS;AAAA;AAAA,IACV;AAAA,EACF;AACH;;EA3BA,KAAA;AAAA,EAMyB,OAAM;;;EAN/B,KAAA;AAAA,EAOuB,OAAM;;;0BAN3BA,IAOM,mBAAA,OAAA;AAAA,IAPD,OADPC,IAAA,eAAA,CACa,mBAAiB,EAAA,4BAAuC,OAAQ,UAAA,CAAA;AAAA;8BACzEC,IAGM,mBAAA,OAAA,EAHD,SAAQ,iBAAa;AAAA,MACxBA,IAAAA,mBAAkH,UAAA;AAAA,QAA1G,OAAM;AAAA,QAAuB,IAAG;AAAA,QAAK,IAAG;AAAA,QAAK,GAAE;AAAA,QAAK,MAAK;AAAA,QAAO,gBAAa;AAAA,QAAI,qBAAkB;AAAA;MAC3GA,IAAAA,mBAAoH,UAAA;AAAA,QAA5G,OAAM;AAAA,QAAyB,IAAG;AAAA,QAAK,IAAG;AAAA,QAAK,GAAE;AAAA,QAAK,MAAK;AAAA,QAAO,gBAAa;AAAA,QAAI,qBAAkB;AAAA;;IAEpG,OAAQ,6BAAnBF,IAA+D,mBAAA,OAA/D,YAA+DG,IAAAA,gBAAjB,OAAQ,QAAA,GAAA,CAAA,KAN1DC,IAAA,mBAAA,IAAA,IAAA;AAAA,IAOe,OAAM,2BAAjBJ,IAAkF,mBAAA,OAAlF,YAAkFG,IAAAA,gBAAf,OAAM,MAAA,GAAA,CAAA,KAP7EC,IAAA,mBAAA,IAAA,IAAA;AAAA;;;;"}

package/dist/martyrs/src/components/Tooltip/Tooltip.vue2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"Tooltip.vue2.cjs","sources":["../../../../../src/components/Tooltip/Tooltip.vue"],"sourcesContent":["<template>\n  <div class=\"cursor-pointer tooltip-container\" @mouseover=\"showTooltip\" @mouseleave=\"hideTooltip\">\n    <slot></slot>\n    <div  class=\"tooltip-content\" :style=\"tooltipStyle\">\n      {{ text }}\n    </div>\n  </div>\n</template>\n\n<script setup>\nimport { ref, reactive } from 'vue';\n\nconst props = defineProps({\n  text: {\n    type: String,\n    required: true\n  }\n});\n\nconst visible = ref(false);\n\nconst tooltipStyle = reactive({\n  position: 'absolute',\n  width: 'max-content',\n  zIndex: 1000,\n  background: '#333',\n  color: '#fff',\n  padding: '5px 10px',\n  borderRadius: '3px',\n  fontSize: '14px',\n  display: 'none',\n});\n\nfunction showTooltip(event) {\n  visible.value = true;\n  tooltipStyle.left = `${(event.clientX / 100) + 10 }px`;\n  tooltipStyle.top = `${(event.clientY / 100) + 10 }px`;\n  tooltipStyle.display = 'block';\n}\n\nfunction hideTooltip() {\n  visible.value = false;\n  tooltipStyle.display = 'none';\n}\n</script>\n\n<style >\n.tooltip-container {\n  position: relative;\n  display: inline-block;\n}\n\n.tooltip-content {\n  pointer-events: none;\n}\n</style>"],"names":["ref","reactive"],"mappings":";;;;;;;;;;;;;AAmBA,UAAM,UAAUA,IAAG,IAAC,KAAK;AAEzB,UAAM,eAAeC,IAAAA,SAAS;AAAA,MAC5B,UAAU;AAAA,MACV,OAAO;AAAA,MACP,QAAQ;AAAA,MACR,YAAY;AAAA,MACZ,OAAO;AAAA,MACP,SAAS;AAAA,MACT,cAAc;AAAA,MACd,UAAU;AAAA,MACV,SAAS;AAAA,IACX,CAAC;AAED,aAAS,YAAY,OAAO;AAC1B,cAAQ,QAAQ;AAChB,mBAAa,OAAO,GAAI,MAAM,UAAU,MAAO,EAAE;AACjD,mBAAa,MAAM,GAAI,MAAM,UAAU,MAAO,EAAE;AAChD,mBAAa,UAAU;AAAA,IACzB;AAEA,aAAS,cAAc;AACrB,cAAQ,QAAQ;AAChB,mBAAa,UAAU;AAAA,IACzB;;;;;;;;;;;;;;;;;"}

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;