@ozdao/prometheus-framework 0.2.112 → 0.2.114

package/dist/node_modules/web3-validator/lib/esm/utils.js

@@ -54,25 +54,25 @@ const O = ["hex", "number", "blockNumber", "blockNumberOrTag", "filter", "bloom"
   };
   for (const [r, s] of e.entries()) {
     let i, o, m = [];
-    w(s) ? (i = s.type, o = s.name, m = s.components) : typeof s == "string" ? (i = s, o = `${t}/${r}`) : Array.isArray(s) && (s[0] && typeof s[0] == "string" && s[0].startsWith("tuple") && !Array.isArray(s[0]) && s[1] && Array.isArray(s[1]) ? (i = s[0], o = `${t}/${r}`, m = s[1]) : (i = "tuple", o = `${t}/${r}`, m = s));
-    const { baseType: c, isArray: y, arraySizes: l } = I(i);
+    w(s) ? (i = s.type, o = s.name || `${t}/${r}`, m = s.components) : typeof s == "string" ? (i = s, o = `${t}/${r}`) : Array.isArray(s) && (s[0] && typeof s[0] == "string" && s[0].startsWith("tuple") && !Array.isArray(s[0]) && s[1] && Array.isArray(s[1]) ? (i = s[0], o = `${t}/${r}`, m = s[1]) : (i = "tuple", o = `${t}/${r}`, m = s));
+    const { baseType: c, isArray: l, arraySizes: u } = I(i);
     let p, f = n;
-    for (let a = l.length - 1; a > 0; a -= 1)
+    for (let a = u.length - 1; a > 0; a -= 1)
       p = {
         type: "array",
         $id: o,
         items: [],
-        maxItems: l[a],
-        minItems: l[a]
-      }, l[a] < 0 && (delete p.maxItems, delete p.minItems), Array.isArray(f.items) ? f.items.length === 0 ? f.items = [p] : f.items.push(p) : f.items = [f.items, p], f = p;
-    if (c === "tuple" && !y) {
+        maxItems: u[a],
+        minItems: u[a]
+      }, u[a] < 0 && (delete p.maxItems, delete p.minItems), Array.isArray(f.items) ? f.items.length === 0 ? f.items = [p] : f.items.push(p) : f.items = [f.items, p], f = p;
+    if (c === "tuple" && !l) {
       const a = A(m, o);
       a.$id = o, f.items.push(a);
-    } else if (c === "tuple" && y) {
-      const a = l[0], h = Object.assign({ type: "array", $id: o, items: A(m, o) }, a >= 0 && { minItems: a, maxItems: a });
+    } else if (c === "tuple" && l) {
+      const a = u[0], h = Object.assign({ type: "array", $id: o, items: A(m, o) }, a >= 0 && { minItems: a, maxItems: a });
       f.items.push(h);
-    } else if (y) {
-      const a = l[0], h = Object.assign({ type: "array", $id: o, items: g(i) }, a >= 0 && { minItems: a, maxItems: a });
+    } else if (l) {
+      const a = u[0], h = Object.assign({ type: "array", $id: o, items: g(i) }, a >= 0 && { minItems: a, maxItems: a });
       f.items.push(h);
     } else
       Array.isArray(f.items) ? f.items.push(Object.assign({ $id: o }, g(i))) : f.items.push(Object.assign({ $id: o }, g(i)));
@@ -84,10 +84,10 @@ const O = ["hex", "number", "blockNumber", "blockNumberOrTag", "filter", "bloom"
   for (const [s, i] of e.entries()) {
     let o, m, c = [];
     w(i) ? (o = i.type, m = i.name, c = i.components) : typeof i == "string" ? o = i : Array.isArray(i) && (i[1] && Array.isArray(i[1]) ? (o = i[0], c = i[1]) : (o = "tuple", c = i));
-    const { baseType: y, isArray: l, arraySizes: p } = I(o), f = Array.isArray(t) ? t[s] : t[m];
-    if (y === "tuple" && !l)
+    const { baseType: l, isArray: u, arraySizes: p } = I(o), f = Array.isArray(t) ? t[s] : t[m];
+    if (l === "tuple" && !u)
       r.push(d(c, f, n));
-    else if (y === "tuple" && l) {
+    else if (l === "tuple" && u) {
       const a = [];
       for (const h of f)
         if (p.length > 1) {
@@ -141,7 +141,7 @@ function M(e) {
   }
   return t;
 }
-const u = {
+const y = {
   zero: 48,
   nine: 57,
   A: 65,
@@ -150,12 +150,12 @@ const u = {
   f: 102
 };
 function x(e) {
-  if (e >= u.zero && e <= u.nine)
-    return e - u.zero;
-  if (e >= u.A && e <= u.F)
-    return e - (u.A - 10);
-  if (e >= u.a && e <= u.f)
-    return e - (u.a - 10);
+  if (e >= y.zero && e <= y.nine)
+    return e - y.zero;
+  if (e >= y.A && e <= y.F)
+    return e - (y.A - 10);
+  if (e >= y.a && e <= y.f)
+    return e - (y.a - 10);
 }
 function R(e) {
   let t = 0;

package/dist/node_modules/web3-validator/lib/esm/validation/bytes.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../utils.cjs"),n=require("./string.cjs"),y=r=>{var e;return r instanceof Uint8Array||((e=r==null?void 0:r.constructor)===null||e===void 0?void 0:e.name)==="Uint8Array"},f=(r,e={abiType:"bytes"})=>{if(typeof r!="string"&&!Array.isArray(r)&&!y(r)||typeof r=="string"&&n.isHexStrict(r)&&r.startsWith("-")||typeof r=="string"&&!n.isHexStrict(r))return!1;let t;if(typeof r=="string"){if(r.length%2!==0)return!1;t=s.hexToUint8Array(r)}else if(Array.isArray(r)){if(r.some(i=>i<0||i>255||!Number.isInteger(i)))return!1;t=new Uint8Array(r)}else t=r;if(e!=null&&e.abiType){const{baseTypeSize:i}=s.parseBaseType(e.abiType);return i?t.length===i:!0}return e!=null&&e.size?t.length===(e==null?void 0:e.size):!0};exports.isBytes=f;exports.isUint8Array=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../utils.cjs"),s=require("./string.cjs"),y=r=>{var e,i;return r instanceof Uint8Array||((e=r==null?void 0:r.constructor)===null||e===void 0?void 0:e.name)==="Uint8Array"||((i=r==null?void 0:r.constructor)===null||i===void 0?void 0:i.name)==="Buffer"},f=(r,e={abiType:"bytes"})=>{if(typeof r!="string"&&!Array.isArray(r)&&!y(r)||typeof r=="string"&&s.isHexStrict(r)&&r.startsWith("-")||typeof r=="string"&&!s.isHexStrict(r))return!1;let i;if(typeof r=="string"){if(r.length%2!==0)return!1;i=n.hexToUint8Array(r)}else if(Array.isArray(r)){if(r.some(t=>t<0||t>255||!Number.isInteger(t)))return!1;i=new Uint8Array(r)}else i=r;if(e!=null&&e.abiType){const{baseTypeSize:t}=n.parseBaseType(e.abiType);return t?i.length===t:!0}return e!=null&&e.size?i.length===(e==null?void 0:e.size):!0};exports.isBytes=f;exports.isUint8Array=y;

package/dist/node_modules/web3-validator/lib/esm/validation/bytes.js

@@ -1,29 +1,29 @@
 import { hexToUint8Array as s, parseBaseType as f } from "../utils.js";
 import { isHexStrict as n } from "./string.js";
 const y = (r) => {
-  var e;
-  return r instanceof Uint8Array || ((e = r == null ? void 0 : r.constructor) === null || e === void 0 ? void 0 : e.name) === "Uint8Array";
+  var e, i;
+  return r instanceof Uint8Array || ((e = r == null ? void 0 : r.constructor) === null || e === void 0 ? void 0 : e.name) === "Uint8Array" || ((i = r == null ? void 0 : r.constructor) === null || i === void 0 ? void 0 : i.name) === "Buffer";
 }, c = (r, e = {
   abiType: "bytes"
 }) => {
   if (typeof r != "string" && !Array.isArray(r) && !y(r) || typeof r == "string" && n(r) && r.startsWith("-") || typeof r == "string" && !n(r))
     return !1;
-  let t;
+  let i;
   if (typeof r == "string") {
     if (r.length % 2 !== 0)
       return !1;
-    t = s(r);
+    i = s(r);
   } else if (Array.isArray(r)) {
-    if (r.some((i) => i < 0 || i > 255 || !Number.isInteger(i)))
+    if (r.some((t) => t < 0 || t > 255 || !Number.isInteger(t)))
       return !1;
-    t = new Uint8Array(r);
+    i = new Uint8Array(r);
   } else
-    t = r;
+    i = r;
   if (e != null && e.abiType) {
-    const { baseTypeSize: i } = f(e.abiType);
-    return i ? t.length === i : !0;
+    const { baseTypeSize: t } = f(e.abiType);
+    return t ? i.length === t : !0;
   }
-  return e != null && e.size ? t.length === (e == null ? void 0 : e.size) : !0;
+  return e != null && e.size ? i.length === (e == null ? void 0 : e.size) : !0;
 };
 export {
   c as isBytes,

package/dist/node_modules/web3-validator/lib/esm/validation/numbers.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../utils.cjs"),g=require("./string.cjs"),b=(e,i)=>{let t=e;for(let n=1;n<i;n+=1)t*=e;return t},y=(e,i={abiType:"uint"})=>{if(!["number","string","bigint"].includes(typeof e)||typeof e=="string"&&e.length===0)return!1;let t;if(i!=null&&i.abiType){const{baseTypeSize:r}=f.parseBaseType(i.abiType);r&&(t=r)}else i.bitSize&&(t=i.bitSize);const n=b(BigInt(2),BigInt(t??256))-BigInt(1);try{const r=typeof e=="string"&&g.isHexStrict(e)?BigInt(f.hexToNumber(e)):BigInt(e);return r>=0&&r<=n}catch{return!1}},c=(e,i={abiType:"int"})=>{if(!["number","string","bigint"].includes(typeof e)||typeof e=="number"&&e>Number.MAX_SAFE_INTEGER)return!1;let t;if(i!=null&&i.abiType){const{baseTypeSize:s,baseType:u}=f.parseBaseType(i.abiType);if(u!=="int")return!1;s&&(t=s)}else i.bitSize&&(t=i.bitSize);const n=b(BigInt(2),BigInt((t??256)-1)),r=BigInt(-1)*b(BigInt(2),BigInt((t??256)-1));try{const s=typeof e=="string"&&g.isHexStrict(e)?BigInt(f.hexToNumber(e)):BigInt(e);return s>=r&&s<=n}catch{return!1}},o=e=>!!(c(e)||typeof e=="string"&&/[0-9.]/.test(e)&&e.indexOf(".")===e.lastIndexOf(".")||typeof e=="number");exports.bigintPower=b;exports.isInt=c;exports.isNumber=o;exports.isUInt=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../utils.cjs"),b=require("./string.cjs"),g=(e,i)=>{if(i===BigInt(0))return BigInt(1);let t=e;for(let n=1;n<i;n+=1)t*=e;return t},y=(e,i={abiType:"uint"})=>{if(!["number","string","bigint"].includes(typeof e)||typeof e=="string"&&e.length===0)return!1;let t;if(i!=null&&i.abiType){const{baseTypeSize:r}=f.parseBaseType(i.abiType);r&&(t=r)}else i.bitSize&&(t=i.bitSize);const n=g(BigInt(2),BigInt(t??256))-BigInt(1);try{const r=typeof e=="string"&&b.isHexStrict(e)?BigInt(f.hexToNumber(e)):BigInt(e);return r>=0&&r<=n}catch{return!1}},c=(e,i={abiType:"int"})=>{if(!["number","string","bigint"].includes(typeof e)||typeof e=="number"&&e>Number.MAX_SAFE_INTEGER)return!1;let t;if(i!=null&&i.abiType){const{baseTypeSize:s,baseType:u}=f.parseBaseType(i.abiType);if(u!=="int")return!1;s&&(t=s)}else i.bitSize&&(t=i.bitSize);const n=g(BigInt(2),BigInt((t??256)-1)),r=BigInt(-1)*g(BigInt(2),BigInt((t??256)-1));try{const s=typeof e=="string"&&b.isHexStrict(e)?BigInt(f.hexToNumber(e)):BigInt(e);return s>=r&&s<=n}catch{return!1}},o=e=>!!(c(e)||typeof e=="string"&&/[0-9.]/.test(e)&&e.indexOf(".")===e.lastIndexOf(".")||typeof e=="number");exports.bigintPower=g;exports.isInt=c;exports.isNumber=o;exports.isUInt=y;

package/dist/node_modules/web3-validator/lib/esm/validation/numbers.js

@@ -1,52 +1,54 @@
-import { parseBaseType as b, hexToNumber as g } from "../utils.js";
+import { parseBaseType as g, hexToNumber as b } from "../utils.js";
 import { isHexStrict as c } from "./string.js";
-const s = (e, i) => {
-  let t = e;
-  for (let n = 1; n < i; n += 1)
-    t *= e;
-  return t;
-}, m = (e, i = {
+const s = (t, e) => {
+  if (e === BigInt(0))
+    return BigInt(1);
+  let i = t;
+  for (let n = 1; n < e; n += 1)
+    i *= t;
+  return i;
+}, B = (t, e = {
   abiType: "uint"
 }) => {
-  if (!["number", "string", "bigint"].includes(typeof e) || typeof e == "string" && e.length === 0)
+  if (!["number", "string", "bigint"].includes(typeof t) || typeof t == "string" && t.length === 0)
     return !1;
-  let t;
-  if (i != null && i.abiType) {
-    const { baseTypeSize: r } = b(i.abiType);
-    r && (t = r);
+  let i;
+  if (e != null && e.abiType) {
+    const { baseTypeSize: r } = g(e.abiType);
+    r && (i = r);
   } else
-    i.bitSize && (t = i.bitSize);
-  const n = s(BigInt(2), BigInt(t ?? 256)) - BigInt(1);
+    e.bitSize && (i = e.bitSize);
+  const n = s(BigInt(2), BigInt(i ?? 256)) - BigInt(1);
   try {
-    const r = typeof e == "string" && c(e) ? BigInt(g(e)) : BigInt(e);
+    const r = typeof t == "string" && c(t) ? BigInt(b(t)) : BigInt(t);
     return r >= 0 && r <= n;
   } catch {
     return !1;
   }
-}, o = (e, i = {
+}, I = (t, e = {
   abiType: "int"
 }) => {
-  if (!["number", "string", "bigint"].includes(typeof e) || typeof e == "number" && e > Number.MAX_SAFE_INTEGER)
+  if (!["number", "string", "bigint"].includes(typeof t) || typeof t == "number" && t > Number.MAX_SAFE_INTEGER)
     return !1;
-  let t;
-  if (i != null && i.abiType) {
-    const { baseTypeSize: f, baseType: y } = b(i.abiType);
+  let i;
+  if (e != null && e.abiType) {
+    const { baseTypeSize: f, baseType: y } = g(e.abiType);
     if (y !== "int")
       return !1;
-    f && (t = f);
+    f && (i = f);
   } else
-    i.bitSize && (t = i.bitSize);
-  const n = s(BigInt(2), BigInt((t ?? 256) - 1)), r = BigInt(-1) * s(BigInt(2), BigInt((t ?? 256) - 1));
+    e.bitSize && (i = e.bitSize);
+  const n = s(BigInt(2), BigInt((i ?? 256) - 1)), r = BigInt(-1) * s(BigInt(2), BigInt((i ?? 256) - 1));
   try {
-    const f = typeof e == "string" && c(e) ? BigInt(g(e)) : BigInt(e);
+    const f = typeof t == "string" && c(t) ? BigInt(b(t)) : BigInt(t);
     return f >= r && f <= n;
   } catch {
     return !1;
   }
-}, T = (e) => !!(o(e) || typeof e == "string" && /[0-9.]/.test(e) && e.indexOf(".") === e.lastIndexOf(".") || typeof e == "number");
+}, m = (t) => !!(I(t) || typeof t == "string" && /[0-9.]/.test(t) && t.indexOf(".") === t.lastIndexOf(".") || typeof t == "number");
 export {
   s as bigintPower,
-  o as isInt,
-  T as isNumber,
-  m as isUInt
+  I as isInt,
+  m as isNumber,
+  B as isUInt
 };

package/dist/orders.server.js

@@ -3,7 +3,7 @@ const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const ownership_schema = require("./ownership.schema-DN0SlQL6.js");
 const profile_schema = require("./profile.schema-CkOhhf37.js");
 const credentials_schema = require("./credentials.schema-B-KD_ozQ.js");
-const queryProcessor = require("./queryProcessor-DRMo_GWK.js");
+const queryProcessor = require("./queryProcessor-DWf9tsis.js");
 const mailing = require("./mailing-BX0q8DIs.js");
 const index = require("./index-BCCiEK_u.js");
 const require$$0 = require("node-cache");

package/dist/orders.server.mjs

@@ -2,7 +2,7 @@ import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import { o as ownership_schema } from "./ownership.schema-oyx6eNkZ.mjs";
 import { p as profile_schema } from "./profile.schema-24ZpZQJe.mjs";
 import { c as credentials_schema } from "./credentials.schema-C9dmNy7o.mjs";
-import { q as queryProcessor } from "./queryProcessor-BJdKh0Ow.mjs";
+import { q as queryProcessor } from "./queryProcessor-BJoJAetd.mjs";
 import { m as mailing } from "./mailing-Cdp8NXhP.mjs";
 import { s as server } from "./index-B6a1mPgp.mjs";
 import require$$0 from "node-cache";

package/dist/organizations.server.js

@@ -7,10 +7,10 @@ const require$$3 = require("uuidv4");
 const require$$0 = require("mongoose");
 const require$$5 = require("@googlemaps/google-maps-services-js");
 const addMembersQuantity$1 = require("./addMembersQuantity-B8UgqlUM.js");
-const queryProcessor = require("./queryProcessor-DRMo_GWK.js");
+const queryProcessor = require("./queryProcessor-DWf9tsis.js");
 const mailing = require("./mailing-BX0q8DIs.js");
 const index = require("./index-BCCiEK_u.js");
-const require$$0$2 = require("mongodb");
+const engagement_schema = require("./engagement.schema-fdLNO2_6.js");
 const ownership_schema = require("./ownership.schema-DN0SlQL6.js");
 const credentials_schema = require("./credentials.schema-B-KD_ozQ.js");
 const controllerFactory$6 = (db) => {
@@ -85,7 +85,7 @@ const controllerFactory$6 = (db) => {
 };
 var departments_controller = controllerFactory$6;
 const jwt = require$$0$1;
-const ObjectId$2 = 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;
@@ -96,23 +96,19 @@ const controllerFactory$5 = (db) => {
   db.user;
   db.role;
   const read = async (req, res2) => {
-    const Organization2 = db.organization;
-    db.membership;
-    db.user;
-    db.role;
     const sortParam = req.query.sortParam || "numberOfProducts";
     const sortOrder = req.query.sortOrder || "desc";
     const sort = {
+      ...sortParam === "distance" ? { "distanceExist": -1 } : {},
       "numberOfProducts": -1,
       [sortParam]: sortOrder === "desc" ? -1 : 1,
       "_id": 1
     };
-    const options = {
+    console.log(sort);
+    const pagination = {
       skip: parseInt(req.query.skip) || 0,
       limit: parseInt(req.query.limit) || 20
     };
-    const categories = req.query.categories?.split(",") || [];
-    const delivery = req.query.delivery?.split(",") || [];
     const prices = req.query.prices?.split(",") || [];
     let priceConditions = prices.map((priceRange) => {
       if (priceRange.startsWith("<"))
@@ -129,20 +125,36 @@ const controllerFactory$5 = (db) => {
       }));
     }
     const matchConditions = [
-      ...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._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": "member" }] : [],
+      ...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$2(req.query.onlyuser) }] : [],
-      ...categories.length > 0 ? [{ "products.category": { $in: categories } }] : [],
-      ...delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : [],
+      ...req.query.onlyuser ? [{ "memberships.user": new ObjectId$1(req.query.onlyuser) }] : [],
+      ...req.query.categories?.split(",").length > 0 ? [{ "products.category": { $in: req.query.categories?.split(",") } }] : [],
+      ...req.query.delivery?.split(",").length > 0 ? [{ "spots.delivery": { $all: req.query.delivery?.split(",") } }] : [],
       ...priceConditions.length > 0 ? [{ $or: priceConditions }] : [],
       ...req.query.contain ? containConditions : []
     ];
+    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" } }
+        ]
+      });
+    }
     let { location, address, locationRadius, city, state, country } = req.query;
     let userLocation = { coordinates: [0, 0] };
     if (!location && (address || city || state || country)) {
@@ -181,22 +193,6 @@ const controllerFactory$5 = (db) => {
         }
       });
     }
-    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);
       if (typeof location === "string") {
@@ -248,6 +244,11 @@ const controllerFactory$5 = (db) => {
           as: "products"
         }
       },
+      {
+        $addFields: {
+          numberOfProducts: { $size: "$products" }
+        }
+      },
       {
         $lookup: {
           from: "blogposts",
@@ -256,11 +257,6 @@ const controllerFactory$5 = (db) => {
           as: "blogposts"
         }
       },
-      {
-        $addFields: {
-          numberOfProducts: { $size: "$products" }
-        }
-      },
       {
         $lookup: {
           from: "departments",
@@ -326,7 +322,13 @@ const controllerFactory$5 = (db) => {
       {
         $addFields: {
           distance: { $min: "$spots.distance" }
-          // Add the minDistance field here
+        }
+      },
+      {
+        $addFields: {
+          distanceExist: {
+            $cond: { if: { $eq: [{ $type: "$distance" }, "double"] }, then: true, else: false }
+          }
         }
       },
       {
@@ -339,20 +341,14 @@ const controllerFactory$5 = (db) => {
       },
       addMembersQuantity(),
       addUserStatusFields(req.query.user),
-      {
-        $addFields: {
-          numberOfProducts: { $size: "$products" }
-        }
-      },
       ...matchStage != null ? [matchStage] : [],
       { $sort: sort },
-      { $skip: options.skip },
-      { $limit: options.limit }
+      { $skip: pagination.skip },
+      { $limit: pagination.limit }
     ];
     try {
       console.log(stages);
-      const organizations = await Organization2.aggregate(stages);
-      console.log(organizations);
+      const organizations = await Organization.aggregate(stages);
       res2.status(200).send(organizations);
     } catch (err) {
       console.log(err);
@@ -427,7 +423,7 @@ const controllerFactory$5 = (db) => {
       if (!organization) {
         return res2.status(404).send({ message: "Organization not found" });
       }
-      Membership.deleteMany({ organization: req.params._id }).then(() => {
+      Membership.deleteMany({ target: req.params._id }).then(() => {
         const newToken = jwt.sign({
           _id: user._id,
           organization: null
@@ -453,7 +449,7 @@ const controllerFactory$5 = (db) => {
   };
 };
 var organizations_controller = controllerFactory$5;
-const ObjectId$1 = require$$0.Types.ObjectId;
+const ObjectId = require$$0.Types.ObjectId;
 const queryProcessorGlobals = queryProcessor.queryProcessor;
 const controllerFactory$4 = (db) => {
   const Membership = db.membership;
@@ -481,9 +477,9 @@ const controllerFactory$4 = (db) => {
         },
         {
           $match: {
-            ...req.query.user && { user: new ObjectId$1(req.query.user) },
+            ...req.query.user && { user: new ObjectId(req.query.user) },
             ...req.query.type && { type: req.query.type },
-            ...req.query.target && { target: new ObjectId$1(req.query.target) },
+            ...req.query.target && { target: new ObjectId(req.query.target) },
             ...req.query.role && { role: { $in: req.query.role } },
             ...req.query.search && {
               $or: [
@@ -545,7 +541,7 @@ const controllerFactory$4 = (db) => {
   const deleteMembership = async (req, res2) => {
     console.log(req.body);
     try {
-      const membership = await Membership.findOneAndDelete({ _id: new ObjectId$1(req.body._id) });
+      const membership = await Membership.findOneAndDelete({ _id: new ObjectId(req.body._id) });
       if (!membership) {
         return res2.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
       } else {
@@ -953,12 +949,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({
+const applyEngagementSchema = engagement_schema.engagement_schema;
+var organization_model = (db) => {
+  const OrganizationSchema = new db.mongoose.Schema({
     // Creator and owner of organizations
     owner: {
-      type: ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: "User",
       required: true
     },
@@ -1019,7 +1015,8 @@ var organization_model = (mongoose) => {
   }, {
     timestamps: true
   });
-  const Organization = mongoose.model("Organization", OrganizationSchema);
+  applyEngagementSchema(OrganizationSchema);
+  const Organization = db.mongoose.model("Organization", OrganizationSchema);
   return Organization;
 };
 var membership_model = (mongoose) => {