shuttlepro-shared 1.4.67 → 1.4.69

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 extraCapabilities scope",
+          "id name userId userShift permissionId modulePermissions workspaceId",
         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 extraCapabilities scope",
+          "id name userId userShift permissionId modulePermissions workspaceId",
         populate: [{ path: "permissionId", select: "id name" }],
       })
       .populate({
@@ -165,8 +165,6 @@ 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;
     }
@@ -199,7 +197,7 @@ const findUserWorkspaces = async (userId) => {
     .select("userId roleId workspaceId")
     .populate({
       path: "roleId",
-      select: "id name userId userShift permissionId modulePermissions extraCapabilities scope",
+      select: "id name userId userShift permissionId modulePermissions",
       populate: [{ path: "permissionId", select: "id name" }],
     })
     .populate({
@@ -219,8 +217,6 @@ 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/Chatbot.js

@@ -20,7 +20,7 @@ const ChatbotSchema = new Schema(
     },
     type: {
       type: String,
-      enum: ["chatbot", "agent", "interactive"],
+      enum: ["chatbot", "agent", "interactive", "feedback-bot"],
       default: "chatbot",
     },
     interactiveId: {
@@ -62,6 +62,18 @@ const ChatbotSchema = new Schema(
         ],
       },
     ],
+    feedbackConfig: {
+      templateId: {
+        type: Schema.Types.Mixed,
+        default: null,
+      },
+      questions: [
+        {
+          question: { type: String, default: "" },
+          options: [{ type: String, default: "" }],
+        },
+      ],
+    },
   },
   { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
 );

package/models/FeedbackBot.js

@@ -0,0 +1,92 @@
+const { Schema } = require("mongoose");
+
+const FeedbackBotSchema = new Schema(
+  {
+    workspaceId: {
+      type: Schema.Types.ObjectId,
+      ref: "Workspace",
+      required: true,
+    },
+    chatbotId: {
+      type: Schema.Types.ObjectId,
+      ref: "Chatbot",
+      required: true,
+    },
+    conversationId: {
+      type: Schema.Types.ObjectId,
+      ref: "Conversation",
+      required: true,
+    },
+    phoneNumber: {
+      type: String,
+      required: true,
+    },
+    status: {
+      type: String,
+      enum: ["active", "completed", "abandoned"],
+      default: "active",
+    },
+    answers: [
+      {
+        question: {
+          type: String,
+          required: true,
+        },
+        answer: {
+          type: String,
+          required: true,
+        },
+        optionIndex: {
+          type: Number,
+          default: 0,
+        },
+        options: {
+          type: [String],
+          default: [],
+        },
+        answeredAt: {
+          type: Date,
+          default: Date.now,
+        },
+      },
+    ],
+    totalQuestions: {
+      type: Number,
+      default: 0,
+    },
+    completedQuestions: {
+      type: Number,
+      default: 0,
+    },
+    startedAt: {
+      type: Date,
+      default: Date.now,
+    },
+    completedAt: {
+      type: Date,
+      default: null,
+    },
+    // Store reference to order/workflow if applicable
+    orderId: {
+      type: String,
+      default: null,
+    },
+    workflowId: {
+      type: Schema.Types.ObjectId,
+      ref: "SocialWorkflow",
+      default: null,
+    },
+  },
+  { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
+);
+
+// Index for faster queries
+FeedbackBotSchema.index({ workspaceId: 1, phoneNumber: 1, createdAt: -1 });
+FeedbackBotSchema.index({ conversationId: 1 });
+FeedbackBotSchema.index({ chatbotId: 1 });
+FeedbackBotSchema.index({ status: 1 });
+// Index for order_id based queries (allows multiple feedback per conversation)
+FeedbackBotSchema.index({ workspaceId: 1, phoneNumber: 1, orderId: 1 });
+
+module.exports = FeedbackBotSchema;
+

package/models/UserRole.js

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

package/models.js

@@ -39,6 +39,7 @@ const EmailNotification = require("./models/EmailNotification");
 const EscalationConfiguration = require("./models/EscalationConfiguration");
 const EscalationManager = require("./models/EscalationManager");
 const Faq = require("./models/Faq");
+const FeedbackBot = require("./models/FeedbackBot");
 const FeedbackResponse = require("./models/FeedbackResponse");
 const FormTemplate = require("./models/FormTemplate");
 const GoogleClientInfo = require("./models/GoogleClientInfo");
@@ -151,6 +152,7 @@ module.exports = {
   EscalationConfiguration,
   EscalationManager,
   Faq,
+  FeedbackBot,
   FeedbackResponse,
   FormTemplate,
   GoogleClientInfo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.4.67",
+  "version": "1.4.69",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -26,4 +26,4 @@
     "redis": "^4.6.14",
     "socket.io": "^4.8.1"
   }
-}
+}