@ozdao/prometheus-framework 0.2.30 → 0.2.31

package/dist/middlewares.server.js

@@ -1,6 +1,6 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-3b53548e.js");
-const index = require("./index-05aa7cae.js");
+const index = require("./index-a8dffc0c.js");
 require("jsonwebtoken");
 require("mongodb");
 const verifyUser = index.verifyUser;

package/dist/middlewares.server.mjs

@@ -1,5 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-83b1d755.mjs";
-import { v as verifyUser$1, a as verifyInvites$1, b as authJwt$1, c as verifySignUp$1, d as verifyCategory$1, s as server } from "./index-d5066b82.mjs";
+import { v as verifyUser$1, a as verifyInvites$1, b as authJwt$1, c as verifySignUp$1, d as verifyCategory$1, s as server } from "./index-d769324d.mjs";
 import "jsonwebtoken";
 import "mongodb";
 const verifyUser = verifyUser$1;

package/dist/organizations.server.js

@@ -6,8 +6,8 @@ require("bcryptjs");
 require("uuidv4");
 const require$$0 = require("mongoose");
 const require$$5 = require("@googlemaps/google-maps-services-js");
-const addMembersQuantity$1 = require("./addMembersQuantity-7147aa4a.js");
-require("mongodb");
+const addMembersQuantity$1 = require("./addMembersQuantity-fb552ca0.js");
+const require$$0$2 = require("mongodb");
 const controllerFactory$5 = (db) => {
   const Department = db.department;
   const readOne = (req, res) => {
@@ -72,7 +72,7 @@ const controllerFactory$5 = (db) => {
 };
 var departments_controller = controllerFactory$5;
 const jwt = require$$0$1;
-const ObjectId = require$$0.Types.ObjectId;
+const ObjectId$1 = require$$0.Types.ObjectId;
 const { Client } = require$$5;
 const client = new Client({});
 const addUserStatusFields = addMembersQuantity$1.addUserStatusFields_1;
@@ -87,10 +87,10 @@ const controllerFactory$4 = (db) => {
     db.membership;
     db.user;
     db.role;
-    console.log(req);
     const sortParam = req.query.sortParam || "numberOfProducts";
     const sortOrder = req.query.sortOrder || "desc";
     const sort = {
+      "numberOfProducts": -1,
       [sortParam]: sortOrder === "desc" ? -1 : 1,
       "_id": 1
     };
@@ -109,23 +109,30 @@ const controllerFactory$4 = (db) => {
       const [min, max] = priceRange.split("-").map(Number);
       return { "products.price": { $gte: min, $lte: max } };
     });
-    console.log(req.query.postable);
+    let containConditions = [];
+    if (req.query.contain) {
+      containConditions = req.query.contain.map((property) => ({
+        [property]: { $exists: true, $not: { $size: 0 } }
+      }));
+    }
     const matchConditions = [
-      ...req.query._id ? [{ _id: new ObjectId(req.query._id) }] : [],
-      ...req.query.owner ? [{ owner: new ObjectId(req.query.owner) }] : [],
-      ...req.query.member ? [{ "memberships.user": new ObjectId(req.query.member), "memberships.role": { $ne: "subscriber" } }] : [],
-      ...req.query.subscriber ? [{ "memberships.user": new ObjectId(req.query.subscriber), "memberships.role": "subscriber" }] : [],
-      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
+      ...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.types ? [{ types: { $in: req.query.types } }] : [],
       // Если req.query.types - строка
       // to remove
-      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : [],
+      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$1(req.query.onlyuser) }] : [],
       ...categories.length > 0 ? [{ "products.category": { $in: categories } }] : [],
-      ...delivery.length > 0 ? [{ "departments.delivery": { $all: delivery } }] : [],
-      ...priceConditions.length > 0 ? [{ $or: priceConditions }] : []
+      ...delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : [],
+      ...priceConditions.length > 0 ? [{ $or: priceConditions }] : [],
+      ...req.query.contain ? containConditions : []
     ];
