shuttlepro-shared 1.4.72 → 1.4.74

package/common/repositories/userRole.repository.js

@@ -15,7 +15,7 @@ const updateCachedMembers = async (workspaceId) => {
       .populate({
         path: "roleId",
         select:
-          "id name userId userShift permissionId modulePermissions workspaceId",
+          "id name userId userShift permissionId modulePermissions workspaceId extraCapabilities scope",
         populate: [{ path: "permissionId", select: "id name" }],
       })
       .populate({
@@ -35,14 +35,14 @@ const updateCachedMembers = async (workspaceId) => {
 
 const getMembers = async (workspaceId) => {
   let members = await getRedisData(workspaceId, MEMBERS);
-  
+
   if (!members || members?.length === 0) {
     members = await UserRole.find({ workspaceId })
       .select("userId role userShift roleId isOwner workspaceId")
       .populate({
         path: "roleId",
         select:
-          "id name userId userShift permissionId modulePermissions workspaceId",
+          "id name userId userShift permissionId modulePermissions workspaceId extraCapabilities scope",
         populate: [{ path: "permissionId", select: "id name" }],
       })
       .populate({
@@ -165,6 +165,8 @@ const getUserRoleWithPermissions = async (workspaceId, userId) => {
         parentRole: data?.roleId?.permissionId?.name || "",
         parentRoleId: data?.roleId?.permissionId?._id?.toString() || "",
         defaultModule: data?.roleId?.defaultModule || "",
+        extraCapabilities: data?.roleId?.extraCapabilities || [],
+        scope: data?.roleId?.scope || "workspace",
       };
       return roleWithPermissions || null;
     }
@@ -197,7 +199,7 @@ const findUserWorkspaces = async (userId) => {
     .select("userId roleId workspaceId")
     .populate({
       path: "roleId",
-      select: "id name userId userShift permissionId modulePermissions",
+      select: "id name userId userShift permissionId modulePermissions extraCapabilities scope",
       populate: [{ path: "permissionId", select: "id name" }],
     })
     .populate({
@@ -217,6 +219,8 @@ const findUserWorkspaces = async (userId) => {
         _id: ur?.workspaceId?._id?.toString(),
         role: ur?.roleId?.name || "",
         permissions: ur?.roleId?.modulePermissions?.modules || [],
+        extraCapabilities: ur?.roleId?.extraCapabilities || [],
+        scope: ur?.roleId?.scope || "workspace",
       };
     });
   return userRoleWithWorkspaces || [];

package/models/Automation.js

@@ -238,6 +238,7 @@ const AutomationCondition = new Schema({
         "refusedOrder",
         "sendReceipt",
         "shipperAdvice",
+        "delivered",
         "newCommentPost",
         "profile",
         "moveTicket",

package/models/Message.js

@@ -29,6 +29,7 @@ const newMessageSchema = new mongoose.Schema(
         "instagram",
         "webChat",
         "chat-status",
+        "webchat-status"
       ],
       required: true,
     },

package/models/Shipper.js

@@ -41,7 +41,6 @@ const shipperInformationSchema = new Schema({
 const shipperSchema = new mongoose.Schema(
   {
     type: { type: String, default: "" },
-    name: { type: String, default: "" },
     userName: { type: String, default: "" },
     password: { type: String, default: "" },
     clientId: { type: String, default: "" },
@@ -65,34 +64,4 @@ const shipperSchema = new mongoose.Schema(
   { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
 );
 
-/**
- * Auto-generate shipper name if not provided
- * Format: "{TYPE} {NUMBER}" e.g., "DAEWOO 1", "DAEWOO 2", etc.
- */
-shipperSchema.pre("save", async function (next) {
-  // Only auto-generate if name is empty or not provided
-  if (!this.name || this.name.trim() === "") {
-    if (this.type && this.workspaceId) {
-      try {
-        // Count existing shippers of the same type in the same workspace (including deleted ones for numbering)
-        const ShipperModel = this.constructor;
-        const count = await ShipperModel.countDocuments({
-          type: this.type,
-          workspaceId: this.workspaceId,
-        });
-
-        // Generate name: "TYPE NUMBER" (starting from 1)
-        this.name = `${this.type} ${count + 1}`;
-      } catch (error) {
-        // If counting fails, use a simple fallback
-        this.name = `${this.type} 1`;
-      }
-    } else {
-      // Fallback if type or workspaceId is missing
-      this.name = this.type || "Shipper";
-    }
-  }
-  next();
-});
-
 module.exports = mongoose.model("shipper", shipperSchema);

package/models/UserRole.js

@@ -11,7 +11,8 @@ const userRoleSchema = new Schema(
     workspaceId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: "Workspace",
-      required: true,
+      required: false, // Optional for global roles
+      default: null,
     },
     role: {
       type: String,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.4.72",
+  "version": "1.4.74",
   "description": "",
   "main": "index.js",
   "scripts": {