@ozdao/martyrs 0.2.519 → 0.2.520

package/dist/martyrs.es.js

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

package/dist/notifications.server.cjs

@@ -18,17 +18,12 @@ const NotificationsController = (db, wss, notificationService) => {
     }
   };
   const createBatch = async (req, res) => {
-    console.log("=== Batch notifications endpoint ===");
-    console.log("Request body:", JSON.stringify(req.body, null, 2));
     try {
       const { notifications } = req.body;
       if (!notifications || !Array.isArray(notifications)) {
-        console.error("Invalid request: notifications array is required");
         return res.status(400).json({ message: "notifications array is required" });
       }
-      console.log("Creating notifications count:", notifications.length);
       const createdNotifications = await db.notification.insertMany(notifications);
-      console.log("Created notifications:", createdNotifications.map((n) => n._id));
       setImmediate(() => {
         Promise.allSettled(createdNotifications.map(
           (notif) => notificationService.processNotification(notif)
@@ -511,9 +506,7 @@ const WebPushService = {
         badge: process.env.NOTIFICATION_BADGE_URL || "/favicon.ico",
         data
       });
-      console.log("payload is", payload);
       const result = await webpush.sendNotification(subscription, payload);
-      console.log("web push is", result);
       return { success: true, statusCode: result.statusCode };
     } catch (error) {
       console.error("Web Push service error:", error);
@@ -553,35 +546,23 @@ const NotificationService = function(db, wss) {
         userId: new ObjectId(userId),
         isActive: true
       });
-      console.log("=== CHANNEL SELECTION DEBUG ===");
-      console.log("userDevices found:", userDevices.length);
-      console.log("userDevices:", userDevices);
-      console.log("user.email:", user.email);
-      console.log("user.phoneNumber:", user.phoneNumber);
-      console.log("preferences.length:", preferences.length);
       let channels = ["web"];
       if (userDevices.length > 0) {
         channels.push("push");
-        console.log("Added push channel - devices found");
       } else {
         console.log("No push channel - no devices found");
       }
       if (user.email) {
         channels.push("email");
-        console.log("Added email channel");
       }
       if (user.phoneNumber) {
         channels.push("sms");
-        console.log("Added SMS channel");
       }
       if (preferences.length > 0) {
         channels = preferences.filter((pref) => pref.isEnabled).map((pref) => pref.channelType);
-        console.log("Overridden with user preferences:", channels);
       }
-      console.log("=== FINAL CHANNELS ===", channels);
       const channelPromises = [];
       for (const channel of channels) {
-        console.log(`=== PREPARING CHANNEL: ${channel} ===`);
         const sendFunc = channelRouters[channel];
         if (!sendFunc) {
           channelPromises.push(Promise.resolve({
@@ -592,14 +573,11 @@ const NotificationService = function(db, wss) {
           continue;
         }
         if (channel === "push") {
-          console.log(`Preparing push to ${userDevices.length} devices`);
           for (const device of userDevices) {
             channelPromises.push(
               sendFunc(notification, user, device).then(() => {
-                console.log(`Push sent successfully to device ${device.deviceId}`);
                 return { channel: "push", deviceId: device.deviceId, success: true };
               }).catch((err) => {
-                console.error(`Push failed for device ${device.deviceId}:`, err);
                 return { channel: "push", deviceId: device.deviceId, success: false, error: err.message };
               })
             );
@@ -616,7 +594,6 @@ const NotificationService = function(db, wss) {
           );
         }
       }
-      console.log(`=== PROCESSING ${channelPromises.length} PARALLEL OPERATIONS ===`);
       const results = await Promise.allSettled(channelPromises);
       const logs = [];
       const channelSuccessMap = /* @__PURE__ */ new Map();
@@ -659,7 +636,6 @@ const NotificationService = function(db, wss) {
     }
   };
   const sendWebNotification = async (notification, user) => {
-    console.log(`[WebSocket][notification] sending to user ${user._id}`);
     const result = await wss.sendToUserInModule("notification", user._id, {
       type: "notification",
       data: notification

package/dist/notifications.server.js

@@ -16,17 +16,12 @@ const NotificationsController = (db, wss, notificationService) => {
     }
   };
   const createBatch = async (req, res) => {
-    console.log("=== Batch notifications endpoint ===");
-    console.log("Request body:", JSON.stringify(req.body, null, 2));
     try {
       const { notifications } = req.body;
       if (!notifications || !Array.isArray(notifications)) {
-        console.error("Invalid request: notifications array is required");
         return res.status(400).json({ message: "notifications array is required" });
       }
-      console.log("Creating notifications count:", notifications.length);
       const createdNotifications = await db.notification.insertMany(notifications);
-      console.log("Created notifications:", createdNotifications.map((n) => n._id));
       setImmediate(() => {
         Promise.allSettled(createdNotifications.map(
           (notif) => notificationService.processNotification(notif)
@@ -509,9 +504,7 @@ const WebPushService = {
         badge: process.env.NOTIFICATION_BADGE_URL || "/favicon.ico",
         data
       });
-      console.log("payload is", payload);
       const result = await webpush.sendNotification(subscription, payload);
-      console.log("web push is", result);
       return { success: true, statusCode: result.statusCode };
     } catch (error) {
       console.error("Web Push service error:", error);
@@ -551,35 +544,23 @@ const NotificationService = function(db, wss) {
         userId: new ObjectId(userId),
         isActive: true
       });
-      console.log("=== CHANNEL SELECTION DEBUG ===");
-      console.log("userDevices found:", userDevices.length);
-      console.log("userDevices:", userDevices);
-      console.log("user.email:", user.email);
-      console.log("user.phoneNumber:", user.phoneNumber);
-      console.log("preferences.length:", preferences.length);
       let channels = ["web"];
       if (userDevices.length > 0) {
         channels.push("push");
-        console.log("Added push channel - devices found");
       } else {
         console.log("No push channel - no devices found");
       }
       if (user.email) {
         channels.push("email");
-        console.log("Added email channel");
       }
       if (user.phoneNumber) {
         channels.push("sms");
-        console.log("Added SMS channel");
       }
       if (preferences.length > 0) {
         channels = preferences.filter((pref) => pref.isEnabled).map((pref) => pref.channelType);
-        console.log("Overridden with user preferences:", channels);
       }
-      console.log("=== FINAL CHANNELS ===", channels);
       const channelPromises = [];
       for (const channel of channels) {
-        console.log(`=== PREPARING CHANNEL: ${channel} ===`);
         const sendFunc = channelRouters[channel];
         if (!sendFunc) {
           channelPromises.push(Promise.resolve({
@@ -590,14 +571,11 @@ const NotificationService = function(db, wss) {
           continue;
         }
         if (channel === "push") {
-          console.log(`Preparing push to ${userDevices.length} devices`);
           for (const device of userDevices) {
             channelPromises.push(
               sendFunc(notification, user, device).then(() => {
-                console.log(`Push sent successfully to device ${device.deviceId}`);
                 return { channel: "push", deviceId: device.deviceId, success: true };
               }).catch((err) => {
-                console.error(`Push failed for device ${device.deviceId}:`, err);
                 return { channel: "push", deviceId: device.deviceId, success: false, error: err.message };
               })
             );
@@ -614,7 +592,6 @@ const NotificationService = function(db, wss) {
           );
         }
       }
-      console.log(`=== PROCESSING ${channelPromises.length} PARALLEL OPERATIONS ===`);
       const results = await Promise.allSettled(channelPromises);
       const logs = [];
       const channelSuccessMap = /* @__PURE__ */ new Map();
@@ -657,7 +634,6 @@ const NotificationService = function(db, wss) {
     }
   };
   const sendWebNotification = async (notification, user) => {
-    console.log(`[WebSocket][notification] sending to user ${user._id}`);
     const result = await wss.sendToUserInModule("notification", user._id, {
       type: "notification",
       data: notification

package/dist/orders.server.cjs

@@ -404,10 +404,7 @@ const controllerFactory = (db) => {
         console.log("Sending notification for status change...");
         try {
           const usersWithAccess = await getUsersWithOrdersConfirmAccess(order.owner.target);
-          const filteredUsers = usersWithAccess.filter(
-            (userId) => userId.toString() !== order.creator.target.toString()
-          );
-          await sendOrderNotifications(order, "order_status", filteredUsers, {
+          await sendOrderNotifications(order, "order_status", usersWithAccess, {
             oldStatus,
             newStatus: order.status,
             organization: order.owner.target

package/dist/orders.server.js

@@ -402,10 +402,7 @@ const controllerFactory = (db) => {
         console.log("Sending notification for status change...");
         try {
           const usersWithAccess = await getUsersWithOrdersConfirmAccess(order.owner.target);
-          const filteredUsers = usersWithAccess.filter(
-            (userId) => userId.toString() !== order.creator.target.toString()
-          );
-          await sendOrderNotifications(order, "order_status", filteredUsers, {
+          await sendOrderNotifications(order, "order_status", usersWithAccess, {
             oldStatus,
             newStatus: order.status,
             organization: order.owner.target

package/dist/organizations.server.cjs

@@ -35,7 +35,7 @@ const googleMapsServicesJs__namespace = /* @__PURE__ */ _interopNamespaceDefault
 const controllerFactory$2 = (db) => {
   const Department = db.department;
   const readOne = (req, res) => {
-    Department.findOne({ _id: req.params._id }).populate("members.user").populate("subdepartments").then((department) => {
+    Department.findOne({ _id: req.params._id }).populate("members.user", "-password").populate("subdepartments").then((department) => {
       if (!department) {
         return res.status(404).send({ message: "Отдел не найден" });
       }
@@ -44,38 +44,43 @@ const controllerFactory$2 = (db) => {
       res.status(500).send({ message: err.message });
     });
   };
-  const read = (req, res) => {
-    let query = {};
-    let options = {};
-    if (req.query.organization) {
-      query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
-    }
-    if (req.query.hidden) {
-      query.hidden = req.query.hidden;
-    }
-    Department.find(query, null, options).populate("members.user").populate("subdepartments").then((departments) => {
-      if (!departments) {
-        return res.status(404).send({ message: "Departments not found" });
+  const read = async (req, res) => {
+    try {
+      const { skip = 0, limit = 10, organization, hidden, _id, search } = req.query;
+      let query = {};
+      if (_id) {
+        query._id = _id;
+      }
+      if (organization) {
+        query.organization = new db.mongoose.Types.ObjectId(organization);
+      }
+      if (hidden !== void 0) {
+        query.hidden = hidden === "true";
       }
+      if (search) {
+        query["profile.name"] = new RegExp(search, "i");
+      }
+      const departments = await Department.find(query).skip(parseInt(skip)).limit(parseInt(limit)).populate("members.user", "-password").populate("subdepartments").sort({ createdAt: -1 });
       res.send(departments);
-    }).catch((err) => {
+    } catch (err) {
       res.status(500).send({ message: err.message });
-    });
+    }
   };
   const create = async (req, res) => {
     try {
       const newDepartment = new Department({
         ...req.body,
-        organization: req.params._id
+        organization: req.body.organization || req.params._id
       });
       const data = await newDepartment.save();
-      res.send(data);
+      const populated = await Department.findById(data._id).populate("members.user", "-password").populate("subdepartments");
+      res.send(populated);
     } catch (err) {
       res.status(500).send({ message: err.message });
     }
   };
   const update = (req, res) => {
-    Department.findOneAndUpdate({ _id: req.body._id }, req.body, { new: true }).then((department) => {
+    Department.findOneAndUpdate({ _id: req.body._id }, req.body, { new: true }).populate("members.user", "-password").populate("subdepartments").then((department) => {
       if (!department) {
         return res.status(404).send({ message: "Department not found" });
       }
@@ -84,15 +89,20 @@ const controllerFactory$2 = (db) => {
       res.status(500).send({ message: err.message });
     });
   };
-  const deleteDepartment = (req, res) => {
-    Department.findOneAndRemove({ _id: req.body._id, organization: req.params._id }).then((department) => {
+  const deleteDepartment = async (req, res) => {
+    try {
+      const { _id } = req.body;
+      if (!_id) {
+        return res.status(400).send({ message: "Department ID is required" });
+      }
+      const department = await Department.findOneAndRemove({ _id });
       if (!department) {
         return res.status(404).send({ message: "Department not found" });
       }
-      res.send({ message: "Department deleted successfully" });
-    }).catch((err) => {
+      res.send(department);
+    } catch (err) {
       res.status(500).send({ message: err.message });
-    });
+    }
   };
   return {
     readOne,
@@ -524,10 +534,10 @@ const OrganizationModel = (db) => {
 const departmentsRoutes = function(app, db) {
   const controller = controllerFactory$2(db);
   app.get("/api/departments/read", controller.read);
+  app.post("/api/departments/create", controller.create);
+  app.put("/api/departments/update", controller.update);
+  app.post("/api/departments/delete", controller.delete);
   app.get("/api/departments/get/:_id", controller.readOne);
-  app.post("/api/departments/:_id/create", controller.create);
-  app.post("/api/departments/:_id/update", controller.update);
-  app.delete("/api/departments/:_id/delete", controller.delete);
 };
 const { sendEmail, sendSms } = mailing.mailing;
 const сontrollerFactory = (db) => {
@@ -547,10 +557,17 @@ const сontrollerFactory = (db) => {
   };
   const read = async (req, res) => {
     try {
-      const invites = await Invite.find({ "owner.target": req.params._id });
-      if (!invites || invites.length === 0) {
-        return res.status(200).send([]);
+      const { skip = 0, limit = 10, owner, target, search } = req.query;
+      const query = {};
+      if (owner) query["owner.user"] = owner;
+      if (target) query["owner.target"] = target;
+      if (search) {
+        query.$or = [
+          { email: new RegExp(search, "i") },
+          { phone: new RegExp(search, "i") }
+        ];
       }
+      const invites = await Invite.find(query).skip(parseInt(skip)).limit(parseInt(limit)).sort({ createdAt: -1 });
       res.send(invites);
     } catch (err) {
       res.status(500).send({ message: err.message });
@@ -617,13 +634,36 @@ const сontrollerFactory = (db) => {
       res.status(500).json({ message: "Something went wrong" });
     }
   };
+  const update = async (req, res) => {
+    try {
+      const { _id, ...updateData } = req.body;
+      if (!_id) {
+        return res.status(400).send({ message: "Invite ID is required" });
+      }
+      const invite = await Invite.findByIdAndUpdate(
+        _id,
+        updateData,
+        { new: true, runValidators: true }
+      );
+      if (!invite) {
+        return res.status(404).send({ message: "Invite not found" });
+      }
+      res.send(invite);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
   const deleteInvite = async (req, res) => {
     try {
-      const invite = await Invite.findOneAndDelete({ _id: req.params._id });
+      const { _id } = req.body;
+      if (!_id) {
+        return res.status(400).send({ message: "Invite ID is required" });
+      }
+      const invite = await Invite.findOneAndDelete({ _id });
       if (!invite) {
         return res.status(404).send({ message: "Invite not found" });
       }
-      res.send({ message: "Invite deleted successfully" });
+      res.send(invite);
     } catch (err) {
       res.status(500).send({ message: err.message });
     }
@@ -632,16 +672,18 @@ const сontrollerFactory = (db) => {
     getOneByCode,
     read,
     create,
+    update,
     delete: deleteInvite
   };
 };
 const invitesRoutes = function(app, db) {
   const controller = сontrollerFactory(db);
   const { verifyInvites } = index.middlewareIndexFactory(db);
+  app.get("/api/invites/read", controller.read);
   app.get("/api/invites/get/:_id", controller.getOneByCode);
-  app.get("/api/invites/:_id", controller.read);
   app.post("/api/invites/create", [verifyInvites.checkInviteExist, verifyInvites.checkUsersExist], controller.create);
-  app.delete("/api/invites/delete/:_id", controller.delete);
+  app.put("/api/invites/update", controller.update);
+  app.post("/api/invites/delete", controller.delete);
 };
 const ObjectId$1 = { Types: mongoose.Types }.Types.ObjectId;
 const controllerFactory$1 = (db) => {
@@ -687,7 +729,30 @@ const controllerFactory$1 = (db) => {
         {
           $unwind: "$user"
         },
-        // Pagination
+        {
+          $project: {
+            _id: 1,
+            user: {
+              _id: 1,
+              profile: 1,
+              roles: 1,
+              phone: 1,
+              email: 1,
+              username: 1,
+              socials: 1,
+              status: 1,
+              createdAt: 1,
+              updatedAt: 1
+            },
+            type: 1,
+            role: 1,
+            label: 1,
+            target: 1,
+            createdAt: 1,
+            updatedAt: 1
+          }
+        },
+        // Sorting and Pagination
         ...queryProcessor.queryProcessorGlobals.getSortingOptions(req.query.sortParam, req.query.sortOrder),
         ...queryProcessor.queryProcessorGlobals.getPaginationOptions(req.query.skip, req.query.limit)
       ]);
@@ -709,7 +774,8 @@ const controllerFactory$1 = (db) => {
     });
     try {
       const data = await newMembership.save();
-      res.send(data);
+      const populated = await Membership.findById(data._id).populate("user", "-password");
+      res.send(populated);
     } catch (err) {
       console.log(err);
       res.status(500).send({ errorCode: "SERVER_ERROR" });
@@ -717,7 +783,7 @@ const controllerFactory$1 = (db) => {
   };
   const update = async (req, res) => {
     try {
-      const membership = await Membership.findByIdAndUpdate(req.body._id, req.body, { new: true });
+      const membership = await Membership.findByIdAndUpdate(req.body._id, req.body, { new: true }).populate("user", "-password");
       if (!membership) {
         return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
       }
@@ -728,8 +794,17 @@ const controllerFactory$1 = (db) => {
   };
   const deleteMembership = async (req, res) => {
     const { _id, type, target, user, role } = req.body;
+    console.log("Delete membership request:", { _id, type, target, user, role });
     try {
-      const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId$1(_id) }) : await Membership.findOneAndDelete({ type, target, user, role });
+      const query = _id ? { _id: new ObjectId$1(_id) } : {
+        type,
+        target: new ObjectId$1(target),
+        user: new ObjectId$1(user),
+        role
+      };
+      console.log("Delete query:", query);
+      const membership = await Membership.findOneAndDelete(query);
+      console.log("Deleted membership:", membership);
       if (!membership) {
         return res.status(404).send({ errorCode: "MEMBERSHIP_NOT_FOUND" });
       }
@@ -751,10 +826,11 @@ const controllerFactory$1 = (db) => {
 };
 const membershipsRoutes = function(app, db) {
   const controller = controllerFactory$1(db);
-  app.get("/api/memberships", controller.read);
+  app.get("/api/memberships/read", controller.read);
   app.post("/api/memberships/create", controller.create);
-  app.post("/api/memberships/update", controller.update);
+  app.put("/api/memberships/update", controller.update);
   app.post("/api/memberships/delete", controller.deleteMembership);
+  app.get("/api/memberships", controller.read);
 };
 const lookupConfigs = {
   products: {