@ozdao/martyrs 0.2.470 → 0.2.472

package/dist/martyrs.es.js

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

package/dist/notifications.server.js

@@ -412,6 +412,38 @@ function requireNotifications_controller() {
         return res.status(500).json({ message: err.message });
       }
     };
+    const markAllAsRead = async (req, res) => {
+      try {
+        const userId = req.params.userId;
+        const result = await db.notification.updateMany(
+          { userId, status: "unread" },
+          { status: "read", updatedAt: Date.now() }
+        );
+        const updatedNotifications = await db.notification.find({
+          userId,
+          status: "read",
+          updatedAt: { $gte: new Date(Date.now() - 1e4) }
+          // Get notifications updated in the last 10 seconds
+        });
+        const logPromises = updatedNotifications.map((notification) => {
+          return db.notificationLog.create({
+            notificationId: notification._id,
+            userId,
+            channelType: "web",
+            // Assuming web as default
+            status: "read",
+            readAt: Date.now()
+          });
+        });
+        await Promise.all(logPromises);
+        return res.json({
+          message: "All notifications marked as read",
+          count: result.modifiedCount
+        });
+      } catch (err) {
+        return res.status(500).json({ message: err.message });
+      }
+    };
     const registerDevice = async (req, res) => {
       try {
         const { userId, deviceId, deviceType, deviceToken } = req.body;
@@ -472,7 +504,8 @@ function requireNotifications_controller() {
       markAsRead,
       registerDevice,
       updatePreferences,
-      getUserPreferences
+      getUserPreferences,
+      markAllAsRead
     };
   };
   notifications_controller = NotificationsController;
@@ -488,6 +521,7 @@ function requireNotifications_routes() {
     app.get("/api/notifications/user/:userId", controller.getUserNotifications);
     app.post("/api/notifications", controller.create);
     app.put("/api/notifications/:id/read", controller.markAsRead);
+    app.put("/api/notifications/user/:userId/read-all", controller.markAllAsRead);
     app.post("/api/notifications/devices/register", controller.registerDevice);
     app.get("/api/notifications/preferences/:userId", controller.getUserPreferences);
     app.put("/api/notifications/preferences", controller.updatePreferences);
@@ -589,7 +623,6 @@ function requireNotifications_server() {
   const NotificationService = requireNotification_service();
   const { getInstance } = globals_abac.requireGlobals_abac();
   function initializeNotifications(app, db, wss, origins, publicPath) {
-    console.log("wss init is", wss);
     db.notification = NotificationModel(db);
     db.userDevice = UserDeviceModel(db);
     db.notificationPreference = NotificationPreferenceModel(db);

package/dist/notifications.server.mjs

@@ -411,6 +411,38 @@ function requireNotifications_controller() {
         return res.status(500).json({ message: err.message });
       }
     };
+    const markAllAsRead = async (req, res) => {
+      try {
+        const userId = req.params.userId;
+        const result = await db.notification.updateMany(
+          { userId, status: "unread" },
+          { status: "read", updatedAt: Date.now() }
+        );
+        const updatedNotifications = await db.notification.find({
+          userId,
+          status: "read",
+          updatedAt: { $gte: new Date(Date.now() - 1e4) }
+          // Get notifications updated in the last 10 seconds
+        });
+        const logPromises = updatedNotifications.map((notification) => {
+          return db.notificationLog.create({
+            notificationId: notification._id,
+            userId,
+            channelType: "web",
+            // Assuming web as default
+            status: "read",
+            readAt: Date.now()
+          });
+        });
+        await Promise.all(logPromises);
+        return res.json({
+          message: "All notifications marked as read",
+          count: result.modifiedCount
+        });
+      } catch (err) {
+        return res.status(500).json({ message: err.message });
+      }
+    };
     const registerDevice = async (req, res) => {
       try {
         const { userId, deviceId, deviceType, deviceToken } = req.body;
@@ -471,7 +503,8 @@ function requireNotifications_controller() {
       markAsRead,
       registerDevice,
       updatePreferences,
-      getUserPreferences
+      getUserPreferences,
+      markAllAsRead
     };
   };
   notifications_controller = NotificationsController;
@@ -487,6 +520,7 @@ function requireNotifications_routes() {
     app.get("/api/notifications/user/:userId", controller.getUserNotifications);
     app.post("/api/notifications", controller.create);
     app.put("/api/notifications/:id/read", controller.markAsRead);
+    app.put("/api/notifications/user/:userId/read-all", controller.markAllAsRead);
     app.post("/api/notifications/devices/register", controller.registerDevice);
     app.get("/api/notifications/preferences/:userId", controller.getUserPreferences);
     app.put("/api/notifications/preferences", controller.updatePreferences);
@@ -588,7 +622,6 @@ function requireNotifications_server() {
   const NotificationService = requireNotification_service();
   const { getInstance } = requireGlobals_abac();
   function initializeNotifications(app, db, wss, origins, publicPath) {
-    console.log("wss init is", wss);
     db.notification = NotificationModel(db);
     db.userDevice = UserDeviceModel(db);
     db.notificationPreference = NotificationPreferenceModel(db);

package/dist/orders.server.js

@@ -5,7 +5,7 @@ const profile_schema = require("./profile.schema-h61hhB2w.js");
 const credentials_schema = require("./credentials.schema-BmOPv6FD.js");
 const queryProcessor = require("./queryProcessor-D6GuKfTV.js");
 const mailing = require("./mailing-D4kWlk3_.js");
-const index = require("./index-DQqZReAr.js");
+const index = require("./index-CVXl1rB5.js");
 const require$$0 = require("axios");
 const globals_cache = require("./globals.cache-CwWvNGFQ.js");
 const globals_logger = require("./globals.logger-BdjooLaD.js");
@@ -784,13 +784,13 @@ function requireGlobals_crud() {
   const Cache = globals_cache.requireGlobals_cache();
   const Logger = globals_logger.requireGlobals_logger();
   class CRUD {
-    constructor(basePath, app, db, model) {
+    constructor(basePath, app, db, model, options) {
       this.model = model;
       this.cache = new Cache();
       this.logger = new Logger(db);
       this.app = app;
       this.basePath = basePath;
-      this.registerRoutes();
+      if (!options || options && !options.disableDefaultRoutes) this.registerRoutes();
     }
     registerRoutes() {
       this.app.post(`${this.basePath}/create`, this.create.bind(this));

package/dist/orders.server.mjs

@@ -4,7 +4,7 @@ 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-CWnMIe2U.mjs";
 import { r as requireMailing } from "./mailing-DvCT5ijo.mjs";
-import { r as requireMiddlewares } from "./index-DICZTQ-1.mjs";
+import { r as requireMiddlewares } from "./index-Df8vtZx7.mjs";
 import require$$0 from "axios";
 import { r as requireGlobals_cache } from "./globals.cache-BT6q3vOf.mjs";
 import { r as requireGlobals_logger } from "./globals.logger-DusiFsxN.mjs";
@@ -783,13 +783,13 @@ function requireGlobals_crud() {
   const Cache = requireGlobals_cache();
   const Logger = requireGlobals_logger();
   class CRUD {
-    constructor(basePath, app, db, model) {
+    constructor(basePath, app, db, model, options) {
       this.model = model;
       this.cache = new Cache();
       this.logger = new Logger(db);
       this.app = app;
       this.basePath = basePath;
-      this.registerRoutes();
+      if (!options || options && !options.disableDefaultRoutes) this.registerRoutes();
     }
     registerRoutes() {
       this.app.post(`${this.basePath}/create`, this.create.bind(this));

package/dist/organizations.server.js

@@ -8,7 +8,7 @@ const require$$1 = require("@googlemaps/google-maps-services-js");
 const addMembersQuantity = require("./addMembersQuantity-DxWjHK1K.js");
 const require$$0$2 = require("uuidv4");
 const mailing = require("./mailing-D4kWlk3_.js");
-const index = require("./index-DQqZReAr.js");
+const index = require("./index-CVXl1rB5.js");
 const globals_abac = require("./globals.abac-DT0VjfaZ.js");
 const engagement_schema = require("./engagement.schema-DAiXsvh1.js");
 const ownership_schema = require("./ownership.schema-Ck2H9clB.js");

package/dist/organizations.server.mjs

@@ -7,7 +7,7 @@ import require$$1 from "@googlemaps/google-maps-services-js";
 import { r as requireAddUserStatusFields, a as requireAddMembersQuantity } from "./addMembersQuantity-DBfuUEx_.mjs";
 import require$$0$2 from "uuidv4";
 import { r as requireMailing } from "./mailing-DvCT5ijo.mjs";
-import { r as requireMiddlewares } from "./index-DICZTQ-1.mjs";
+import { r as requireMiddlewares } from "./index-Df8vtZx7.mjs";
 import { r as requireGlobals_abac } from "./globals.abac-CvmZM8XG.mjs";
 import { r as requireEngagement_schema } from "./engagement.schema-DnDD7Bn3.mjs";
 import { r as requireOwnership_schema } from "./ownership.schema-C0w02Vw1.mjs";

package/dist/products.server.js

@@ -636,48 +636,57 @@ function requireCategories_controller() {
     return {
       async read(req, res) {
         try {
-          let buildTree = function(items) {
-            const itemMap = {};
-            const roots = [];
-            items.forEach((item) => {
-              itemMap[item._id.toString()] = {
-                ...item,
+          let buildAdjacencyTree = function(categories, sortParam2, sortOrder2) {
+            const categoryMap = /* @__PURE__ */ new Map();
+            categories.forEach((category) => {
+              categoryMap.set(category._id.toString(), {
+                ...category,
                 children: []
-              };
+              });
             });
-            items.forEach((item) => {
-              const itemId = item._id.toString();
-              const parentId = item.parent?._id?.toString();
-              if (parentId && itemMap[parentId]) {
-                itemMap[parentId].children.push(itemMap[itemId]);
-              } else {
-                roots.push(itemMap[itemId]);
+            const rootCategories = [];
+            categories.forEach((category) => {
+              const categoryWithChildren = categoryMap.get(category._id.toString());
+              if (category.parent && categoryMap.has(category.parent.toString())) {
+                const parentCategory = categoryMap.get(category.parent.toString());
+                parentCategory.children.push(categoryWithChildren);
+              } else if (!category.parent) {
+                rootCategories.push(categoryWithChildren);
               }
             });
-            const sortByOrder = (a, b) => {
-              const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
-              const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
-              return orderA - orderB;
-            };
-            const sortChildren = (node) => {
-              if (node.children && node.children.length > 0) {
-                node.children.sort(sortByOrder);
-                node.children.forEach(sortChildren);
+            function sortCategories(nodes) {
+              if (!nodes || nodes.length === 0) {
+                return nodes;
               }
-            };
-            roots.sort(sortByOrder);
-            roots.forEach(sortChildren);
-            return roots;
+              nodes.sort((a, b) => {
+                const valueA = a[sortParam2] ?? (sortParam2 === "order" ? Number.MAX_SAFE_INTEGER : "");
+                const valueB = b[sortParam2] ?? (sortParam2 === "order" ? Number.MAX_SAFE_INTEGER : "");
+                if (typeof valueA === "number" && typeof valueB === "number") {
+                  return sortOrder2 === "asc" ? valueA - valueB : valueB - valueA;
+                } else {
+                  const stringA = String(valueA);
+                  const stringB = String(valueB);
+                  return sortOrder2 === "asc" ? stringA.localeCompare(stringB) : stringB.localeCompare(stringA);
+                }
+              });
+              nodes.forEach((node) => {
+                if (node.children && node.children.length > 0) {
+                  sortCategories(node.children);
+                }
+              });
+              return nodes;
+            }
+            return sortCategories(rootCategories);
           };
-          const {
+          let {
             parent,
             url,
             search,
-            sort = "order",
-            order = 1,
+            sortParam = "order",
+            sortOrder = "asc",
             skip = 0,
             limit = 10,
-            excludeChildren = false,
+            excludeChildren = "true",
             rootOnly = false
           } = req.query;
           const matchStage = {
@@ -685,11 +694,18 @@ function requireCategories_controller() {
             ...req.query.url && { url: req.query.url },
             ...search && { name: { $regex: search, $options: "i" } },
             ...parent ? { parent: new db.mongoose.Types.ObjectId(parent) } : {},
-            ...rootOnly === true ? { parent: null } : {}
+            ...rootOnly === "true" && !search ? { parent: null } : {}
           };
+          console.log("matchStage", matchStage);
+          if (search) excludeChildren = "true";
           const pipeline = [
             { $match: matchStage },
-            {
+            { $sort: { [sortParam]: sortOrder === "asc" ? 1 : -1 } },
+            { $skip: Number(skip) },
+            { $limit: Number(limit) }
+          ];
+          if (excludeChildren !== "true") {
+            pipeline.push({
               $graphLookup: {
                 from: "categories",
                 startWith: "$_id",
@@ -698,24 +714,36 @@ function requireCategories_controller() {
                 as: "allDescendants",
                 maxDepth: 10
               }
-            },
-            { $sort: { [sort]: order === "asc" ? 1 : -1 } },
-            { $skip: Number(skip) },
-            { $limit: Number(limit) }
-          ];
-          const flatResults = await Category.aggregate(pipeline);
-          const treeResults = flatResults.map((doc) => {
-            const descendants = doc.allDescendants || [];
-            const allItems = [doc, ...descendants];
-            const tree = buildTree(allItems);
-            return tree.find((node) => node._id.toString() === doc._id.toString());
-          });
-          treeResults.sort((a, b) => {
-            const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
-            const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
-            return orderA - orderB;
+            });
+          }
+          const results = await Category.aggregate(pipeline);
+          if (excludeChildren === "true") {
+            console.log(results);
+            res.status(200).json(results);
+            return;
+          }
+          const allCategories = [];
+          results.forEach((doc) => {
+            const category = { ...doc };
+            delete category.allDescendants;
+            allCategories.push(category);
+            if (doc.allDescendants && doc.allDescendants.length > 0) {
+              allCategories.push(...doc.allDescendants);
+            }
           });
-          res.json(treeResults);
+          const uniqueCategories = Array.from(
+            new Map(allCategories.map((item) => [item._id.toString(), item])).values()
+          );
+          const tree = buildAdjacencyTree(uniqueCategories, sortParam, sortOrder);
+          if (rootOnly === "true") {
+            res.json(tree);
+          } else {
+            const requestedCategoryIds = results.map((r) => r._id.toString());
+            const filteredTree = tree.filter(
+              (category) => requestedCategoryIds.includes(category._id.toString())
+            );
+            res.status(200).json(filteredTree);
+          }
         } catch (err) {
           res.status(500).json({ message: err.message });
         }
@@ -748,7 +776,6 @@ function requireCategories_controller() {
       },
       async update(req, res) {
         try {
-          console.log(req.body);
           const category = req.body;
           if (!category || !category._id) {
             return res.status(400).json({ message: "Category ID is required" });
@@ -768,7 +795,6 @@ function requireCategories_controller() {
         }
       },
       async updateOrder(req, res) {
-        console.log(req.body);
         try {
           const { categories } = req.body;
           const bulkOps = categories.map((category) => ({
@@ -784,7 +810,6 @@ function requireCategories_controller() {
           }));
           await Category.bulkWrite(bulkOps);
           const updatedCategories = await Category.find().sort({ order: "asc" }).lean();
-          console.log(updatedCategories);
           res.status(200).json(updatedCategories);
         } catch (err) {
           console.error("Category update error:", err);

package/dist/products.server.mjs

@@ -635,48 +635,57 @@ function requireCategories_controller() {
     return {
       async read(req, res) {
         try {
-          let buildTree = function(items) {
-            const itemMap = {};
-            const roots = [];
-            items.forEach((item) => {
-              itemMap[item._id.toString()] = {
-                ...item,
+          let buildAdjacencyTree = function(categories, sortParam2, sortOrder2) {
+            const categoryMap = /* @__PURE__ */ new Map();
+            categories.forEach((category) => {
+              categoryMap.set(category._id.toString(), {
+                ...category,
                 children: []
-              };
+              });
             });
-            items.forEach((item) => {
-              const itemId = item._id.toString();
-              const parentId = item.parent?._id?.toString();
-              if (parentId && itemMap[parentId]) {
-                itemMap[parentId].children.push(itemMap[itemId]);
-              } else {
-                roots.push(itemMap[itemId]);
+            const rootCategories = [];
+            categories.forEach((category) => {
+              const categoryWithChildren = categoryMap.get(category._id.toString());
+              if (category.parent && categoryMap.has(category.parent.toString())) {
+                const parentCategory = categoryMap.get(category.parent.toString());
+                parentCategory.children.push(categoryWithChildren);
+              } else if (!category.parent) {
+                rootCategories.push(categoryWithChildren);
               }
             });
-            const sortByOrder = (a, b) => {
-              const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
-              const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
-              return orderA - orderB;
-            };
-            const sortChildren = (node) => {
-              if (node.children && node.children.length > 0) {
-                node.children.sort(sortByOrder);
-                node.children.forEach(sortChildren);
+            function sortCategories(nodes) {
+              if (!nodes || nodes.length === 0) {
+                return nodes;
               }
-            };
-            roots.sort(sortByOrder);
-            roots.forEach(sortChildren);
-            return roots;
+              nodes.sort((a, b) => {
+                const valueA = a[sortParam2] ?? (sortParam2 === "order" ? Number.MAX_SAFE_INTEGER : "");
+                const valueB = b[sortParam2] ?? (sortParam2 === "order" ? Number.MAX_SAFE_INTEGER : "");
+                if (typeof valueA === "number" && typeof valueB === "number") {
+                  return sortOrder2 === "asc" ? valueA - valueB : valueB - valueA;
+                } else {
+                  const stringA = String(valueA);
+                  const stringB = String(valueB);
+                  return sortOrder2 === "asc" ? stringA.localeCompare(stringB) : stringB.localeCompare(stringA);
+                }
+              });
+              nodes.forEach((node) => {
+                if (node.children && node.children.length > 0) {
+                  sortCategories(node.children);
+                }
+              });
+              return nodes;
+            }
+            return sortCategories(rootCategories);
           };
-          const {
+          let {
             parent,
             url,
             search,
-            sort = "order",
-            order = 1,
+            sortParam = "order",
+            sortOrder = "asc",
             skip = 0,
             limit = 10,
-            excludeChildren = false,
+            excludeChildren = "true",
             rootOnly = false
           } = req.query;
           const matchStage = {
@@ -684,11 +693,18 @@ function requireCategories_controller() {
             ...req.query.url && { url: req.query.url },
             ...search && { name: { $regex: search, $options: "i" } },
             ...parent ? { parent: new db.mongoose.Types.ObjectId(parent) } : {},
-            ...rootOnly === true ? { parent: null } : {}
+            ...rootOnly === "true" && !search ? { parent: null } : {}
           };
+          console.log("matchStage", matchStage);
+          if (search) excludeChildren = "true";
           const pipeline = [
             { $match: matchStage },
-            {
+            { $sort: { [sortParam]: sortOrder === "asc" ? 1 : -1 } },
+            { $skip: Number(skip) },
+            { $limit: Number(limit) }
+          ];
+          if (excludeChildren !== "true") {
+            pipeline.push({
               $graphLookup: {
                 from: "categories",
                 startWith: "$_id",
@@ -697,24 +713,36 @@ function requireCategories_controller() {
                 as: "allDescendants",
                 maxDepth: 10
               }
-            },
-            { $sort: { [sort]: order === "asc" ? 1 : -1 } },
-            { $skip: Number(skip) },
-            { $limit: Number(limit) }
-          ];
-          const flatResults = await Category.aggregate(pipeline);
-          const treeResults = flatResults.map((doc) => {
-            const descendants = doc.allDescendants || [];
-            const allItems = [doc, ...descendants];
-            const tree = buildTree(allItems);
-            return tree.find((node) => node._id.toString() === doc._id.toString());
-          });
-          treeResults.sort((a, b) => {
-            const orderA = a.order ?? Number.MAX_SAFE_INTEGER;
-            const orderB = b.order ?? Number.MAX_SAFE_INTEGER;
-            return orderA - orderB;
+            });
+          }
+          const results = await Category.aggregate(pipeline);
+          if (excludeChildren === "true") {
+            console.log(results);
+            res.status(200).json(results);
+            return;
+          }
+          const allCategories = [];
+          results.forEach((doc) => {
+            const category = { ...doc };
+            delete category.allDescendants;
+            allCategories.push(category);
+            if (doc.allDescendants && doc.allDescendants.length > 0) {
+              allCategories.push(...doc.allDescendants);
+            }
           });
-          res.json(treeResults);
+          const uniqueCategories = Array.from(
+            new Map(allCategories.map((item) => [item._id.toString(), item])).values()
+          );
+          const tree = buildAdjacencyTree(uniqueCategories, sortParam, sortOrder);
+          if (rootOnly === "true") {
+            res.json(tree);
+          } else {
+            const requestedCategoryIds = results.map((r) => r._id.toString());
+            const filteredTree = tree.filter(
+              (category) => requestedCategoryIds.includes(category._id.toString())
+            );
+            res.status(200).json(filteredTree);
+          }
         } catch (err) {
           res.status(500).json({ message: err.message });
         }
@@ -747,7 +775,6 @@ function requireCategories_controller() {
       },
       async update(req, res) {
         try {
-          console.log(req.body);
           const category = req.body;
           if (!category || !category._id) {
             return res.status(400).json({ message: "Category ID is required" });
@@ -767,7 +794,6 @@ function requireCategories_controller() {
         }
       },
       async updateOrder(req, res) {
-        console.log(req.body);
         try {
           const { categories } = req.body;
           const bulkOps = categories.map((category) => ({
@@ -783,7 +809,6 @@ function requireCategories_controller() {
           }));
           await Category.bulkWrite(bulkOps);
           const updatedCategories = await Category.find().sort({ order: "asc" }).lean();
-          console.log(updatedCategories);
           res.status(200).json(updatedCategories);
         } catch (err) {
           console.error("Category update error:", err);

package/dist/rents.server.js

@@ -4,7 +4,7 @@ const globals_verifier = require("./globals.verifier-ChDpCdy_.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 index = require("./index-CVXl1rB5.js");
 const globals_abac = require("./globals.abac-DT0VjfaZ.js");
 var rents_services;
 var hasRequiredRents_services;

package/dist/rents.server.mjs

@@ -3,7 +3,7 @@ import { a as requireGlobals_validator, r as requireGlobals_verifier } from "./g
 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 requireMiddlewares } from "./index-Df8vtZx7.mjs";
 import { r as requireGlobals_abac } from "./globals.abac-CvmZM8XG.mjs";
 var rents_services;
 var hasRequiredRents_services;