@ozdao/martyrs 0.2.429 → 0.2.430

package/dist/orders.server.js

@@ -3,11 +3,12 @@ const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const ownership_schema = require("./ownership.schema-Ck2H9clB.js");
 const profile_schema = require("./profile.schema-h61hhB2w.js");
 const credentials_schema = require("./credentials.schema-BmOPv6FD.js");
-const queryProcessor = require("./queryProcessor-CwQakZkT.js");
+const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
 const mailing = require("./mailing-DqDlUHrs.js");
 const index = require("./index-DQqZReAr.js");
 const require$$0 = require("axios");
-const globals_logger = require("./globals.logger-BuG0pN80.js");
+const globals_cache = require("./globals.cache-CwWvNGFQ.js");
+const globals_logger = require("./globals.logger-BdjooLaD.js");
 var order_model;
 var hasRequiredOrder_model;
 function requireOrder_model() {
@@ -381,7 +382,7 @@ ${formatPositions(order.positions)}
           }
         }
         await session.commitTransaction();
-        await sendOrderMessage(orderData);
+        sendOrderMessage(orderData);
         res.status(201).send(createdOrder);
       } catch (err) {
         await session.abortTransaction();
@@ -764,7 +765,7 @@ function requireGlobals_crud() {
   if (hasRequiredGlobals_crud) return globals_crud;
   hasRequiredGlobals_crud = 1;
   const globalsQuery = queryProcessor.requireQueryProcessor();
-  const Cache = globals_logger.requireGlobals_cache();
+  const Cache = globals_cache.requireGlobals_cache();
   const Logger = globals_logger.requireGlobals_logger();
   class CRUD {
     constructor(basePath, app, db2, model) {

package/dist/orders.server.mjs

@@ -2,11 +2,12 @@ import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import { r as requireOwnership_schema } from "./ownership.schema-C0w02Vw1.mjs";
 import { r as requireProfile_schema } from "./profile.schema-kP_zKXNt.mjs";
 import { r as requireCredentials_schema } from "./credentials.schema-oOC8B5KL.mjs";
-import { r as requireQueryProcessor } from "./queryProcessor-CCmHM0yi.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
 import { r as requireMailing } from "./mailing-D0Vezzzb.mjs";
 import { r as requireMiddlewares } from "./index-DICZTQ-1.mjs";
 import require$$0 from "axios";
-import { r as requireGlobals_cache, a as requireGlobals_logger } from "./globals.logger-Deb_8o7C.mjs";
+import { r as requireGlobals_cache } from "./globals.cache-BT6q3vOf.mjs";
+import { r as requireGlobals_logger } from "./globals.logger-DusiFsxN.mjs";
 var order_model;
 var hasRequiredOrder_model;
 function requireOrder_model() {
@@ -380,7 +381,7 @@ ${formatPositions(order.positions)}
           }
         }
         await session.commitTransaction();
-        await sendOrderMessage(orderData);
+        sendOrderMessage(orderData);
         res.status(201).send(createdOrder);
       } catch (err) {
         await session.abortTransaction();

package/dist/organizations.server.js

@@ -1,7 +1,8 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const require$$0$1 = require("jsonwebtoken");
-const queryProcessor = require("./queryProcessor-CwQakZkT.js");
+const globals_cache = require("./globals.cache-CwWvNGFQ.js");
+const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
 const require$$0 = require("mongoose");
 const require$$1 = require("@googlemaps/google-maps-services-js");
 const addMembersQuantity = require("./addMembersQuantity-DxWjHK1K.js");
@@ -367,6 +368,7 @@ function requireOrganizations_controller() {
   if (hasRequiredOrganizations_controller) return organizations_controller;
   hasRequiredOrganizations_controller = 1;
   const jwt = require$$0$1;
+  const Cache = globals_cache.requireGlobals_cache();
   const queryProcessorGlobals = queryProcessor.requireQueryProcessor();
   const {
     getRequestedLookups,
@@ -385,9 +387,15 @@ function requireOrganizations_controller() {
     const Organization = db.organization;
     const Department = db.department;
     const Membership = db.membership;
+    const cache = new Cache({ ttlSeconds: 60 * 5 });
     const read = async (req, res) => {
-      console.log("controler query", req.query);
+      console.log("controller query", req.query);
       try {
+        const cacheKey = JSON.stringify(req.query);
+        let cachedResult = await cache.get(cacheKey);
+        if (cachedResult) {
+          return res.status(200).send(cachedResult);
+        }
         const requestedLookups = getRequestedLookups(req.query);
         const matchConditions = getBasicMatchConditions(req.query);
         const stages = [
@@ -410,38 +418,16 @@ function requireOrganizations_controller() {
         ].filter(Boolean);
         console.log(JSON.stringify(stages, null, 2));
         const organizations = await Organization.aggregate(stages);
+        for (const org of organizations) {
+          const orgTag = `organization_${org._id}`;
+          await cache.setWithTags(cacheKey, organizations, [orgTag, "organizations"]);
+        }
         res.status(200).send(organizations);
       } catch (err) {
         console.error(err);
         res.status(500).send({ message: err.message });
       }
     };
-    const fetch = async (req, res) => {
-      const Organization2 = db.organization;
-      let query = {};
-      console.log(req.query);
-      if (req.query._id) {
-        query["_id"] = req.query._id;
-      }
-      if (req.query.owner) {
-        query["owner"] = req.query.owner;
-      }
-      if (req.query.type) {
-        query.types = req.query.type;
-      }
-      let options = {};
-      options.skip = parseInt(req.query.skip) || 0;
-      options.limit = parseInt(req.query.limit) || 10;
-      try {
-        const organizations = await Organization2.find(query, null, options);
-        if (!organizations || organizations.length === 0) {
-          return res.status(404).send({ message: "Organizations not found." });
-        }
-        res.status(200).send(organizations);
-      } catch (err) {
-        return res.status(500).send({ message: err });
-      }
-    };
     const create = async (req, res) => {
       if (req.body._id === null) {
         delete req.body._id;
@@ -457,6 +443,10 @@ function requireOrganizations_controller() {
           label: "owner"
         });
         const savedMembership = await membership.save();
+        const orgTag = `organization_${savedOrganization._id}`;
+        await cache.delByTag(orgTag);
+        const newCacheKey = JSON.stringify({ _id: savedOrganization._id });
+        await cache.setWithTags(newCacheKey, [savedOrganization], [orgTag, "organizations"]);
         res.status(201).json(savedOrganization);
       } catch (error) {
         console.error("Error:", error);
@@ -474,6 +464,10 @@ function requireOrganizations_controller() {
         if (!organization) {
           return res.status(404).json({ message: "Organization not found" });
         }
+        const orgTag = `organization_${organizationId}`;
+        await cache.delByTag(orgTag);
+        const updateCacheKey = JSON.stringify({ _id: organizationId });
+        await cache.setWithTags(updateCacheKey, [organization], [orgTag, "organizations"]);
         res.status(200).json({ message: "Organization updated successfully", organization });
       } catch (error) {
         res.status(500).json({ error: error.message });
@@ -492,6 +486,8 @@ function requireOrganizations_controller() {
             expiresIn: 86400
             // 24 hours
           });
+          const orgTag = `organization_${req.params._id}`;
+          cache.delByTag(orgTag);
           res.send({ newToken });
         }).catch((err) => {
           res.status(500).send({ message: "Error deleting memberships: " + err.message });
@@ -503,6 +499,11 @@ function requireOrganizations_controller() {
     const checkAccesses = async (req, res) => {
       try {
         const uid = new db.mongoose.Types.ObjectId(req.userId);
+        const cacheKey = `accesses_${uid.toString()}`;
+        const cachedResult = await cache.get(cacheKey);
+        if (cachedResult) {
+          return res.status(200).json(cachedResult);
+        }
         const depts = await Department.find({ "members.user": uid });
         const ownedOrgs = await Organization.find({ owner: uid });
         const ownedOrgIds = ownedOrgs.map((org) => org._id.toString());
@@ -519,8 +520,8 @@ function requireOrganizations_controller() {
               rights[key] = {};
             }
             const accessRights = accessData[key];
-            Object.keys(accessRights).forEach((right) => {
-              rights[key][right] = isOwner || rights[key][right] || accessRights[right];
+            Object.entries(accessRights).forEach(([right, value]) => {
+              rights[key][right] = isOwner || rights[key][right] || value;
             });
           });
         };
@@ -550,6 +551,8 @@ function requireOrganizations_controller() {
           processAccesses(orgId, true, {});
         });
         const accessArray = Object.values(accesses);
+        const userTag = `access_${uid.toString()}`;
+        await cache.setWithTags(cacheKey, accessArray, [userTag, "accesses"]);
         res.status(200).json(accessArray);
       } catch (err) {
         console.error("Error getting accesses:", err);

package/dist/organizations.server.mjs

@@ -1,6 +1,7 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import require$$0$1 from "jsonwebtoken";
-import { r as requireQueryProcessor } from "./queryProcessor-CCmHM0yi.mjs";
+import { r as requireGlobals_cache } from "./globals.cache-BT6q3vOf.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
 import require$$0 from "mongoose";
 import require$$1 from "@googlemaps/google-maps-services-js";
 import { r as requireAddUserStatusFields, a as requireAddMembersQuantity } from "./addMembersQuantity-DBfuUEx_.mjs";
@@ -366,6 +367,7 @@ function requireOrganizations_controller() {
   if (hasRequiredOrganizations_controller) return organizations_controller;
   hasRequiredOrganizations_controller = 1;
   const jwt = require$$0$1;
+  const Cache = requireGlobals_cache();
   const queryProcessorGlobals = requireQueryProcessor();
   const {
     getRequestedLookups,
@@ -384,9 +386,15 @@ function requireOrganizations_controller() {
     const Organization = db.organization;
     const Department = db.department;
     const Membership = db.membership;
+    const cache = new Cache({ ttlSeconds: 60 * 5 });
     const read = async (req, res) => {
-      console.log("controler query", req.query);
+      console.log("controller query", req.query);
       try {
+        const cacheKey = JSON.stringify(req.query);
+        let cachedResult = await cache.get(cacheKey);
+        if (cachedResult) {
+          return res.status(200).send(cachedResult);
+        }
         const requestedLookups = getRequestedLookups(req.query);
         const matchConditions = getBasicMatchConditions(req.query);
         const stages = [
@@ -409,38 +417,16 @@ function requireOrganizations_controller() {
         ].filter(Boolean);
         console.log(JSON.stringify(stages, null, 2));
         const organizations = await Organization.aggregate(stages);
+        for (const org of organizations) {
+          const orgTag = `organization_${org._id}`;
+          await cache.setWithTags(cacheKey, organizations, [orgTag, "organizations"]);
+        }
         res.status(200).send(organizations);
       } catch (err) {
         console.error(err);
         res.status(500).send({ message: err.message });
       }
     };
-    const fetch = async (req, res) => {
-      const Organization2 = db.organization;
-      let query = {};
-      console.log(req.query);
-      if (req.query._id) {
-        query["_id"] = req.query._id;
-      }
-      if (req.query.owner) {
-        query["owner"] = req.query.owner;
-      }
-      if (req.query.type) {
-        query.types = req.query.type;
-      }
-      let options = {};
-      options.skip = parseInt(req.query.skip) || 0;
-      options.limit = parseInt(req.query.limit) || 10;
-      try {
-        const organizations = await Organization2.find(query, null, options);
-        if (!organizations || organizations.length === 0) {
-          return res.status(404).send({ message: "Organizations not found." });
-        }
-        res.status(200).send(organizations);
-      } catch (err) {
-        return res.status(500).send({ message: err });
-      }
-    };
     const create = async (req, res) => {
       if (req.body._id === null) {
         delete req.body._id;
@@ -456,6 +442,10 @@ function requireOrganizations_controller() {
           label: "owner"
         });
         const savedMembership = await membership.save();
+        const orgTag = `organization_${savedOrganization._id}`;
+        await cache.delByTag(orgTag);
+        const newCacheKey = JSON.stringify({ _id: savedOrganization._id });
+        await cache.setWithTags(newCacheKey, [savedOrganization], [orgTag, "organizations"]);
         res.status(201).json(savedOrganization);
       } catch (error) {
         console.error("Error:", error);
@@ -473,6 +463,10 @@ function requireOrganizations_controller() {
         if (!organization) {
           return res.status(404).json({ message: "Organization not found" });
         }
+        const orgTag = `organization_${organizationId}`;
+        await cache.delByTag(orgTag);
+        const updateCacheKey = JSON.stringify({ _id: organizationId });
+        await cache.setWithTags(updateCacheKey, [organization], [orgTag, "organizations"]);
         res.status(200).json({ message: "Organization updated successfully", organization });
       } catch (error) {
         res.status(500).json({ error: error.message });
@@ -491,6 +485,8 @@ function requireOrganizations_controller() {
             expiresIn: 86400
             // 24 hours
           });
+          const orgTag = `organization_${req.params._id}`;
+          cache.delByTag(orgTag);
           res.send({ newToken });
         }).catch((err) => {
           res.status(500).send({ message: "Error deleting memberships: " + err.message });
@@ -502,6 +498,11 @@ function requireOrganizations_controller() {
     const checkAccesses = async (req, res) => {
       try {
         const uid = new db.mongoose.Types.ObjectId(req.userId);
+        const cacheKey = `accesses_${uid.toString()}`;
+        const cachedResult = await cache.get(cacheKey);
+        if (cachedResult) {
+          return res.status(200).json(cachedResult);
+        }
         const depts = await Department.find({ "members.user": uid });
         const ownedOrgs = await Organization.find({ owner: uid });
         const ownedOrgIds = ownedOrgs.map((org) => org._id.toString());
@@ -518,8 +519,8 @@ function requireOrganizations_controller() {
               rights[key] = {};
             }
             const accessRights = accessData[key];
-            Object.keys(accessRights).forEach((right) => {
-              rights[key][right] = isOwner || rights[key][right] || accessRights[right];
+            Object.entries(accessRights).forEach(([right, value]) => {
+              rights[key][right] = isOwner || rights[key][right] || value;
             });
           });
         };
@@ -549,6 +550,8 @@ function requireOrganizations_controller() {
           processAccesses(orgId, true, {});
         });
         const accessArray = Object.values(accesses);
+        const userTag = `access_${uid.toString()}`;
+        await cache.setWithTags(cacheKey, accessArray, [userTag, "accesses"]);
         res.status(200).json(accessArray);
       } catch (err) {
         console.error("Error getting accesses:", err);

package/dist/products.server.js

@@ -5,7 +5,7 @@ const require$$0 = require("uuid");
 const require$$0$1 = require("mongoose");
 require("path");
 const require$$3 = require("openai");
-const queryProcessor = require("./queryProcessor-CwQakZkT.js");
+const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
 var product_model;
 var hasRequiredProduct_model;
 function requireProduct_model() {

package/dist/products.server.mjs

@@ -4,7 +4,7 @@ import require$$0 from "uuid";
 import require$$0$1 from "mongoose";
 import "path";
 import require$$3 from "openai";
-import { r as requireQueryProcessor } from "./queryProcessor-CCmHM0yi.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
 var product_model;
 var hasRequiredProduct_model;
 function requireProduct_model() {

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

@@ -7,7 +7,7 @@ function requireQueryProcessor() {
   const ObjectId = require$$0.Types.ObjectId;
   function getBasicOptions(query) {
     console.log(query);
-    const { _id, url, status, notstatus, type, owner, customer, creator } = query;
+    const { _id, url, status, notstatus, type, organization, owner, customer, creator } = query;
     const stages = [];
     const conditions = [];
     if (_id) {
@@ -36,6 +36,9 @@ function requireQueryProcessor() {
     if (owner) {
       conditions.push({ "owner.target": new ObjectId(owner) });
     }
+    if (organization) {
+      conditions.push({ "organization": new ObjectId(organization) });
+    }
     if (customer) {
       conditions.push({ "customer.target": new ObjectId(customer) });
     }

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

@@ -8,7 +8,7 @@ function requireQueryProcessor() {
   const ObjectId = require$$0.Types.ObjectId;
   function getBasicOptions(query) {
     console.log(query);
-    const { _id, url, status, notstatus, type, owner, customer, creator } = query;
+    const { _id, url, status, notstatus, type, organization, owner, customer, creator } = query;
     const stages = [];
     const conditions = [];
     if (_id) {
@@ -37,6 +37,9 @@ function requireQueryProcessor() {
     if (owner) {
       conditions.push({ "owner.target": new ObjectId(owner) });
     }
+    if (organization) {
+      conditions.push({ "organization": new ObjectId(organization) });
+    }
     if (customer) {
       conditions.push({ "customer.target": new ObjectId(customer) });
     }

package/dist/rents.server.js

@@ -1,8 +1,9 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
 const globals_verifier = require("./globals.verifier-ChDpCdy_.js");
-const globals_logger = require("./globals.logger-BuG0pN80.js");
-const queryProcessor = require("./queryProcessor-CwQakZkT.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-DQqZReAr.js");
 const globals_abac = require("./globals.abac-DT0VjfaZ.js");
 var rents_services;
@@ -12,7 +13,7 @@ function requireRents_services() {
   hasRequiredRents_services = 1;
   const Validator = globals_verifier.requireGlobals_validator();
   const Verifier = globals_verifier.requireGlobals_verifier();
-  const Cache = globals_logger.requireGlobals_cache();
+  const Cache = globals_cache.requireGlobals_cache();
   const Logger = globals_logger.requireGlobals_logger();
   const queryProcessorGlobals = queryProcessor.requireQueryProcessor();
   const queryValidatorConfig = {

package/dist/rents.server.mjs

@@ -1,7 +1,8 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
 import { a as requireGlobals_validator, r as requireGlobals_verifier } from "./globals.verifier-C_VZYebB.mjs";
-import { r as requireGlobals_cache, a as requireGlobals_logger } from "./globals.logger-Deb_8o7C.mjs";
-import { r as requireQueryProcessor } from "./queryProcessor-CCmHM0yi.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-DICZTQ-1.mjs";
 import { r as requireGlobals_abac } from "./globals.abac-CvmZM8XG.mjs";
 var rents_services;

package/dist/spots.server.js

@@ -1,6 +1,6 @@
 "use strict";
 const _commonjsHelpers = require("./_commonjsHelpers-DHfMLFPC.js");
-const queryProcessor = require("./queryProcessor-CwQakZkT.js");
+const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
 var spot_model;
 var hasRequiredSpot_model;
 function requireSpot_model() {
@@ -112,11 +112,11 @@ function requireSpots_controller() {
         )
       ];
       try {
-        const spots = await Spots.aggregate(stages);
-        if (!stpos) {
+        const spots = await Spot.aggregate(stages);
+        if (!spots) {
           return res.status(404).send({ errorCode: "SPOTS_NOT_FOUND", message: "Spots not found." });
         }
-        res.status(200).send(spos);
+        res.status(200).send(spots);
       } catch (err) {
         console.log(err);
         res.status(500).send({ errorCode: "GET_SPOTS_FAILED", message: "Error occurred while fetching spots.", error: err });
@@ -132,16 +132,6 @@ function requireSpots_controller() {
         res.status(500).send({ message: err.message });
       });
     };
-    const readOld = (req, res) => {
-      Spot.find({ organization: req.params._id }).then((spots) => {
-        if (!spots) {
-          return res.status(404).send({ message: "Spots not found" });
-        }
-        res.send(spots);
-      }).catch((err) => {
-        res.status(500).send({ message: err.message });
-      });
-    };
     const create = async (req, res) => {
       try {
         const newSpot = new Spot({
@@ -178,7 +168,6 @@ function requireSpots_controller() {
     return {
       read,
       readOne,
-      readOld,
       create,
       update,
       delete: deleteSpot
@@ -196,7 +185,6 @@ function requireSpots_routes() {
   spots_routes = function(app, db) {
     const controller = controllerFactory(db);
     app.get("/api/spots", controller.read);
-    app.get("/api/spots/:_id", controller.readOld);
     app.get("/api/spots/get/:_id", controller.readOne);
     app.post("/api/spots/:_id/create", controller.create);
     app.post("/api/spots/:_id/update", controller.update);

package/dist/spots.server.mjs

@@ -1,5 +1,5 @@
 import { g as getDefaultExportFromCjs } from "./_commonjsHelpers-CUmg6egw.mjs";
-import { r as requireQueryProcessor } from "./queryProcessor-CCmHM0yi.mjs";
+import { r as requireQueryProcessor } from "./queryProcessor-CWnMIe2U.mjs";
 var spot_model;
 var hasRequiredSpot_model;
 function requireSpot_model() {
@@ -111,11 +111,11 @@ function requireSpots_controller() {
         )
       ];
       try {
-        const spots = await Spots.aggregate(stages);
-        if (!stpos) {
+        const spots = await Spot.aggregate(stages);
+        if (!spots) {
           return res.status(404).send({ errorCode: "SPOTS_NOT_FOUND", message: "Spots not found." });
         }
-        res.status(200).send(spos);
+        res.status(200).send(spots);
       } catch (err) {
         console.log(err);
         res.status(500).send({ errorCode: "GET_SPOTS_FAILED", message: "Error occurred while fetching spots.", error: err });
@@ -131,16 +131,6 @@ function requireSpots_controller() {
         res.status(500).send({ message: err.message });
       });
     };
-    const readOld = (req, res) => {
-      Spot.find({ organization: req.params._id }).then((spots) => {
-        if (!spots) {
-          return res.status(404).send({ message: "Spots not found" });
-        }
-        res.send(spots);
-      }).catch((err) => {
-        res.status(500).send({ message: err.message });
-      });
-    };
     const create = async (req, res) => {
       try {
         const newSpot = new Spot({
@@ -177,7 +167,6 @@ function requireSpots_controller() {
     return {
       read,
       readOne,
-      readOld,
       create,
       update,
       delete: deleteSpot
@@ -195,7 +184,6 @@ function requireSpots_routes() {
   spots_routes = function(app, db) {
     const controller = controllerFactory(db);
     app.get("/api/spots", controller.read);
-    app.get("/api/spots/:_id", controller.readOld);
     app.get("/api/spots/get/:_id", controller.readOne);
     app.post("/api/spots/:_id/create", controller.create);
     app.post("/api/spots/:_id/update", controller.update);