shuttlepro-shared 1.2.52 → 1.2.54

package/common/repositories/index.js

@@ -10,7 +10,9 @@ const socialMediaSettingRepository = require("./socialMediaSetting.repository");
 const chatMemberRepository = require("./chatMember.repository");
 const roleRepository = require("./role.repository");
 const userPermissionRepository = require("./userPermission.repository");
+const userRolePermissionRepository = require("./userRole");
 const notificationSettingsRepository = require("./notificationSettings.repository");
+
 exports.module = {
   workspaceRepository,
   integrationRepository,
@@ -25,4 +27,5 @@ exports.module = {
   chatMemberRepository,
   roleRepository,
   userPermissionRepository,
+  userRolePermissionRepository,
 };

package/common/repositories/userPermission.repository.js

@@ -202,6 +202,15 @@ const bulkCreateAndUpdateUserPermissions = async (operations) => {
   return operations;
 };
 
+/**
+ * Insert multiple user permissions and update cache.
+ */
+const insertManyUserPermissions = async (permissionsArray) => {
+  const inserted = await UserPermission.insertMany(permissionsArray);
+  await updateCachedAllUserPermissions();
+  return inserted;
+};
+
 module.exports = {
   createUserPermission,
   findUserPermission,
@@ -215,4 +224,5 @@ module.exports = {
   deleteUserPermissionsByFilter,
   deleteAllUserPermissionsByWorkspace,
   bulkCreateAndUpdateUserPermissions,
+  insertManyUserPermissions,
 };

package/common/repositories/userRepository.js

@@ -0,0 +1,31 @@
+const User = require("../../models/User");
+
+const createUser = async (data) => {
+  const newUser = new User(data);
+  const savedUser = await newUser.save();
+  return savedUser;
+};
+
+const findUser = async (filter) => {
+  return await User.findOne(filter).exec();
+};
+
+const updateUser = async (id, data) => {
+  const updatedUser = await User.findByIdAndUpdate(id, data, {
+    new: true,
+  }).exec();
+
+  return updatedUser;
+};
+
+const deleteUser = async (id) => {
+  const deletedUser = await User.findByIdAndDelete(id).exec();
+  return deletedUser;
+};
+
+module.exports = {
+  createUser,
+  findUser,
+  updateUser,
+  deleteUser,
+};

package/common/repositories/userRole.repository.js

@@ -125,6 +125,11 @@ const updateUserRole = async (id, data) => {
   return updatedRole;
 };
 
+const deleteUserRoleByFilter = async (filter) => {
+  const deletedRole = await UserRole.findOneAndDelete(filter).exec();
+  return deletedRole;
+};
+
 const deleteUserRole = async (id) => {
   const role = await UserRole.findById(id).exec();
   const userId = role?.userId;
@@ -340,13 +345,38 @@ const getChannelsPermissions = async (workspaceId, userId) => {
   }
 };
 
+const findOneAndUpdateUserRole = async ({
+  workspaceId,
+  userId,
+  userShift,
+  role,
+}) => {
+  const updatedRole = await UserRole.findOneAndUpdate(
+    { workspaceId, userId },
+    { $set: { userShift, role } },
+    { new: true, upsert: false }
+  ).exec();
+
+  if (updatedRole) {
+    await updateCachedMembers();
+    await clearUserWorkspaceCache(userId);
+    if (workspaceId) {
+      await clearUserPermissionsCache(workspaceId, userId);
+    }
+  }
+
+  return updatedRole;
+};
+
 module.exports = {
   createUserRole,
   findUserRole,
   updateUserRole,
+  deleteUserRoleByFilter,
   deleteUserRole,
   findUserWorkspaces,
   getUserRoleWithPermissions,
   getUserPermissions,
   getChannelsPermissions,
+  findOneAndUpdateUserRole,
 };

package/common/repositories/userRolePermission.repository.js

@@ -0,0 +1,59 @@
+const DefaultRolePermission = require("../../models/DefaultRolePermission");
+
+const createDefaultRolePermission = async (data) => {
+  const newPermission = new DefaultRolePermission(data);
+  const savedPermission = await newPermission.save();
+  return savedPermission;
+};
+
+const findDefaultRolePermission = async (filter) => {
+  return await DefaultRolePermission.findOne(filter).exec();
+};
+
+const findAllDefaultRolePermissions = async (filter = {}) => {
+  return await DefaultRolePermission.find(filter).exec();
+};
+
+const updateDefaultRolePermission = async (id, data) => {
+  const updatedPermission = await DefaultRolePermission.findByIdAndUpdate(
+    id,
+    data,
+    {
+      new: true,
+    }
+  ).exec();
+  return updatedPermission;
+};
+
+const deleteDefaultRolePermission = async (id) => {
+  const deletedPermission = await DefaultRolePermission.findByIdAndDelete(
+    id
+  ).exec();
+  return deletedPermission;
+};
+
+const deleteDefaultRolePermissionsByFilter = async (filter) => {
+  const deleted = await DefaultRolePermission.deleteMany(filter).exec();
+  return deleted;
+};
+
+const deleteOneDefaultRolePermissionByFilter = async (filter) => {
+  const deleted = await DefaultRolePermission.findOneAndDelete(filter).exec();
+  return deleted;
+};
+
+const insertManyUserPermissions = async (permissionsArray) => {
+  const inserted = await UserPermission.insertMany(permissionsArray);
+  return inserted;
+};
+
+module.exports = {
+  createDefaultRolePermission,
+  findDefaultRolePermission,
+  findAllDefaultRolePermissions,
+  updateDefaultRolePermission,
+  deleteDefaultRolePermission,
+  deleteDefaultRolePermissionsByFilter,
+  deleteOneDefaultRolePermissionByFilter,
+  insertManyUserPermissions,
+};

package/models/Customer.js

@@ -7,6 +7,7 @@ const CustomerSchema = new Schema(
     email: { type: String, default: "" },
     phone: { type: String, default: "" },
     city: { type: String, default: "" },
+    country: { type: String, default: "pk" },
     defaultAddress: { type: String, default: "" },
     currentShippingAddress: {},
     addresses: [],

package/models/Integration.js

@@ -20,6 +20,7 @@ const IntegrationSchema = new mongoose.Schema(
         "instagram",
         "webChat",
         "smtp_gmail",
+        "outlook",
       ],
     },
     chatbot: { type: Boolean, default: false },

package/models/Workspace.js

@@ -1,8 +1,5 @@
 const mongoose = require("mongoose");
-const {
-  createDefaultLocations,
-  addTaskManagerDefaultData,
-} = require("../libs/shared/helpers");
+//TODO: task manager and default location creation
 const shiftSchema = new mongoose.Schema(
   {
     shiftName: {
@@ -283,18 +280,7 @@ workspaceSchema.add({
   instagramUrl: commonOptions,
   chatGptApiKey: commonOptions,
 });
-workspaceSchema.post("save", async function (doc) {
-  try {
-    if (doc?.id) {
-      await Promise.all([
-        createDefaultLocations(doc.id, doc.createdBy || null),
-        addTaskManagerDefaultData(doc.id),
-      ]);
-    }
-  } catch (err) {
-    console.log("err", err);
-  }
-});
+
 workspaceSchema.virtual("integrations", {
   ref: "Integration",
   localField: "_id",

package/package.json

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