shuttlepro-shared 1.3.23 → 1.3.24

package/common/repositories/userRole.repository.js

@@ -2,7 +2,7 @@ const { UserRole } = require("../../models/UserRole");
 const { getRedisData, setRedisData } = require("../../config/redis");
 
 const defaultSelect =
-  "iconUrl thumbUrl name productsCount ordersCount contact email address websiteUrl facebookUrl twitterUrl instagramUrl members defaultModule allowedModules";
+  "iconUrl thumbUrl name productsCount ordersCount contact email address websiteUrl facebookUrl twitterUrl instagramUrl members defaultModule";
 
 // Cache keys
 const MEMBERS = "members";
@@ -35,7 +35,6 @@ const updateCachedMembers = async (workspaceId) => {
 
 const getMembers = async (workspaceId) => {
   let members = await getRedisData(workspaceId, MEMBERS);
-  console.log(members, "inside members");
   if (!members || members?.length === 0) {
     members = await UserRole.find({ workspaceId })
       .select("userId role userShift roleId isOwner workspaceId")
@@ -54,7 +53,6 @@ const getMembers = async (workspaceId) => {
       .exec();
     await setRedisData(workspaceId, members, MEMBERS, 3600);
   }
-  console.log(members, "inside after members");
   return members;
 };
 
@@ -63,8 +61,7 @@ const getMemberByWorkspaceIdAndUserId = async (workspaceId, userId) => {
   return (
     members?.find(
       (member) =>
-        member?.workspaceId?.toString() === workspaceId?.toString() &&
-        member?.userId?._id?.toString() === userId?.toString()
+        member?.workspaceId === workspaceId && member?.userId?._id === userId
     ) || null
   );
 };

package/middlewares/checkPermission/index.js

@@ -31,42 +31,29 @@ exports.checkPermission = async (req, res, next, values) => {
       const accessToken = token.split(" ")[1];
       const body = getBodyFromDecodeToken(accessToken);
       if (body) {
-        req.user = {
-          id: body.id,
-          type: body.type,
-          email: body.email,
-          firstName: body.firstName,
-          lastName: body.lastName,
-          suspended: body.suspended,
-          isVerified: body.isVerified,
-          role: body.role,
-          isMember: body.isMember,
-          uuid: body.uuid,
-        };
-        return next();
-        // const { module, action } = values;
-        // const moduleObj = getModule(body, module);
-        // if (moduleObj && moduleObj.includes(action)) {
-        //   req.user = {
-        //     id: body.id,
-        //     type: body.type,
-        //     email: body.email,
-        //     firstName: body.firstName,
-        //     lastName: body.lastName,
-        //     suspended: body.suspended,
-        //     isVerified: body.isVerified,
-        //     role: body.role,
-        //     isMember: body.isMember,
-        //     uuid: body.uuid,
-        //   };
-        //   req.currentModulePermission = moduleObj;
-        //   return next();
-        // } else {
-        //   return res.status(HttpStatusCode.UNAUTHORIZED).json({
-        //     code: HttpStatusCode.UNAUTHORIZED,
-        //     message: GenericMessages.PERMISSION_DENIED,
-        //   });
-        // }
+        const { module, action } = values;
+        const moduleObj = getModule(body, module);
+        if (moduleObj && moduleObj.includes(action)) {
+          req.user = {
+            id: body.id,
+            type: body.type,
+            email: body.email,
+            firstName: body.firstName,
+            lastName: body.lastName,
+            suspended: body.suspended,
+            isVerified: body.isVerified,
+            role: body.role,
+            isMember: body.isMember,
+            uuid: body.uuid,
+          };
+          req.currentModulePermission = moduleObj;
+          return next();
+        } else {
+          return res.status(HttpStatusCode.UNAUTHORIZED).json({
+            code: HttpStatusCode.UNAUTHORIZED,
+            message: GenericMessages.PERMISSION_DENIED,
+          });
+        }
       }
       return res.status(HttpStatusCode.UNAUTHORIZED).json({
         code: HttpStatusCode.UNAUTHORIZED,

package/models/CustomerProfile.js

@@ -8,6 +8,7 @@ const CustomerProfileSchema = new Schema(
     picture: { type: String, default: "" },
     fbId: { type: String, default: "" },
     igId: { type: String, default: "" },
+    profiles: [],
     totalOrders: { type: Number, default: 0 },
     totalConversations: { type: Number, default: 0 },
     totalTickets: { type: Number, default: 0 },

package/models/Workspace.js

@@ -191,6 +191,18 @@ const workspaceSchema = new mongoose.Schema(
     facebookUrl: String,
     twitterUrl: String,
     instagramUrl: String,
+    highRiskOrderAmount: {
+      type: Number,
+      default: 100000,
+    },
+    highRiskOrderQuantity: {
+      type: Number,
+      default: 15,
+    },
+    highRiskAcceptanceRatio: {
+      type: Number,
+      default: 75,
+    },
     isDeleted: { type: Boolean, default: false },
     businessHours: {
       startTime: { type: String, default: "" },
@@ -280,7 +292,6 @@ const workspaceSchema = new mongoose.Schema(
       default: "everyone",
     },
     defaultShift: { type: String, default: "" },
-    allowedModules: [],
   },
   { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
 );

package/package.json

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