@ozdao/prometheus-framework 0.2.48 → 0.2.51

package/dist/organizations.server.js

@@ -72,7 +72,7 @@ const controllerFactory$5 = (db) => {
 };
 var departments_controller = controllerFactory$5;
 const jwt = require$$0$1;
-const ObjectId$1 = require$$0.Types.ObjectId;
+const ObjectId$2 = require$$0.Types.ObjectId;
 const { Client } = require$$5;
 const client = new Client({});
 const addUserStatusFields = addMembersQuantity$1.addUserStatusFields_1;
@@ -116,15 +116,15 @@ const controllerFactory$4 = (db) => {
       }));
     }
     const matchConditions = [
-      ...req.query._id ? [{ _id: new ObjectId$1(req.query._id) }] : [],
-      ...req.query.owner ? [{ owner: new ObjectId$1(req.query.owner) }] : [],
-      ...req.query.member ? [{ "memberships.user": new ObjectId$1(req.query.member), "memberships.role": { $nin: ["subscriber", "owner"] } }] : [],
-      ...req.query.subscriber ? [{ "memberships.user": new ObjectId$1(req.query.subscriber), "memberships.role": "subscriber" }] : [],
-      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId$1(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId$1(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
+      ...req.query._id ? [{ _id: new ObjectId$2(req.query._id) }] : [],
+      ...req.query.owner ? [{ owner: new ObjectId$2(req.query.owner) }] : [],
+      ...req.query.member ? [{ "memberships.user": new ObjectId$2(req.query.member), "memberships.role": "member" }] : [],
+      ...req.query.subscriber ? [{ "memberships.user": new ObjectId$2(req.query.subscriber), "memberships.role": "subscriber" }] : [],
+      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId$2(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId$2(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
       ...req.query.types ? [{ types: { $in: req.query.types } }] : [],
       // Если req.query.types - строка
       // to remove
-      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$1(req.query.onlyuser) }] : [],
+      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$2(req.query.onlyuser) }] : [],
       ...categories.length > 0 ? [{ "products.category": { $in: categories } }] : [],
       ...delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : [],
       ...priceConditions.length > 0 ? [{ $or: priceConditions }] : [],
@@ -425,26 +425,33 @@ const controllerFactory$4 = (db) => {
   };
 };
 var organizations_controller = controllerFactory$4;
