@ozdao/martyrs 0.2.508 → 0.2.510

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-Dq-UfO4G.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-DrpgUZcn.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/orders.server.cjs

@@ -577,6 +577,24 @@ const ModelCustomer = (db) => {
         type: String,
         enum: ["active", "inactive", "blocked"],
         default: "active"
+      },
+      address: {
+        country: {
+          type: String
+        },
+        addressLine1: {
+          type: String,
+          required: true
+        },
+        addressLine2: {
+          type: String
+        },
+        city: {
+          type: String
+        },
+        postalCode: {
+          type: String
+        }
       }
     },
     {
@@ -1059,6 +1077,26 @@ const verifierFactory = function(db) {
         type: globals_verifier.Validator.schema().string().oneOf(["user", "organization", "User", "Organization"]),
         target: globals_verifier.Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
       })
+    },
+    "address.country": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const updateVerifier = new globals_verifier.Verifier({
@@ -1109,6 +1147,26 @@ const verifierFactory = function(db) {
     status: {
       rule: "optional",
       validator: globals_verifier.Validator.schema().string().oneOf(["active", "inactive", "blocked"])
+    },
+    "address.country": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: globals_verifier.Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const readVerifier = new globals_verifier.Verifier({

package/dist/orders.server.js

@@ -575,6 +575,24 @@ const ModelCustomer = (db) => {
         type: String,
         enum: ["active", "inactive", "blocked"],
         default: "active"
+      },
+      address: {
+        country: {
+          type: String
+        },
+        addressLine1: {
+          type: String,
+          required: true
+        },
+        addressLine2: {
+          type: String
+        },
+        city: {
+          type: String
+        },
+        postalCode: {
+          type: String
+        }
       }
     },
     {
@@ -1057,6 +1075,26 @@ const verifierFactory = function(db) {
         type: Validator.schema().string().oneOf(["user", "organization", "User", "Organization"]),
         target: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
       })
+    },
+    "address.country": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const updateVerifier = new Verifier({
@@ -1107,6 +1145,26 @@ const verifierFactory = function(db) {
     status: {
       rule: "optional",
       validator: Validator.schema().string().oneOf(["active", "inactive", "blocked"])
+    },
+    "address.country": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "Country must not exceed 100 characters")
+    },
+    "address.addressLine1": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 1 must not exceed 255 characters")
+    },
+    "address.addressLine2": {
+      rule: "optional",
+      validator: Validator.schema().string().max(255, "Address line 2 must not exceed 255 characters")
+    },
+    "address.city": {
+      rule: "optional",
+      validator: Validator.schema().string().max(100, "City must not exceed 100 characters")
+    },
+    "address.postalCode": {
+      rule: "optional",
+      validator: Validator.schema().string().max(20, "Postal code must not exceed 20 characters")
     }
   });
   const readVerifier = new Verifier({

package/dist/products.server.cjs

@@ -467,42 +467,31 @@ function getAttributeFiltersStage(filtersString) {
     return [];
   }
 }
-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: {}
         }
       }
-    });
-    return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+    };
+    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 [{ $match: priceCondition }];
   } catch (error) {
     console.error("Error parsing price filters:", error);
     return [];
@@ -512,11 +501,19 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
   if (!dateStart || !dateEnd) return [];
   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: {
@@ -528,20 +525,20 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
                     $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"] }
                         ]
                       }
                     ]
@@ -678,7 +675,17 @@ const productLookupConfigs = {
       from: "products",
       localField: "recommended",
       foreignField: "_id",
-      as: "recommended"
+      as: "recommended",
+      pipeline: [
+        {
+          $lookup: {
+            from: "variants",
+            localField: "_id",
+            foreignField: "product",
+            as: "variants"
+          }
+        }
+      ]
     }
   },
   // Лукап для категорий продукта
@@ -706,13 +713,30 @@ const productLookupConfigs = {
       }
     }]
   },
-  // Лукап для аренд продукта
+  // Лукап для аренд продуктов (статичный без дат)
   rents: {
     lookup: {
       from: "rents",
       localField: "_id",
       foreignField: "product",
-      as: "rents"
+      as: "rents",
+      pipeline: [
+        {
+          $match: {
+            status: { $in: ["confirmed", "active"] }
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            product: 1,
+            startDate: 1,
+            endDate: 1,
+            quantity: 1,
+            status: 1
+          }
+        }
+      ]
     }
   }
 };
