@ozdao/martyrs 0.2.489 → 0.2.491

package/dist/orders.server.cjs

@@ -3,9 +3,9 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const globals_logger = require("./globals.logger-CZMgIMlM.cjs");
 const queryProcessor = require("./queryProcessor-B_X680wC.cjs");
 const mailing = require("./mailing-q7sR8gCV.cjs");
+const profile_schema = require("./profile.schema-pidHrksV.cjs");
 const credentials_schema = require("./credentials.schema-DwhGdrwC.cjs");
 const ownership_schema = require("./ownership.schema-D1p5XSpt.cjs");
-const profile_schema = require("./profile.schema-yQuIzngl.cjs");
 const index = require("./index-BFxqqmgh.cjs");
 const axios = require("axios");
 class CRUD {
@@ -93,83 +93,151 @@ class CRUD {
     }
   }
 }
-const { sendChatMessageTelegram: sendChatMessageTelegram$1 } = mailing.mailing;
-function formatPositions(positions) {
-  return positions.map((pos) => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join("\n");
-}
-function formatOrderMessage(order) {
-  return `
-    🆕 New Order Received!
-    👤 Customer: ${order.customer?.name} (${order.customer?.phone?.number ? order.customer?.phone?.number : "No phone"})
-    💬 Messenger: ${order.customer?.messenger ? order.customer?.messenger?.type + " " + order.customer?.messenger?.value : "None"}
-    🏢 Organization: ${order.organization}
-    📦 Positions:
-${formatPositions(order.positions)}
-    📝 Comment: ${order.comment ? order.comment : "No comment"}
-    💳 Payment: ${order.payment?.type}
-    🚚 Delivery: ${order.delivery?.type} to ${order.delivery?.address}
-    📌 Status: ${order.status}
-    🧑 Agent: ${order.referralCode}
-  `;
-}
-async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
-  let searchCriteria = {};
-  if (customerInfo.phone) {
-    searchCriteria.phone = customerInfo.phone;
-  }
-  if (customerInfo.email) {
-    searchCriteria.email = customerInfo.email;
-  }
-  let customer = null;
-  if (Object.keys(searchCriteria).length > 0) {
-    customer = await Customer.findOne({ $or: [searchCriteria] });
-  }
-  if (!customer) {
-    let creatorType = customerInfo.creator?.type || orderCreator.type;
-    let creatorTarget = customerInfo.creator?.target || orderCreator.target;
-    if (!creatorTarget) {
-      creatorType = orderOwner.type;
-      creatorTarget = orderOwner.target;
+const controllerFactory = (db) => {
+  const Order = db.order;
+  const Customer = db.customer;
+  const Department = db.department;
+  const { findOrCreateVisitor } = profile_schema.modelsFactory(db);
+  const getUsersWithOrdersConfirmAccess = async (organizationId) => {
+    console.log("=== Getting users with orders.confirm access ===");
+    console.log("Organization ID:", organizationId);
+    const pipeline = [
+      { $match: {
+        organization: new db.mongoose.Types.ObjectId(organizationId),
+        "accesses.orders.confirm": true
+      } },
+      { $unwind: "$members" },
+      { $group: {
+        _id: "$members.user"
+      } },
+      { $project: { userId: "$_id" } }
+    ];
+    console.log("Pipeline:", JSON.stringify(pipeline, null, 2));
+    const result = await Department.aggregate(pipeline);
+    const userIds = result.map((item) => item.userId);
+    console.log("Found departments with access:", result.length);
+    console.log("User IDs with access:", userIds);
+    console.log("=== End getting users ===");
+    return userIds;
+  };
+  const sendOrderNotifications = async (order, type, userIds, extraData = {}) => {
+    console.log("=== Sending order notifications ===");
+    console.log("Order ID:", order._id);
+    console.log("Type:", type);
+    console.log("User IDs:", userIds);
+    console.log("Extra data:", extraData);
+    if (!userIds || userIds.length === 0) {
+      console.log("No users to notify, skipping...");
+      return;
     }
-    const newCustomerData = {
-      ...customerInfo,
-      // Ensure we're not passing any null _id that might override MongoDB's auto-generation
-      _id: void 0,
-      // Let MongoDB generate this
-      owner: orderOwner,
-      creator: {
-        type: creatorType,
-        target: creatorTarget
+    const notifications = userIds.map((userId) => ({
+      title: getNotificationTitle(type, order, extraData),
+      body: getNotificationBody(type, order, extraData),
+      type,
+      metadata: {
+        type,
+        orderId: order._id,
+        context: "organization",
+        ...extraData
       },
-      identity: {
-        type: customerInfo.identity?.type || creatorType,
-        target: customerInfo.identity?.target || creatorTarget
+      userId
+    }));
+    function getNotificationTitle(type2, order2, extraData2 = {}) {
+      switch (type2) {
+        case "order_created":
+          return "New Order";
+        case "order_status":
+          return "Order Status Updated";
+        default:
+          return "Order Notification";
       }
-    };
+    }
+    function getNotificationBody(type2, order2, extraData2 = {}) {
+      switch (type2) {
+        case "order_created":
+          return `New order #${order2._id} created`;
+        case "order_status":
+          return `Order #${order2._id} changed from ${extraData2.oldStatus} to ${extraData2.newStatus}`;
+        default:
+          return `Order #${order2._id} updated`;
+      }
+    }
+    console.log("Prepared notifications:", JSON.stringify(notifications, null, 2));
+    console.log("API URL:", `${process.env.API_URL || ""}/api/notifications/batch`);
     try {
-      customer = await Customer.create(newCustomerData);
-      if (!customer || !customer._id) {
-        console.error("Customer creation failed to generate _id:", customer);
-        throw new Error("Customer creation did not generate a valid _id");
+      const response = await fetch(`${process.env.API_URL || ""}/api/notifications/batch`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-Service-Key": process.env.SERVICE_KEY
+        },
+        body: JSON.stringify({ notifications })
+      });
+      console.log("Notification response status:", response.status);
+      if (!response.ok) {
+        const errorData = await response.text();
+        console.error("Notification API error:", errorData);
+        throw new Error(`Notification API failed: ${response.status} - ${errorData}`);
+      }
+      const result = await response.json();
+      console.log("Notification API success:", result);
+      console.log("=== End sending notifications ===");
+      return result;
+    } catch (error) {
+      console.error("=== Notification sending failed ===");
+      console.error("Error:", error.message);
+      console.error("Stack:", error.stack);
+      throw error;
+    }
+  };
+  const findOrCreateCustomer = async (customerInfo, orderOwner, orderCreator, req) => {
+    let searchCriteria = {};
+    if (customerInfo.phone) {
+      searchCriteria.phone = customerInfo.phone;
+    }
+    if (customerInfo.email) {
+      searchCriteria.email = customerInfo.email;
+    }
+    let customer = null;
+    if (Object.keys(searchCriteria).length > 0) {
+      customer = await Customer.findOne({ $or: [searchCriteria] });
+    }
+    if (!customer) {
+      const visitor = await findOrCreateVisitor(req);
+      let creatorType = customerInfo.creator?.type || orderCreator.type;
+      let creatorTarget = customerInfo.creator?.target || orderCreator.target;
+      if (!creatorTarget) {
+        creatorType = orderOwner.type;
+        creatorTarget = orderOwner.target;
+      }
+      const newCustomerData = {
+        ...customerInfo,
+        // Ensure we're not passing any null _id that might override MongoDB's auto-generation
+        _id: void 0,
+        // Let MongoDB generate this
+        owner: orderOwner,
+        creator: {
+          type: creatorType,
+          target: creatorTarget
+        },
+        identity: {
+          type: "Visitor",
+          target: visitor._id
+        }
+      };
+      try {
+        customer = await Customer.create(newCustomerData);
+        if (!customer || !customer._id) {
+          console.error("Customer creation failed to generate _id:", customer);
+          throw new Error("Customer creation did not generate a valid _id");
+        }
+      } catch (err) {
+        console.error("Error creating customer:", err);
+        throw err;
       }
-    } catch (err) {
-      console.error("Error creating customer:", err);
-      throw err;
     }
-  }
-  return customer;
-}
-async function sendOrderMessage(orderData) {
-  try {
-    const formattedMessage = formatOrderMessage(orderData);
-    await sendChatMessageTelegram$1(process.env.TELEGRAM_BOT_USERS.split(","), formattedMessage);
-  } catch (err) {
-    console.error(err);
-  }
-}
-const controllerFactory = (db) => {
-  const Order = db.order;
-  const Customer = db.customer;
+    return customer;
+  };
   const create = async (req, res) => {
     const orderData = req.body;
     req.userId || req.body.creator?.target;
@@ -184,7 +252,7 @@ const controllerFactory = (db) => {
     session.startTransaction();
     try {
       if (!orderData.customer.target) {
-        const customer = await findOrCreateCustomer(Customer, orderData.customer, orderData.owner, orderData.creator);
+        const customer = await findOrCreateCustomer(orderData.customer, orderData.owner, orderData.creator, req);
         console.log("customer is", customer);
         if (!customer || !customer._id) {
           throw new Error("Failed to create or find a valid customer");
@@ -204,7 +272,12 @@ const controllerFactory = (db) => {
       const order = await Order.create([orderData], { session });
       const createdOrder = order[0];
       await session.commitTransaction();
-      sendOrderMessage(orderData).catch(console.error);
+      try {
+        const usersWithAccess = await getUsersWithOrdersConfirmAccess(orderData.owner.target);
+        await sendOrderNotifications(createdOrder, "order_created", usersWithAccess);
+      } catch (notificationError) {
+        console.error("Error sending notification:", notificationError);
+      }
       res.status(201).send(createdOrder);
     } catch (err) {
       await session.abortTransaction();
@@ -409,35 +482,15 @@ const controllerFactory = (db) => {
       if (statusChanged) {
         console.log("Sending notification for status change...");
         try {
-          const notificationData = {
-            title: `Order Status Updated`,
-            body: `Order #${order._id} status changed from ${oldStatus} to ${order.status}`,
-            type: "order_status",
-            metadata: {
-              orderId: order._id,
-              oldStatus,
-              newStatus: order.status,
-              positions: order.positions
-            },
-            userId: order.creator.target
-            // Assuming creator.target holds the user ID
-          };
-          console.log("Notification data:", JSON.stringify(notificationData));
-          const notificationResponse = await fetch(`${process.env.API_URL || ""}/api/notifications`, {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              "X-Service-Key": process.env.SERVICE_KEY
-            },
-            body: JSON.stringify(notificationData)
+          const usersWithAccess = await getUsersWithOrdersConfirmAccess(order.owner.target);
+          const filteredUsers = usersWithAccess.filter(
+            (userId) => userId.toString() !== order.creator.target.toString()
+          );
+          await sendOrderNotifications(order, "order_status", filteredUsers, {
+            oldStatus,
+            newStatus: order.status
           });
-          console.log("Notification response status:", notificationResponse.status);
-          if (!notificationResponse.ok) {
-            const errorData = await notificationResponse.json();
-            console.error(`Failed to create notification: ${JSON.stringify(errorData)}`);
-          } else {
-            console.log("Notification sent successfully");
-          }
+          console.log("Notification sent successfully");
         } catch (notificationError) {
           console.error("Error sending notification:", notificationError);
         }

package/dist/orders.server.js

@@ -1,9 +1,9 @@
 import { C as Cache, L as Logger } from "./globals.logger-Bf6rRU7j.js";
 import { q as queryProcessorGlobals } from "./queryProcessor-CVcLPEnv.js";
 import { m as mailing } from "./mailing-C11EYWm-.js";
+import { m as modelsFactory, a as applyProfileSchema } from "./profile.schema-BGAe5VN5.js";
 import { a as applyCredentialsSchema } from "./credentials.schema-C9FB2EyY.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-BqH4v5vH.js";
-import { a as applyProfileSchema } from "./profile.schema-DchVS-Jr.js";
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";
 import axios from "axios";
 class CRUD {
@@ -91,83 +91,151 @@ class CRUD {
     }
   }
 }
-const { sendChatMessageTelegram: sendChatMessageTelegram$1 } = mailing;
-function formatPositions(positions) {
-  return positions.map((pos) => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join("\n");
-}
-function formatOrderMessage(order) {
-  return `
-    🆕 New Order Received!
-    👤 Customer: ${order.customer?.name} (${order.customer?.phone?.number ? order.customer?.phone?.number : "No phone"})
-    💬 Messenger: ${order.customer?.messenger ? order.customer?.messenger?.type + " " + order.customer?.messenger?.value : "None"}
-    🏢 Organization: ${order.organization}
-    📦 Positions:
-${formatPositions(order.positions)}
-    📝 Comment: ${order.comment ? order.comment : "No comment"}
-    💳 Payment: ${order.payment?.type}
-    🚚 Delivery: ${order.delivery?.type} to ${order.delivery?.address}
-    📌 Status: ${order.status}
-    🧑 Agent: ${order.referralCode}
-  `;
-}
-async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCreator) {
-  let searchCriteria = {};
-  if (customerInfo.phone) {
-    searchCriteria.phone = customerInfo.phone;
-  }
-  if (customerInfo.email) {
-    searchCriteria.email = customerInfo.email;
-  }
-  let customer = null;
-  if (Object.keys(searchCriteria).length > 0) {
-    customer = await Customer.findOne({ $or: [searchCriteria] });
-  }
-  if (!customer) {
-    let creatorType = customerInfo.creator?.type || orderCreator.type;
-    let creatorTarget = customerInfo.creator?.target || orderCreator.target;
-    if (!creatorTarget) {
-      creatorType = orderOwner.type;
-      creatorTarget = orderOwner.target;
+const controllerFactory = (db) => {
+  const Order = db.order;
+  const Customer = db.customer;
+  const Department = db.department;
+  const { findOrCreateVisitor } = modelsFactory(db);
+  const getUsersWithOrdersConfirmAccess = async (organizationId) => {
+    console.log("=== Getting users with orders.confirm access ===");
+    console.log("Organization ID:", organizationId);
+    const pipeline = [
+      { $match: {
+        organization: new db.mongoose.Types.ObjectId(organizationId),
+        "accesses.orders.confirm": true
+      } },
+      { $unwind: "$members" },
+      { $group: {
+        _id: "$members.user"
+      } },
+      { $project: { userId: "$_id" } }
+    ];
+    console.log("Pipeline:", JSON.stringify(pipeline, null, 2));
+    const result = await Department.aggregate(pipeline);
+    const userIds = result.map((item) => item.userId);
+    console.log("Found departments with access:", result.length);
+    console.log("User IDs with access:", userIds);
+    console.log("=== End getting users ===");
+    return userIds;
+  };
+  const sendOrderNotifications = async (order, type, userIds, extraData = {}) => {
+    console.log("=== Sending order notifications ===");
+    console.log("Order ID:", order._id);
+    console.log("Type:", type);
+    console.log("User IDs:", userIds);
+    console.log("Extra data:", extraData);
+    if (!userIds || userIds.length === 0) {
+      console.log("No users to notify, skipping...");
+      return;
     }
-    const newCustomerData = {
-      ...customerInfo,
-      // Ensure we're not passing any null _id that might override MongoDB's auto-generation
-      _id: void 0,
-      // Let MongoDB generate this
-      owner: orderOwner,
-      creator: {
-        type: creatorType,
-        target: creatorTarget
+    const notifications = userIds.map((userId) => ({
+      title: getNotificationTitle(type, order, extraData),
+      body: getNotificationBody(type, order, extraData),
+      type,
+      metadata: {
+        type,
+        orderId: order._id,
+        context: "organization",
+        ...extraData
       },
-      identity: {
-        type: customerInfo.identity?.type || creatorType,
-        target: customerInfo.identity?.target || creatorTarget
+      userId
+    }));
+    function getNotificationTitle(type2, order2, extraData2 = {}) {
+      switch (type2) {
+        case "order_created":
+          return "New Order";
+        case "order_status":
+          return "Order Status Updated";
+        default:
+          return "Order Notification";
       }
-    };
+    }
+    function getNotificationBody(type2, order2, extraData2 = {}) {
+      switch (type2) {
+        case "order_created":
+          return `New order #${order2._id} created`;
+        case "order_status":
+          return `Order #${order2._id} changed from ${extraData2.oldStatus} to ${extraData2.newStatus}`;
+        default:
+          return `Order #${order2._id} updated`;
+      }
+    }
+    console.log("Prepared notifications:", JSON.stringify(notifications, null, 2));
+    console.log("API URL:", `${process.env.API_URL || ""}/api/notifications/batch`);
     try {
-      customer = await Customer.create(newCustomerData);
-      if (!customer || !customer._id) {
-        console.error("Customer creation failed to generate _id:", customer);
-        throw new Error("Customer creation did not generate a valid _id");
+      const response = await fetch(`${process.env.API_URL || ""}/api/notifications/batch`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-Service-Key": process.env.SERVICE_KEY
+        },
+        body: JSON.stringify({ notifications })
+      });
+      console.log("Notification response status:", response.status);
+      if (!response.ok) {
+        const errorData = await response.text();
+        console.error("Notification API error:", errorData);
+        throw new Error(`Notification API failed: ${response.status} - ${errorData}`);
+      }
+      const result = await response.json();
+      console.log("Notification API success:", result);
+      console.log("=== End sending notifications ===");
+      return result;
+    } catch (error) {
+      console.error("=== Notification sending failed ===");
+      console.error("Error:", error.message);
+      console.error("Stack:", error.stack);
+      throw error;
+    }
+  };
+  const findOrCreateCustomer = async (customerInfo, orderOwner, orderCreator, req) => {
+    let searchCriteria = {};
+    if (customerInfo.phone) {
+      searchCriteria.phone = customerInfo.phone;
+    }
+    if (customerInfo.email) {
+      searchCriteria.email = customerInfo.email;
+    }
+    let customer = null;
+    if (Object.keys(searchCriteria).length > 0) {
+      customer = await Customer.findOne({ $or: [searchCriteria] });
+    }
+    if (!customer) {
+      const visitor = await findOrCreateVisitor(req);
+      let creatorType = customerInfo.creator?.type || orderCreator.type;
+      let creatorTarget = customerInfo.creator?.target || orderCreator.target;
+      if (!creatorTarget) {
+        creatorType = orderOwner.type;
+        creatorTarget = orderOwner.target;
+      }
+      const newCustomerData = {
+        ...customerInfo,
+        // Ensure we're not passing any null _id that might override MongoDB's auto-generation
+        _id: void 0,
+        // Let MongoDB generate this
+        owner: orderOwner,
+        creator: {
+          type: creatorType,
+          target: creatorTarget
+        },
+        identity: {
+          type: "Visitor",
+          target: visitor._id
+        }
+      };
+      try {
+        customer = await Customer.create(newCustomerData);
+        if (!customer || !customer._id) {
+          console.error("Customer creation failed to generate _id:", customer);
+          throw new Error("Customer creation did not generate a valid _id");
+        }
+      } catch (err) {
+        console.error("Error creating customer:", err);
+        throw err;
       }
-    } catch (err) {
-      console.error("Error creating customer:", err);
-      throw err;
     }
-  }
-  return customer;
-}
-async function sendOrderMessage(orderData) {
-  try {
-    const formattedMessage = formatOrderMessage(orderData);
-    await sendChatMessageTelegram$1(process.env.TELEGRAM_BOT_USERS.split(","), formattedMessage);
-  } catch (err) {
-    console.error(err);
-  }
-}
-const controllerFactory = (db) => {
-  const Order = db.order;
-  const Customer = db.customer;
+    return customer;
+  };
   const create = async (req, res) => {
     const orderData = req.body;
     req.userId || req.body.creator?.target;
@@ -182,7 +250,7 @@ const controllerFactory = (db) => {
     session.startTransaction();
     try {
       if (!orderData.customer.target) {
-        const customer = await findOrCreateCustomer(Customer, orderData.customer, orderData.owner, orderData.creator);
+        const customer = await findOrCreateCustomer(orderData.customer, orderData.owner, orderData.creator, req);
         console.log("customer is", customer);
         if (!customer || !customer._id) {
           throw new Error("Failed to create or find a valid customer");
@@ -202,7 +270,12 @@ const controllerFactory = (db) => {
       const order = await Order.create([orderData], { session });
       const createdOrder = order[0];
       await session.commitTransaction();
-      sendOrderMessage(orderData).catch(console.error);
+      try {
+        const usersWithAccess = await getUsersWithOrdersConfirmAccess(orderData.owner.target);
+        await sendOrderNotifications(createdOrder, "order_created", usersWithAccess);
+      } catch (notificationError) {
+        console.error("Error sending notification:", notificationError);
+      }
       res.status(201).send(createdOrder);
     } catch (err) {
       await session.abortTransaction();
@@ -407,35 +480,15 @@ const controllerFactory = (db) => {
       if (statusChanged) {
         console.log("Sending notification for status change...");
         try {
-          const notificationData = {
-            title: `Order Status Updated`,
-            body: `Order #${order._id} status changed from ${oldStatus} to ${order.status}`,
-            type: "order_status",
-            metadata: {
-              orderId: order._id,
-              oldStatus,
-              newStatus: order.status,
-              positions: order.positions
-            },
-            userId: order.creator.target
-            // Assuming creator.target holds the user ID
-          };
-          console.log("Notification data:", JSON.stringify(notificationData));
-          const notificationResponse = await fetch(`${process.env.API_URL || ""}/api/notifications`, {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              "X-Service-Key": process.env.SERVICE_KEY
-            },
-            body: JSON.stringify(notificationData)
+          const usersWithAccess = await getUsersWithOrdersConfirmAccess(order.owner.target);
+          const filteredUsers = usersWithAccess.filter(
+            (userId) => userId.toString() !== order.creator.target.toString()
+          );
+          await sendOrderNotifications(order, "order_status", filteredUsers, {
+            oldStatus,
+            newStatus: order.status
           });
-          console.log("Notification response status:", notificationResponse.status);
-          if (!notificationResponse.ok) {
-            const errorData = await notificationResponse.json();
-            console.error(`Failed to create notification: ${JSON.stringify(errorData)}`);
-          } else {
-            console.log("Notification sent successfully");
-          }
+          console.log("Notification sent successfully");
         } catch (notificationError) {
           console.error("Error sending notification:", notificationError);
         }

package/dist/products.server.cjs

@@ -583,6 +583,10 @@ const controllerFactory = (db) => {
         ...queryProcessor.queryProcessorGlobals.getSearchOptions(req.query.search, {
           fields: ["name", "description"]
         }),
+        ...queryProcessor.queryProcessorGlobals.getFilterDate(req.query.dateStart, req.query.dateEnd, {
+          start: "startDate",
+          end: "endDate"
+        }),
         ...queryProcessor.queryProcessorGlobals.getPriceConditions(req.query.prices),
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),

package/dist/products.server.js

@@ -581,6 +581,10 @@ const controllerFactory = (db) => {
         ...queryProcessorGlobals.getSearchOptions(req.query.search, {
           fields: ["name", "description"]
         }),
+        ...queryProcessorGlobals.getFilterDate(req.query.dateStart, req.query.dateEnd, {
+          start: "startDate",
+          end: "endDate"
+        }),
         ...queryProcessorGlobals.getPriceConditions(req.query.prices),
         ...queryProcessorProducts.getCategoriesFilterStage(req.query.categories),
         ...queryProcessorProducts.getDeliveryFilterStage(req.query.delivery),