+const ObjectId$1 = require$$0.Types.ObjectId;
 const controllerFactory$3 = (db) => {
   const Membership = db.membership;
   const read = async (req, res) => {
-    let query = {};
-    let options = {};
-    if (req.query.user) {
-      query.user = req.query.user;
-    }
-    if (req.query.type) {
-      query.type = req.query.type;
-    }
-    if (req.query.target) {
-      query.target = req.query.target;
-    }
-    if (req.query.role) {
-      query.role = req.query.role;
-    }
     try {
-      const memberships = await Membership.find(query, null, options).populate("user");
-      if (!memberships) {
+      const memberships = await Membership.aggregate([
+        {
+          $match: {
+            ...req.query.user && { user: req.query.user },
+            ...req.query.type && { type: req.query.type },
+            ...req.query.target && { target: req.query.target },
+            ...req.query.role && { role: req.query.role }
+          }
+        },
+        {
+          $lookup: {
+            from: "users",
+            localField: "user",
+            foreignField: "_id",
+            as: "user"
+          }
+        },
+        {
+          $unwind: "$user"
+        }
+      ]);
+      if (!memberships || memberships.length === 0) {
         return res.status(404).send({ errorCode: "MEMBERSHIPS_NOT_FOUND" });
       }
       res.send(memberships);
@@ -480,10 +487,9 @@ const controllerFactory$3 = (db) => {
     }
   };
   const deleteMembership = async (req, res) => {
-    const { type, target, user: user2, role } = req.body;
     console.log(req.body);
     try {
-      const membership = await Membership.findOne({ type, target, user: user2, role });
+      const membership = await Membership.findOneAndDelete({ _id: new ObjectId$1(req.body._id) });
       if (!membership) {
         return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
       } else {
@@ -592,23 +598,6 @@ var department_model = (mongoose) => {
       description: { type: String },
       categories: [String]
     },
-    // Working hours
-    address: String,
-    // Position on map
-    location: {
-      lat: Number,
-      lng: Number,
-      type: {
-        type: String,
-        enum: ["Point"],
-        // 'location.type' must be 'Point'
-        required: true
-      },
-      coordinates: {
-        type: [Number],
-        required: true
-      }
-    },
     worktime: [{
       day: String,
       time: {
@@ -639,7 +628,6 @@ var department_model = (mongoose) => {
     ]
   });
   departmentSchema.index({ organization: 1 });
-  departmentSchema.index({ location: "2dsphere" });
   const Department = mongoose.model("Department", departmentSchema);
   return Department;
 };
@@ -727,6 +715,10 @@ var membership_model = (mongoose) => {
       type: String,
       default: "subscriber"
     },
+    label: {
+      type: String,
+      default: "subscriber"
+    },
     target: {
       // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,

package/dist/organizations.server.mjs

@@ -71,7 +71,7 @@ const controllerFactory$5 = (db) => {
 };
 var departments_controller = controllerFactory$5;
 const jwt = require$$0$1;
-const ObjectId$1 = require$$0.Types.ObjectId;
+const ObjectId$2 = require$$0.Types.ObjectId;
 const { Client } = require$$5;
 const client = new Client({});
 const addUserStatusFields = addUserStatusFields_1;
@@ -115,15 +115,15 @@ const controllerFactory$4 = (db) => {
       }));
     }
     const matchConditions = [
-      ...req.query._id ? [{ _id: new ObjectId$1(req.query._id) }] : [],
-      ...req.query.owner ? [{ owner: new ObjectId$1(req.query.owner) }] : [],
-      ...req.query.member ? [{ "memberships.user": new ObjectId$1(req.query.member), "memberships.role": { $nin: ["subscriber", "owner"] } }] : [],
-      ...req.query.subscriber ? [{ "memberships.user": new ObjectId$1(req.query.subscriber), "memberships.role": "subscriber" }] : [],
-      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId$1(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId$1(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
+      ...req.query._id ? [{ _id: new ObjectId$2(req.query._id) }] : [],
+      ...req.query.owner ? [{ owner: new ObjectId$2(req.query.owner) }] : [],
+      ...req.query.member ? [{ "memberships.user": new ObjectId$2(req.query.member), "memberships.role": "member" }] : [],
+      ...req.query.subscriber ? [{ "memberships.user": new ObjectId$2(req.query.subscriber), "memberships.role": "subscriber" }] : [],
+      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId$2(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId$2(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
       ...req.query.types ? [{ types: { $in: req.query.types } }] : [],
       // Если req.query.types - строка
       // to remove
-      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$1(req.query.onlyuser) }] : [],
+      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$2(req.query.onlyuser) }] : [],
       ...categories.length > 0 ? [{ "products.category": { $in: categories } }] : [],
       ...delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : [],
       ...priceConditions.length > 0 ? [{ $or: priceConditions }] : [],
@@ -424,26 +424,33 @@ const controllerFactory$4 = (db) => {
   };
 };
 var organizations_controller = controllerFactory$4;
+const ObjectId$1 = require$$0.Types.ObjectId;
 const controllerFactory$3 = (db) => {
   const Membership = db.membership;
   const read = async (req, res) => {
-    let query = {};
-    let options = {};
-    if (req.query.user) {
-      query.user = req.query.user;
-    }
-    if (req.query.type) {
-      query.type = req.query.type;
-    }
-    if (req.query.target) {
-      query.target = req.query.target;
-    }
-    if (req.query.role) {
-      query.role = req.query.role;
-    }
     try {
-      const memberships = await Membership.find(query, null, options).populate("user");
-      if (!memberships) {
+      const memberships = await Membership.aggregate([
+        {
+          $match: {
+            ...req.query.user && { user: req.query.user },
+            ...req.query.type && { type: req.query.type },
+            ...req.query.target && { target: req.query.target },
+            ...req.query.role && { role: req.query.role }
+          }
+        },
+        {
+          $lookup: {
+            from: "users",
+            localField: "user",
+            foreignField: "_id",
+            as: "user"
+          }
+        },
+        {
+          $unwind: "$user"
+        }
+      ]);
+      if (!memberships || memberships.length === 0) {
         return res.status(404).send({ errorCode: "MEMBERSHIPS_NOT_FOUND" });
       }
       res.send(memberships);
@@ -479,10 +486,9 @@ const controllerFactory$3 = (db) => {
     }
   };
   const deleteMembership = async (req, res) => {
-    const { type, target, user: user2, role } = req.body;
     console.log(req.body);
     try {
-      const membership = await Membership.findOne({ type, target, user: user2, role });
+      const membership = await Membership.findOneAndDelete({ _id: new ObjectId$1(req.body._id) });
       if (!membership) {
         return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
       } else {
@@ -591,23 +597,6 @@ var department_model = (mongoose) => {
       description: { type: String },
       categories: [String]
     },
-    // Working hours
-    address: String,
-    // Position on map
-    location: {
-      lat: Number,
-      lng: Number,
-      type: {
-        type: String,
-        enum: ["Point"],
-        // 'location.type' must be 'Point'
-        required: true
-      },
-      coordinates: {
-        type: [Number],
-        required: true
-      }
-    },
     worktime: [{
       day: String,
       time: {
@@ -638,7 +627,6 @@ var department_model = (mongoose) => {
     ]
   });
   departmentSchema.index({ organization: 1 });
-  departmentSchema.index({ location: "2dsphere" });
   const Department = mongoose.model("Department", departmentSchema);
   return Department;
 };
@@ -726,6 +714,10 @@ var membership_model = (mongoose) => {
       type: String,
       default: "subscriber"
     },
+    label: {
+      type: String,
+      default: "subscriber"
+    },
     target: {
       // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,

package/dist/products.server.js

@@ -5,7 +5,7 @@ require("uuid");
 const require$$0 = require("mongoose");
 require("path");
 const require$$3 = require("openai");
-const index = require("./index-a8dffc0c.js");
+const index = require("./index-4eecfdb9.js");
 require("jsonwebtoken");
 require("mongodb");
 var product_model = (mongoose) => {
@@ -27,7 +27,22 @@ var product_model = (mongoose) => {
     images: { type: Array },
     popularity: { type: Number },
     localization: { type: Array },
-    ingredients: { type: Array },
+    ingredients: [{
+      _id: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "Product"
+      },
+      price: {
+        type: Number,
+        required: true,
+        min: [0, "Price cannot be less than 0"]
+      },
+      quantity: {
+        type: Number,
+        required: true,
+        min: [1, "Quantity cannot be less than 1"]
+      }
+    }],
     information: [{
       name: { type: String },
       value: { type: String }
@@ -212,7 +227,10 @@ var leftover_model = (mongoose) => {
 const leftover_model$1 = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(leftover_model);
 const ObjectId$1 = require$$0.Types.ObjectId;
 const OpenAI = require$$3;
-const openai = new OpenAI();
+console.log(process.env.OPENAI_API_KEY);
+const openai = new OpenAI({
+  apiKey: process.env.OPENAI_API_KEY
+});
 const controllerFactory$5 = (db) => {
   const Product = db.product;
   db.modification;
@@ -293,7 +311,7 @@ const controllerFactory$5 = (db) => {
   const Update = async (req, res) => {
     try {
       const { _id } = req.params;
-      console.log(_id);
+      console.log(req.body.ingredients);
       const updatedProduct = await Product.findOneAndUpdate(
         { _id },
         {
@@ -307,7 +325,8 @@ const controllerFactory$5 = (db) => {
           information: req.body.information,
           localization: req.body.localization,
           quantity: req.body.quantity,
-          quantityDiscount: req.body.quantityDiscount
+          quantityDiscount: req.body.quantityDiscount,
+          ingredients: req.body.ingredients
         },
         { new: true }
       );
@@ -338,19 +357,19 @@ const controllerFactory$5 = (db) => {
           "withIngredients": [
             {
               $match: {
-                ingridients: { $exists: true, $not: { $size: 0 } }
+                ingredients: { $exists: true, $not: { $size: 0 } }
                 // Продукты с ингредиентами
               }
             },
             {
               $lookup: {
                 from: "products",
-                localField: "ingridients",
+                localField: "ingredients",
                 foreignField: "_id",
                 as: "ingredientDetails"
               }
             },
-            { $unwind: "$ingredientDetails" },
+            // { $unwind: "$ingredientDetails" },
             {
               $lookup: {
                 from: "leftovers",
@@ -385,9 +404,9 @@ const controllerFactory$5 = (db) => {
             {
               $match: {
                 $or: [
-                  { ingridients: { $exists: false } },
+                  { ingredients: { $exists: false } },
                   // Продукты без ингредиентов
-                  { ingridients: { $size: 0 } }
+                  { ingredients: { $size: 0 } }
                 ]
               }
             },
@@ -449,13 +468,13 @@ const controllerFactory$5 = (db) => {
         console.log("no products");
         return res.status(404).send({ message: "Products not found." });
       }
-      const productsList = products.map((p) => `
-        ${p._id}: 
-        ${p.name} 
-        (${p.information[0].value}) 
-        (${p.information[1].value}%)  
-        (${p.information[2].value})
-      `).join(", ");
+      const productsList = products.map((p) => {
+        const info = p.information || [];
+        const value0 = info[0] ? info[0].value : "";
+        const value1 = info[1] ? `(${info[1].value}%)` : "";
+        const value2 = info[2] ? `(${info[2].value})` : "";
+        return `${p._id}: ${p.name} (${value0}) ${value1} ${value2}`;
+      }).join(", ");
       const prompt = `
         1. When asked how the client wants to feel, they responded "${mood}". 
         2. Here is a list of products in our store: ${productsList}. 
@@ -469,7 +488,7 @@ const controllerFactory$5 = (db) => {
       while (true) {
         try {
           response = await openai.chat.completions.create({
-            model: "gpt-4",
+            model: "gpt-3.5-turbo",
             messages: [{ role: "user", content: prompt }]
           });
           console.log(response);
@@ -521,13 +540,21 @@ const controllerFactory$5 = (db) => {
         {
           $lookup: {
             from: "leftovers",
-            let: { productId: "$_id", ingredients: { $ifNull: ["$ingredients", []] } },
+            let: { productId: "$_id", ingredientsIds: "$ingredients._id" },
             pipeline: [
               {
                 $unwind: "$positions"
               },
               {
-                "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] } }
+                $match: {
+                  $expr: {
+                    $or: [
+                      { $eq: ["$positions._id", "$$productId"] },
+                      { $in: ["$positions._id", { $ifNull: ["$$ingredientsIds", []] }] }
+                      // Исправлено
+                    ]
+                  }
+                }
               },
               {
                 "$addFields": {
@@ -548,18 +575,75 @@ const controllerFactory$5 = (db) => {
                 }
               }
             ],
-            as: "variants"
+            as: "leftovers"
+          }
+        },
+        {
+          $addFields: {
+            ingredientsQuantities: {
+              $cond: {
+                if: { $isArray: "$ingredients" },
+                then: {
+                  $map: {
+                    input: "$ingredients",
+                    as: "ingredient",
+                    in: {
+                      $let: {
+                        vars: {
+                          ingredientId: "$$ingredient._id",
+                          ingredientQuantity: { $ifNull: ["$$ingredient.quantity", 0] }
+                        },
+                        in: {
+                          $divide: [
+                            {
+                              $sum: {
+                                $map: {
+                                  input: "$leftovers",
+                                  as: "leftover",
+                                  in: {
+                                    $cond: {
+                                      if: { $eq: ["$$leftover._id", "$$ingredientId"] },
+                                      then: "$$leftover.quantity",
+                                      else: 0
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              $cond: {
+                                if: { $eq: ["$$ingredientQuantity", 0] },
+                                then: 1,
+                                else: "$$ingredientQuantity"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                },
+                else: []
+              }
+            }
           }
         },
         {
           $set: {
             quantity: {
-              $sum: ["$quantity", { $sum: "$variants.quantity" }]
+              $cond: {
+                if: { $gt: [{ $size: { $ifNull: ["$ingredients", []] } }, 0] },
+                // Снова проверяем, не пустой ли массив ингредиентов
+                then: { $floor: { $min: "$ingredientsQuantities" } },
+                else: { $sum: "$leftovers.quantity" }
+                // Просто суммируем quantity из leftovers, если ингредиентов нет
+              }
             }
           }
         },
-        { $unset: "variants" }
+        { $unset: ["leftovers", "ingredientsQuantities"] }
       ]);
+      console.log(product);
       if (!product || product.length < 1) {
         return res.status(404).send({ message: "Product not found." });
       }
@@ -568,7 +652,6 @@ const controllerFactory$5 = (db) => {
         { $inc: { popularity: 1 } },
         { new: true }
       );
-      console.log("Popularity updated:", updatedProduct);
       res.status(200).send(product);
     } catch (err) {
       console.error("Error:", err);