@@ -734,6 +758,15 @@ const controllerFactory = (db) => {
   const Read = async (req, res) => {
     try {
       const requestedLookups = queryProcessor.queryProcessorGlobals.getRequestedLookups(req.query);
+      if (req.query.dateStart || req.query.dateEnd) {
+        console.log("Availability filter params:", {
+          dateStart: req.query.dateStart,
+          dateEnd: req.query.dateEnd,
+          dateStartType: typeof req.query.dateStart,
+          dateEndType: typeof req.query.dateEnd
+        });
+      }
+      console.log("availability variant", JSON.stringify(...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd), null, 2));
       const stages = [
         ...queryProcessor.queryProcessorGlobals.getBasicOptions(req.query),
         ...queryProcessor.queryProcessorGlobals.getSearchOptions(req.query.search, {
@@ -746,9 +779,9 @@ const controllerFactory = (db) => {
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),
         ...queryProcessorProducts.getAttributeFiltersStage(req.query.filters),
-        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.prices),
-        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         ...queryProcessor.queryProcessorGlobals.getLookupStages(requestedLookups, productLookupConfigs),
+        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.priceMin, req.query.priceMax),
+        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         queryProcessor.queryProcessorGlobals.getCreatorUserLookupStage(),
         queryProcessor.queryProcessorGlobals.getCreatorOrganizationLookupStage(),
         queryProcessor.queryProcessorGlobals.getOwnerUserLookupStage(),
@@ -967,6 +1000,7 @@ const ProductModel = (db) => {
   });
   common_schema.applyCommonSchema(ProductSchema);
   ownership_schema.applyOwnershipSchema(ProductSchema, db);
+  engagement_schema.applyEngagementSchema(ProductSchema);
   ProductSchema.index({ name: "text", description: "text" });
   ProductSchema.index({ "owner.type": 1, "owner.target": 1, status: 1, category: 1 });
   ProductSchema.index({ category: 1, status: 1, delivery: 1, price: 1 });

package/dist/products.server.js

@@ -465,42 +465,31 @@ function getAttributeFiltersStage(filtersString) {
     return [];
   }
 }
-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: {}
         }
       }
-    });
-    return priceConditions.length > 0 ? [{ $match: { $or: priceConditions } }] : [];
+    };
+    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 [{ $match: priceCondition }];
   } catch (error) {
     console.error("Error parsing price filters:", error);
     return [];
@@ -510,11 +499,19 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
   if (!dateStart || !dateEnd) return [];
   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: {
@@ -526,20 +523,20 @@ function getAvailabilityFilterStage(dateStart, dateEnd) {
                     $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"] }
                         ]
                       }
                     ]
@@ -676,7 +673,17 @@ const productLookupConfigs = {
       from: "products",
       localField: "recommended",
       foreignField: "_id",
-      as: "recommended"
+      as: "recommended",
+      pipeline: [
+        {
+          $lookup: {
+            from: "variants",
+            localField: "_id",
+            foreignField: "product",
+            as: "variants"
+          }
+        }
+      ]
     }
   },
   // Лукап для категорий продукта
@@ -704,13 +711,30 @@ const productLookupConfigs = {
       }
     }]
   },
-  // Лукап для аренд продукта
+  // Лукап для аренд продуктов (статичный без дат)
   rents: {
     lookup: {
       from: "rents",
       localField: "_id",
       foreignField: "product",
-      as: "rents"
+      as: "rents",
+      pipeline: [
+        {
+          $match: {
+            status: { $in: ["confirmed", "active"] }
+          }
+        },
+        {
+          $project: {
+            _id: 1,
+            product: 1,
+            startDate: 1,
+            endDate: 1,
+            quantity: 1,
+            status: 1
+          }
+        }
+      ]
     }
   }
 };
@@ -732,6 +756,15 @@ const controllerFactory = (db) => {
   const Read = async (req, res) => {
     try {
       const requestedLookups = queryProcessorGlobals.getRequestedLookups(req.query);
+      if (req.query.dateStart || req.query.dateEnd) {
+        console.log("Availability filter params:", {
+          dateStart: req.query.dateStart,
+          dateEnd: req.query.dateEnd,
+          dateStartType: typeof req.query.dateStart,
+          dateEndType: typeof req.query.dateEnd
+        });
+      }
+      console.log("availability variant", JSON.stringify(...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd), null, 2));
       const stages = [
         ...queryProcessorGlobals.getBasicOptions(req.query),
         ...queryProcessorGlobals.getSearchOptions(req.query.search, {
@@ -744,9 +777,9 @@ const controllerFactory = (db) => {
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),
         ...queryProcessorProducts.getAttributeFiltersStage(req.query.filters),
-        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.prices),
-        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         ...queryProcessorGlobals.getLookupStages(requestedLookups, productLookupConfigs),
+        ...queryProcessorProducts.getVariantPriceFilterStage(req.query.priceMin, req.query.priceMax),
+        ...queryProcessorProducts.getAvailabilityFilterStage(req.query.dateStart, req.query.dateEnd),
         queryProcessorGlobals.getCreatorUserLookupStage(),
         queryProcessorGlobals.getCreatorOrganizationLookupStage(),
         queryProcessorGlobals.getOwnerUserLookupStage(),
@@ -965,6 +998,7 @@ const ProductModel = (db) => {
   });
   applyCommonSchema(ProductSchema);
   applyOwnershipSchema(ProductSchema, db);
+  applyEngagementSchema(ProductSchema);
   ProductSchema.index({ name: "text", description: "text" });
   ProductSchema.index({ "owner.type": 1, "owner.target": 1, status: 1, category: 1 });
   ProductSchema.index({ category: 1, status: 1, delivery: 1, price: 1 });