-    let { location, address, city, state, country } = req.query;
-    if (!location && address || city || state || country) {
+    let { location, address, locationRadius, city, state, country } = req.query;
+    let userLocation = { coordinates: [0, 0] };
+    if (!location && (address || city || state || country)) {
       let geoLocation;
       const searchString = [address, city, state, country].filter(Boolean).join(", ");
       try {
@@ -137,6 +144,11 @@ const controllerFactory$4 = (db) => {
         });
         if (geoResponse.data.results && geoResponse.data.results.length > 0) {
           geoLocation = geoResponse.data.results[0].geometry.location;
+          userLocation.coordinates = [
+            geoResponse.data.results[0].geometry.location.lng,
+            geoResponse.data.results[0].geometry.location.lat
+          ];
+          console.log(userLocation);
         } else {
           return res.status(400).send({ message: "Unable to geocode the provided location." });
         }
@@ -144,30 +156,56 @@ const controllerFactory$4 = (db) => {
         console.log(err);
         return res.status(500).send({ message: "Error occurred while geocoding." });
       }
-      const radius = city ? 50 : state ? 100 : 500;
+      const radius = city ? 500 : state ? 1e3 : 5e3;
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [geoLocation.lng, geoLocation.lat],
+              [parseFloat(geoLocation.lng), parseFloat(geoLocation.lat)],
               radius / 6378.1
             ]
           }
         }
       });
     }
+    const search = req.query.search;
+    if (search) {
+      const parts = search.split(".");
+      let regexPattern = "";
+      if (parts.length === 2) {
+        regexPattern = parts.map((part) => part.substr(0, part.length - 1) + ".{1}").join("\\.");
+      } else {
+        regexPattern = search.substr(0, search.length - 1) + ".{1}";
+      }
+      matchConditions.push({
+        $or: [
+          { "profile.name": { $regex: regexPattern, $options: "i" } },
+          { "products.name": { $regex: regexPattern, $options: "i" } }
+        ]
+      });
+    }
     if (location) {
-      console.log("Location is " + location);
+      console.log(location);
       if (typeof location === "string") {
         location = JSON.parse(location);
       }
-      let [lng, lat] = location.coordinates;
+      let lng;
+      let lat;
+      if (location.lng) {
+        lng = location.lng;
+        lat = location.lat;
+        userLocation.coordinates = [lng, lat];
+      } else {
+        lng = location.coordinates[0];
+        lat = location.coordinates[1];
+        userLocation.coordinates = [lng, lat];
+      }
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [lng, lat],
-              20 / 6378.1
+              [parseFloat(lng), parseFloat(lat)],
+              (locationRadius || 50) / 6378.1
             ]
           }
         }
@@ -183,6 +221,14 @@ const controllerFactory$4 = (db) => {
           as: "products"
         }
       },
