@ozdao/martyrs 0.2.473 → 0.2.475

package/dist/{profile.schema-h61hhB2w.js → profile.schema-BLSuV_VC.js}

@@ -18,10 +18,6 @@ function requireProfile_schema() {
         description: {
           type: String,
           default: null
-        },
-        birthday: {
-          type: Date,
-          default: null
         }
       }
     });

package/dist/{profile.schema-kP_zKXNt.mjs → profile.schema-BRuvQ7QV.mjs}

@@ -17,10 +17,6 @@ function requireProfile_schema() {
         description: {
           type: String,
           default: null
-        },
-        birthday: {
-          type: Date,
-          default: null
         }
       }
     });

package/dist/{queryProcessor-CWnMIe2U.mjs → queryProcessor-CVKI651_.mjs}

@@ -136,7 +136,11 @@ function requireQueryProcessor() {
             }
           },
           {
-            $project: { password: 0 }
+            $project: {
+              username: 1,
+              profile: 1,
+              _id: 1
+            }
           }
         ],
         as: "creatorUser"
@@ -147,8 +151,22 @@ function requireQueryProcessor() {
     return {
       $lookup: {
         from: "organizations",
-        localField: "creator.target",
-        foreignField: "_id",
+        let: { creatorId: "$creator.target" },
+        pipeline: [
+          {
+            $match: {
+              $expr: { $eq: ["$_id", "$$creatorId"] }
+            }
+          },
+          {
+            $project: {
+              name: 1,
+              // если нужно, можешь оставить только нужные поля
+              profile: 1,
+              _id: 1
+            }
+          }
+        ],
         as: "creatorOrganization"
       }
     };
@@ -157,8 +175,22 @@ function requireQueryProcessor() {
     return {
       $lookup: {
         from: "customers",
-        localField: "creator.target",
-        foreignField: "_id",
+        let: { creatorId: "$creator.target" },
+        pipeline: [
+          {
+            $match: {
+              $expr: { $eq: ["_id", "$$creatorId"] }
+            }
+          },
+          {
+            $project: {
+              username: 1,
+              // если есть, можно заменить на нужные поля у customer
+              profile: 1,
+              _id: 1
+            }
+          }
+        ],
         as: "creatorCustomer"
       }
     };
@@ -175,7 +207,13 @@ function requireQueryProcessor() {
             }
           },
           {
-            $project: { password: 0 }
+            $project: {
+              username: 1,
+              profile: 1,
+              email: 1,
+              phone: 1,
+              _id: 1
+            }
           }
         ],
         as: "ownerUser"
@@ -186,8 +224,24 @@ function requireQueryProcessor() {
     return {
       $lookup: {
         from: "organizations",
-        localField: "owner.target",
-        foreignField: "_id",
+        let: { ownerId: "$owner.target" },
+        pipeline: [
+          {
+            $match: {
+              $expr: { $eq: ["$_id", "$$ownerId"] }
+            }
+          },
+          {
+            $project: {
+              official: 1,
+              // если нужно
+              owner: 1,
+              // если нужно
+              profile: 1,
+              _id: 1
+            }
+          }
+        ],
         as: "ownerOrganization"
       }
     };

package/dist/{queryProcessor-D6GuKfTV.js → queryProcessor-DSUqSk3I.js}

@@ -137,7 +137,11 @@ function requireQueryProcessor() {
             }
           },
           {
-            $project: { password: 0 }
+            $project: {
+              username: 1,
+              profile: 1,
+              _id: 1
+            }
           }
         ],
         as: "creatorUser"
@@ -148,8 +152,22 @@ function requireQueryProcessor() {
     return {
       $lookup: {
         from: "organizations",
-        localField: "creator.target",
-        foreignField: "_id",
+        let: { creatorId: "$creator.target" },
+        pipeline: [
+          {
+            $match: {
+              $expr: { $eq: ["$_id", "$$creatorId"] }
+            }
+          },
+          {
+            $project: {
+              name: 1,
+              // если нужно, можешь оставить только нужные поля
+              profile: 1,
+              _id: 1
+            }
+          }
+        ],
         as: "creatorOrganization"
       }
     };
@@ -158,8 +176,22 @@ function requireQueryProcessor() {
     return {
       $lookup: {
         from: "customers",
-        localField: "creator.target",
-        foreignField: "_id",
+        let: { creatorId: "$creator.target" },
+        pipeline: [
+          {
+            $match: {
+              $expr: { $eq: ["_id", "$$creatorId"] }
+            }
+          },
+          {
+            $project: {
+              username: 1,
+              // если есть, можно заменить на нужные поля у customer
+              profile: 1,
+              _id: 1
+            }
+          }
+        ],
         as: "creatorCustomer"
       }
     };
@@ -176,7 +208,13 @@ function requireQueryProcessor() {
             }
           },
           {
-            $project: { password: 0 }
+            $project: {
+              username: 1,
+              profile: 1,
+              email: 1,
+              phone: 1,
+              _id: 1
+            }
           }
         ],
         as: "ownerUser"