+      {
+        $lookup: {
+          from: "blogposts",
+          localField: "_id",
+          foreignField: "owner.target",
+          as: "blogposts"
+        }
+      },
       {
         $addFields: {
           numberOfProducts: { $size: "$products" }
@@ -204,6 +250,58 @@ const controllerFactory$4 = (db) => {
           as: "spots"
         }
       },
+      {
+        $addFields: {
+          spots: {
+            $map: {
+              input: "$spots",
+              as: "spot",
+              in: {
+                $mergeObjects: [
+                  "$$spot",
+                  {
+                    distance: {
+                      $function: {
+                        body: `function(spotCoords, userCoords, isMiles) {
+                        // The function remains the same
+                        function toRad(x) {
+                          return x * Math.PI / 180;
+                        }
+                        var lon1 = spotCoords[0];
+                        var lat1 = spotCoords[1];
+                        var lon2 = userCoords[0];
+                        var lat2 = userCoords[1];
+                        var R = 6371; // Radius of the Earth in km
+                        if (isMiles) R = 3959; // Radius of the Earth in miles
+                        var x1 = lat2 - lat1;
+                        var dLat = toRad(x1);
+                        var x2 = lon2 - lon1;
+                        var dLon = toRad(x2);
+                        var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                                Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
+                                Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+                        var d = R * c;
+                        return d;
+                      }`,
+                        args: ["$$spot.location.coordinates", userLocation.coordinates, false],
+                        // Use actual field names
+                        lang: "js"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      },
+      {
+        $addFields: {
+          distance: { $min: "$spots.distance" }
+          // Add the minDistance field here
+        }
+      },
       {
         $lookup: {
           from: "memberships",
@@ -545,11 +643,12 @@ var department_model = (mongoose) => {
   const Department = mongoose.model("Department", departmentSchema);
   return Department;
 };
+const { ObjectId } = require$$0$2;
 var organization_model = (mongoose) => {
   const OrganizationSchema = new mongoose.Schema({
     // Creator and owner of organizations
     owner: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: ObjectId,
       ref: "User",
       required: true
     },
@@ -586,7 +685,8 @@ var organization_model = (mongoose) => {
       telegram: String,
       twitter: String,
       facebook: String,
-      instagram: String
+      instagram: String,
+      youtube: String
     },
     // departments 
     structure: {

package/dist/organizations.server.mjs

@@ -5,8 +5,8 @@ import "bcryptjs";
 import "uuidv4";
 import require$$0 from "mongoose";
 import require$$5 from "@googlemaps/google-maps-services-js";
-import { a as addUserStatusFields_1, b as addMembersQuantity_1 } from "./addMembersQuantity-eac999f0.mjs";
-import "mongodb";
+import { a as addUserStatusFields_1, b as addMembersQuantity_1 } from "./addMembersQuantity-3505b6f3.mjs";
+import require$$0$2 from "mongodb";
 const controllerFactory$5 = (db) => {
   const Department = db.department;
   const readOne = (req, res) => {
@@ -71,7 +71,7 @@ const controllerFactory$5 = (db) => {
 };
 var departments_controller = controllerFactory$5;
 const jwt = require$$0$1;
-const ObjectId = require$$0.Types.ObjectId;
+const ObjectId$1 = require$$0.Types.ObjectId;
 const { Client } = require$$5;
 const client = new Client({});
 const addUserStatusFields = addUserStatusFields_1;
@@ -86,10 +86,10 @@ const controllerFactory$4 = (db) => {
     db.membership;
     db.user;
     db.role;
-    console.log(req);
     const sortParam = req.query.sortParam || "numberOfProducts";
     const sortOrder = req.query.sortOrder || "desc";
     const sort = {
+      "numberOfProducts": -1,
       [sortParam]: sortOrder === "desc" ? -1 : 1,
       "_id": 1
     };
@@ -108,23 +108,30 @@ const controllerFactory$4 = (db) => {
       const [min, max] = priceRange.split("-").map(Number);
       return { "products.price": { $gte: min, $lte: max } };
     });
-    console.log(req.query.postable);
+    let containConditions = [];
+    if (req.query.contain) {
+      containConditions = req.query.contain.map((property) => ({
+        [property]: { $exists: true, $not: { $size: 0 } }
+      }));
+    }
     const matchConditions = [
-      ...req.query._id ? [{ _id: new ObjectId(req.query._id) }] : [],
-      ...req.query.owner ? [{ owner: new ObjectId(req.query.owner) }] : [],
-      ...req.query.member ? [{ "memberships.user": new ObjectId(req.query.member), "memberships.role": { $ne: "subscriber" } }] : [],
-      ...req.query.subscriber ? [{ "memberships.user": new ObjectId(req.query.subscriber), "memberships.role": "subscriber" }] : [],
-      ...req.query.postable ? [{ $or: [{ $and: [{ types: { $elemMatch: { $eq: "public" } } }, { "memberships.user": new ObjectId(req.query.postable) }] }, { $and: [{ types: { $elemMatch: { $in: ["exclusive", "hidden"] } } }, { "memberships.user": new ObjectId(req.query.postable) }, { "memberships.role": { $ne: "subscriber" } }] }] }] : [],
+      ...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.types ? [{ types: { $in: req.query.types } }] : [],
       // Если req.query.types - строка
       // to remove
-      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : [],
+      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$1(req.query.onlyuser) }] : [],
       ...categories.length > 0 ? [{ "products.category": { $in: categories } }] : [],
-      ...delivery.length > 0 ? [{ "departments.delivery": { $all: delivery } }] : [],
-      ...priceConditions.length > 0 ? [{ $or: priceConditions }] : []
+      ...delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : [],
+      ...priceConditions.length > 0 ? [{ $or: priceConditions }] : [],
+      ...req.query.contain ? containConditions : []
     ];
-    let { location, address, city, state, country } = req.query;
-    if (!location && address || city || state || country) {
+    let { location, address, locationRadius, city, state, country } = req.query;
+    let userLocation = { coordinates: [0, 0] };
+    if (!location && (address || city || state || country)) {
       let geoLocation;
       const searchString = [address, city, state, country].filter(Boolean).join(", ");
       try {
@@ -136,6 +143,11 @@ const controllerFactory$4 = (db) => {
         });
         if (geoResponse.data.results && geoResponse.data.results.length > 0) {
           geoLocation = geoResponse.data.results[0].geometry.location;
+          userLocation.coordinates = [
+            geoResponse.data.results[0].geometry.location.lng,
+            geoResponse.data.results[0].geometry.location.lat
+          ];
+          console.log(userLocation);
         } else {
           return res.status(400).send({ message: "Unable to geocode the provided location." });
         }
@@ -143,30 +155,56 @@ const controllerFactory$4 = (db) => {
         console.log(err);
         return res.status(500).send({ message: "Error occurred while geocoding." });
       }
-      const radius = city ? 50 : state ? 100 : 500;
+      const radius = city ? 500 : state ? 1e3 : 5e3;
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [geoLocation.lng, geoLocation.lat],
+              [parseFloat(geoLocation.lng), parseFloat(geoLocation.lat)],
               radius / 6378.1
             ]
           }
         }
       });
     }
+    const search = req.query.search;
+    if (search) {
+      const parts = search.split(".");
+      let regexPattern = "";
+      if (parts.length === 2) {
+        regexPattern = parts.map((part) => part.substr(0, part.length - 1) + ".{1}").join("\\.");
+      } else {
+        regexPattern = search.substr(0, search.length - 1) + ".{1}";
+      }
+      matchConditions.push({
+        $or: [
+          { "profile.name": { $regex: regexPattern, $options: "i" } },
+          { "products.name": { $regex: regexPattern, $options: "i" } }
+        ]
+      });
+    }
     if (location) {
-      console.log("Location is " + location);
+      console.log(location);
       if (typeof location === "string") {
         location = JSON.parse(location);
       }
-      let [lng, lat] = location.coordinates;
+      let lng;
+      let lat;
+      if (location.lng) {
+        lng = location.lng;
+        lat = location.lat;
+        userLocation.coordinates = [lng, lat];
+      } else {
+        lng = location.coordinates[0];
+        lat = location.coordinates[1];
+        userLocation.coordinates = [lng, lat];
+      }
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [lng, lat],
-              20 / 6378.1
+              [parseFloat(lng), parseFloat(lat)],
+              (locationRadius || 50) / 6378.1
             ]
           }
         }
@@ -182,6 +220,14 @@ const controllerFactory$4 = (db) => {
           as: "products"
         }
       },
+      {
+        $lookup: {
+          from: "blogposts",
+          localField: "_id",
+          foreignField: "owner.target",
+          as: "blogposts"
+        }
+      },
       {
         $addFields: {
           numberOfProducts: { $size: "$products" }
@@ -203,6 +249,58 @@ const controllerFactory$4 = (db) => {
           as: "spots"
         }
       },
+      {
+        $addFields: {
+          spots: {
+            $map: {
+              input: "$spots",
+              as: "spot",
+              in: {
+                $mergeObjects: [
+                  "$$spot",
+                  {
+                    distance: {
+                      $function: {
+                        body: `function(spotCoords, userCoords, isMiles) {
+                        // The function remains the same
+                        function toRad(x) {
+                          return x * Math.PI / 180;
+                        }
+                        var lon1 = spotCoords[0];
+                        var lat1 = spotCoords[1];
+                        var lon2 = userCoords[0];
+                        var lat2 = userCoords[1];
+                        var R = 6371; // Radius of the Earth in km
+                        if (isMiles) R = 3959; // Radius of the Earth in miles
+                        var x1 = lat2 - lat1;
+                        var dLat = toRad(x1);
+                        var x2 = lon2 - lon1;
+                        var dLon = toRad(x2);
+                        var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                                Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
+                                Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+                        var d = R * c;
+                        return d;
+                      }`,
+                        args: ["$$spot.location.coordinates", userLocation.coordinates, false],
+                        // Use actual field names
+                        lang: "js"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      },
+      {
+        $addFields: {
+          distance: { $min: "$spots.distance" }
+          // Add the minDistance field here
+        }
+      },
       {
         $lookup: {
           from: "memberships",
@@ -544,11 +642,12 @@ var department_model = (mongoose) => {
   const Department = mongoose.model("Department", departmentSchema);
   return Department;
 };
+const { ObjectId } = require$$0$2;
 var organization_model = (mongoose) => {
   const OrganizationSchema = new mongoose.Schema({
     // Creator and owner of organizations
     owner: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: ObjectId,
       ref: "User",
       required: true
     },
@@ -585,7 +684,8 @@ var organization_model = (mongoose) => {
       telegram: String,
       twitter: String,
       facebook: String,
-      instagram: String
+      instagram: String,
+      youtube: String
     },
     // departments 
     structure: {