@@ -187,8 +225,24 @@ function requireQueryProcessor() {
     return {
       $lookup: {
         from: "organizations",
-        localField: "owner.target",
-        foreignField: "_id",
+        let: { ownerId: "$owner.target" },
+        pipeline: [
+          {
+            $match: {
+              $expr: { $eq: ["$_id", "$$ownerId"] }
+            }
+          },
+          {
+            $project: {
+              official: 1,
+              // если нужно
+              owner: 1,
+              // если нужно
+              profile: 1,
+              _id: 1
+            }
+          }
+        ],
         as: "ownerOrganization"
       }
     };

package/dist/rents.server.js

@@ -1,11 +1,11 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
-const globals_verifier = require("./globals.verifier-ChDpCdy_.js");
+const globals_verifier = require("./globals.verifier-CKYpYfQl.js");
 const globals_cache = require("./globals.cache-CwWvNGFQ.js");
 const globals_logger = require("./globals.logger-BdjooLaD.js");
-const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
-const index = require("./index-CVXl1rB5.js");
-const globals_abac = require("./globals.abac-DT0VjfaZ.js");
+const queryProcessor = require("./queryProcessor-DSUqSk3I.js");
+const index = require("./index-BOmxJQ5W.js");
+const globals_abac = require("./globals.abac-Bn-4tbX8.js");
 var rents_services;
 var hasRequiredRents_services;
 function requireRents_services() {

package/dist/rents.server.mjs

@@ -1,10 +1,10 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
-import { a as requireGlobals_validator, r as requireGlobals_verifier } from "./globals.verifier-C_VZYebB.mjs";
+import { a as requireGlobals_validator, r as requireGlobals_verifier } from "./globals.verifier-BdJxc8-8.mjs";
 import { r as requireGlobals_cache } from "./globals.cache-BT6q3vOf.mjs";
 import { r as requireGlobals_logger } from "./globals.logger-DusiFsxN.mjs";
-import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
-import { r as requireMiddlewares } from "./index-Df8vtZx7.mjs";
-import { r as requireGlobals_abac } from "./globals.abac-CvmZM8XG.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CVKI651_.mjs";
+import { r as requireMiddlewares } from "./index-C_Fw0Umg.mjs";
+import { r as requireGlobals_abac } from "./globals.abac-DZpTRxKR.mjs";
 var rents_services;
 var hasRequiredRents_services;
 function requireRents_services() {

package/dist/spots.server.js

@@ -1,6 +1,6 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
-const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
+const queryProcessor = require("./queryProcessor-DSUqSk3I.js");
 var spot_model;
 var hasRequiredSpot_model;
 function requireSpot_model() {
@@ -41,13 +41,34 @@ function requireSpot_model() {
           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],
@@ -72,17 +93,149 @@ function requireSpot_model() {
     });
     spotSchema.index({ organization: 1 });
     spotSchema.index({ location: "2dsphere" });
+    spotSchema.virtual("isOpenNow").get(function() {
+      const now = /* @__PURE__ */ 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_model;
 }
+var getIsOpenNowStage;
+var hasRequiredGetIsOpenNowStage;
+function requireGetIsOpenNowStage() {
+  if (hasRequiredGetIsOpenNowStage) return getIsOpenNowStage;
+  hasRequiredGetIsOpenNowStage = 1;
+  getIsOpenNowStage = function getIsOpenNowStage2() {
+    const now = /* @__PURE__ */ 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: /* @__PURE__ */ 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
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+  };
+  return getIsOpenNowStage;
+}
 var spots_controller;
 var hasRequiredSpots_controller;
 function requireSpots_controller() {
   if (hasRequiredSpots_controller) return spots_controller;
   hasRequiredSpots_controller = 1;
   const queryProcessorGlobals = queryProcessor.requireQueryProcessor();
+  const getIsOpenNowStage2 = requireGetIsOpenNowStage();
   const controllerFactory = (db) => {
     const Spot = db.spot;
     const read = async (req, res) => {
@@ -90,6 +243,7 @@ function requireSpots_controller() {
         ...queryProcessorGlobals.getBasicOptions(
           req.query
         ),
+        getIsOpenNowStage2(),
         // Tags
         ...queryProcessorGlobals.getTagsOptions(req.query.tags),
         // For creator

package/dist/spots.server.mjs

@@ -1,5 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
-import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CVKI651_.mjs";
 var spot_model;
 var hasRequiredSpot_model;
 function requireSpot_model() {
@@ -40,13 +40,34 @@ function requireSpot_model() {
           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],
@@ -71,17 +92,149 @@ function requireSpot_model() {
     });
     spotSchema.index({ organization: 1 });
     spotSchema.index({ location: "2dsphere" });
+    spotSchema.virtual("isOpenNow").get(function() {
+      const now = /* @__PURE__ */ 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_model;
 }
+var getIsOpenNowStage;
+var hasRequiredGetIsOpenNowStage;
+function requireGetIsOpenNowStage() {
+  if (hasRequiredGetIsOpenNowStage) return getIsOpenNowStage;
+  hasRequiredGetIsOpenNowStage = 1;
+  getIsOpenNowStage = function getIsOpenNowStage2() {
+    const now = /* @__PURE__ */ 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: /* @__PURE__ */ 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
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+  };
+  return getIsOpenNowStage;
+}
 var spots_controller;
 var hasRequiredSpots_controller;
 function requireSpots_controller() {
   if (hasRequiredSpots_controller) return spots_controller;
   hasRequiredSpots_controller = 1;
   const queryProcessorGlobals = requireQueryProcessor();
+  const getIsOpenNowStage2 = requireGetIsOpenNowStage();
   const controllerFactory = (db) => {
     const Spot = db.spot;
     const read = async (req, res) => {
@@ -89,6 +242,7 @@ function requireSpots_controller() {
         ...queryProcessorGlobals.getBasicOptions(
           req.query
         ),
+        getIsOpenNowStage2(),
         // Tags
         ...queryProcessorGlobals.getTagsOptions(req.query.tags),
         // For creator