shuttlepro-shared 1.1.81 → 1.1.82

package/constants/index.js

@@ -23,18 +23,3 @@ exports.GenericMessages = {
   URL_FETCH_SUCCESS: "Url Fetched successfully!",
   WORKSPACE_NOT_FOUND: "Workspace not found!",
 };
-
-exports.DYNAMIC_FIELD_TYPES = [
-  "text",
-  "autocomplete",
-  "radio",
-  "text area",
-  "number",
-  "date",
-  "time",
-  "email",
-  "range",
-  "url",
-  "colour",
-  "file",
-];

package/index.js

@@ -1,15 +1,7 @@
 const sharedModels = require("./models");
 const sharedFunctions = require("./functions");
-const logger = require("./utils/logger");
-const shuttlePro = require("./utils/decorator-factory");
-const configs = require("./config");
-const repositories = require("./common/repositories");
 
 module.exports = {
   sharedModels,
   sharedFunctions,
-  logger,
-  shuttlePro,
-  configs,
-  repositories,
 };

package/models/Role.js

@@ -0,0 +1,29 @@
+const mongoose = require("mongoose");
+const { Schema } = mongoose;
+
+const RoleSchema = new Schema(
+  {
+    name: {
+      type: String,
+      default: "",
+    },
+    workspaceId: {
+      type: Schema.Types.ObjectId,
+      ref: "Workspace",
+      default: null,
+    },
+    description: {
+      type: String,
+      default: "",
+    },
+    status: {
+      type: String,
+      default: "active",
+      enum: ["active", "inactive"],
+    },
+    logs: [],
+  },
+  { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
+);
+
+module.exports = mongoose.model("Role", RoleSchema);

package/models/UserPermission.js

@@ -16,6 +16,11 @@ const UserPermissionsSchema = new Schema(
       type: String,
       default: "",
     },
+    roleId: {
+      type: Schema.Types.ObjectId,
+      ref: "Role",
+      default: null,
+    },
   },
   { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
 );

package/models/UserRole.js

@@ -1,6 +1,7 @@
 const mongoose = require("mongoose");
+const { Schema } = mongoose;
 
-const daySchema = new mongoose.Schema({
+const daySchema = new Schema({
   day: { type: String, required: true },
   startTime: { type: String, required: false },
   endTime: { type: String, required: false },
@@ -9,7 +10,7 @@ const daySchema = new mongoose.Schema({
   lateThreshold: { type: String, required: false },
 });
 
-const userRoleSchema = new mongoose.Schema(
+const userRoleSchema = new Schema(
   {
     userId: {
       type: mongoose.Schema.Types.ObjectId,
@@ -23,7 +24,12 @@ const userRoleSchema = new mongoose.Schema(
     },
     role: {
       type: String,
-      enum: ["admin", "agent", "storeManager", "socialMediaManager"],
+      default: "",
+    },
+    roleId: {
+      type: Schema.Types.ObjectId,
+      ref: "Role",
+      default: null,
     },
     isOwner: { type: Boolean, default: false },
     userShift: {
@@ -45,6 +51,7 @@ const userRoleSchema = new mongoose.Schema(
 );
 
 const UserRole = mongoose.model("UserRole", userRoleSchema);
+
 module.exports = {
   UserRole,
 };

package/models.js

@@ -1,5 +1,4 @@
 const Website = require("./models/Website");
-const DescriptionTemplate = require("./models/DescriptionTemplate");
 const ProductQueue = require("./models/ProductQueue");
 const ColumnPreference = require("./models/ColumnPreference");
 const UserPermission = require("./models/UserPermission");
@@ -13,28 +12,7 @@ const AutoSchedulerSchema = require("./models/AutoScheduler");
 const ActivityLogs = require("./models/ActivityLogs");
 const UserRole = require("./models/UserRole");
 const OrderQueue = require("./models/OrderQueue");
-const AgentActivity = require("./models/AgentActivity");
-const Assignment = require("./models/Assignment");
-const BusinessDistribution = require("./models/BusinessDistribution");
-const CardComments = require("./models/CardComments");
-const Checkpoint = require("./models/Checkpoint");
-const City = require("./models/City");
-const Column = require("./models/Column");
-const Conversation = require("./models/Conversation");
-const Customer = require("./models/Customer");
-const Integration = require("./models/Integration");
-const Label = require("./models/Label");
-const Message = require("./models/Message");
-const Order = require("./models/Order");
-const OrderProduct = require("./models/OrderProduct");
-const Report = require("./models/Report");
-const Shipper = require("./models/Shipper");
-const Status = require("./models/Status");
-const StatusType = require("./models/StatusType");
-const Type = require("./models/Type");
-const Workspace = require("./models/Workspace");
-const Card = require("./models/Card");
-const Profile = require("./models/Profile");
+const Role = require("./models/Role");
 
 module.exports = {
   Website,
@@ -51,27 +29,5 @@ module.exports = {
   ActivityLogs,
   UserRole,
   OrderQueue,
-  AgentActivity,
-  Assignment,
-  BusinessDistribution,
-  CardComments,
-  Checkpoint,
-  Column,
-  Conversation,
-  City,
-  Customer,
-  Integration,
-  Label,
-  Message,
-  Order,
-  OrderProduct,
-  Report,
-  Shipper,
-  Status,
-  Type,
-  Workspace,
-  StatusType,
-  Card,
-  DescriptionTemplate,
-  Profile,
+  Role,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.1.81",
+  "version": "1.1.82",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,18 +11,7 @@
   "license": "ISC",
   "access": "restricted",
   "dependencies": {
-    "@babel/core": "^7.22.5",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.22.5",
-    "@babel/preset-env": "^7.22.5",
-    "@babel/register": "^7.22.5",
-    "redis": "^4.6.14",
-    "express": "^4.17.1",
     "jsonwebtoken": "^9.0.2",
-    "mongoose": "^8.7.1",
-    "cors": "^2.8.5",
-    "helmet": "^8.0.0",
-    "bull": "^4.10.4",
-    "socket.io": "^4.8.1"
+    "mongoose": "^8.7.1"
   }
 }

package/common/repositories/index.js

@@ -1,4 +0,0 @@
-const workspaceRepository = require("./workspace.repository");
-const integrationRepository = require("./integration.repository");
-
-exports.module = { workspaceRepository, integrationRepository };

package/common/repositories/integration.repository.js

@@ -1,168 +0,0 @@
-const { getRedisData, setRedisData } = require("../../config/redis");
-const Integration = require("../../models/Integration");
-
-const CACHE_KEY_ALL = "integrations_all";
-
-/**
- * Get cached integrations for all workspaces.
- */
-const getCachedAllIntegrations = async () => {
-  let integrations = await getRedisData(CACHE_KEY_ALL);
-  if (!integrations) {
-    integrations = await Integration.find({}).exec();
-    await setRedisData(CACHE_KEY_ALL, integrations);
-  }
-  return integrations;
-};
-
-/**
- * Update cached integrations for all workspaces.
- */
-const updateCachedAllIntegrations = async () => {
-  const integrations = await Integration.find({}).exec();
-  await setRedisData(CACHE_KEY_ALL, integrations);
-};
-
-/**
- * Get cached integrations for a specific workspace.
- * Now uses the all integrations cache and filters by workspaceId.
- */
-const getCachedIntegrations = async (workspaceId) => {
-  const allIntegrations = await getCachedAllIntegrations();
-  return allIntegrations.filter((intg) => intg.workspaceId === workspaceId);
-};
-
-/**
- * Create a new integration and update cache.
- */
-const createIntegration = async (data) => {
-  const newIntegration = new Integration(data);
-  const savedIntegration = await newIntegration.save();
-
-  // Update only the main cache
-  await updateCachedAllIntegrations();
-
-  return savedIntegration;
-};
-
-/**
- * Find an integration by ID.
- */
-const findIntegrationsByWorkspaceId = async (workspaceId) => {
-  return await getCachedIntegrations(workspaceId);
-};
-
-/**
- * Find integrations by workspace.
- */
-const findIntegrationsByWorkspace = async (workspaceId, filter = {}) => {
-  const allIntegrations = await getCachedIntegrations(workspaceId);
-
-  return allIntegrations.filter(
-    (intg) =>
-      intg.workspaceId === workspaceId &&
-      Object.entries(filter).every(([key, value]) => intg[key] === value)
-  );
-};
-
-/**
- * Find integration by filter (supports both workspace & non-workspace).
- */
-const findIntegrationByFilter = async (filter, workspaceId = null) => {
-  const allIntegrations = await getCachedAllIntegrations();
-
-  let filteredIntegrations = allIntegrations;
-  if (workspaceId) {
-    filteredIntegrations = allIntegrations.filter(
-      (intg) => intg.workspaceId === workspaceId
-    );
-  }
-
-  return (
-    filteredIntegrations.find((item) =>
-      Object.entries(filter).every(([key, value]) => item.body?.[key] === value)
-    ) || null
-  );
-};
-
-/**
- * Find all integrations (without workspace filtering).
- */
-const findAllIntegrations = async () => {
-  return await getCachedAllIntegrations();
-};
-
-/**
- * Update an integration by ID.
- */
-const updateIntegration = async (id, data) => {
-  const updatedIntegration = await Integration.findByIdAndUpdate(id, data, {
-    new: true,
-  }).exec();
-
-  if (updatedIntegration) {
-    // Update only the main cache
-    await updateCachedAllIntegrations();
-  }
-
-  return updatedIntegration;
-};
-
-/**
- * Update an integration by filter.
- */
-const updateIntegrationByFilter = async (filter, data, workspaceId = null) => {
-  // Add workspace filter if provided
-  const queryFilter = workspaceId ? { ...filter, workspaceId } : filter;
-
-  const updatedIntegration = await Integration.findOneAndUpdate(
-    queryFilter,
-    data,
-    {
-      new: true,
-    }
-  ).exec();
-
-  if (updatedIntegration) {
-    // Update only the main cache
-    await updateCachedAllIntegrations();
-  }
-
-  return updatedIntegration;
-};
-
-/**
- * Delete an integration by ID.
- */
-const deleteIntegration = async (id) => {
-  const deletedIntegration = await Integration.findByIdAndDelete(id).exec();
-
-  if (deletedIntegration) {
-    // Update only the main cache
-    await updateCachedAllIntegrations();
-  }
-
-  return deletedIntegration;
-};
-
-/**
- * Delete all integrations for a specific workspace.
- */
-const deleteAllIntegrationsByWorkspace = async (workspaceId) => {
-  await Integration.deleteMany({ workspaceId }).exec();
-
-  // Update only the main cache
-  await updateCachedAllIntegrations();
-};
-
-module.exports = {
-  createIntegration,
-  findIntegrationsByWorkspaceId,
-  findIntegrationsByWorkspace,
-  findIntegrationByFilter,
-  findAllIntegrations,
-  updateIntegration,
-  updateIntegrationByFilter,
-  deleteIntegration,
-  deleteAllIntegrationsByWorkspace,
-};

package/common/repositories/workspace.repository.js

@@ -1,95 +0,0 @@
-const { getRedisData, setRedisData } = require("../../config/redis");
-const Workspace = require("../../models/Workspace");
-
-const CACHE_KEY_ALL = "workspaces_all";
-
-const getCachedWorkspaces = async () => {
-  let workspaces = await getRedisData(CACHE_KEY_ALL);
-  if (!workspaces) {
-    workspaces = await Workspace.find().exec();
-    await setRedisData(CACHE_KEY_ALL, JSON.stringify(workspaces));
-  } else {
-    workspaces = JSON.parse(workspaces);
-  }
-  return workspaces;
-};
-
-const updateCachedWorkspaces = async () => {
-  const workspaces = await Workspace.find().exec();
-  await setRedisData(CACHE_KEY_ALL, JSON.stringify(workspaces));
-};
-
-const createWorkspace = async (data) => {
-  const newWorkspace = new Workspace(data);
-  const savedWorkspace = await newWorkspace.save();
-  await updateCachedWorkspaces();
-  return savedWorkspace;
-};
-
-const findWorkspaceById = async (id, select = []) => {
-  const workspaces = await getCachedWorkspaces();
-  const workspace = workspaces.find((ws) => ws._id.toString() === id) || null;
-
-  if (workspace && select.length > 0) {
-    return select.reduce((result, field) => {
-      if (workspace[field] !== undefined) {
-        result[field] = workspace[field];
-      }
-      return result;
-    }, {});
-  }
-
-  return workspace;
-};
-
-const findWorkspace = async (filter) => {
-  const workspaces = await getCachedWorkspaces();
-  return (
-    workspaces.find((ws) =>
-      Object.entries(filter).every(([key, value]) => ws[key] === value)
-    ) || null
-  );
-};
-
-const findWorkspaceByIdAndQueueTracking = async (id) => {
-  const workspaces = await getCachedWorkspaces();
-  return (
-    workspaces.find((ws) => ws._id.toString() === id && ws.queueTracking) ||
-    null
-  );
-};
-
-const findAllWorkspaces = async (filter = {}) => {
-  const workspaces = await getCachedWorkspaces();
-  return workspaces.filter((ws) =>
-    Object.entries(filter).every(([key, value]) => ws[key] === value)
-  );
-};
-
-const updateWorkspace = async (id, data) => {
-  const updatedWorkspace = await Workspace.findByIdAndUpdate(id, data, {
-    new: true,
-  }).exec();
-  if (updatedWorkspace) {
-    await updateCachedWorkspaces();
-  }
-  return updatedWorkspace;
-};
-
-const deleteWorkspace = async (id) => {
-  const deletedWorkspace = await Workspace.findByIdAndDelete(id).exec();
-  if (deletedWorkspace) {
-    await updateCachedWorkspaces();
-  }
-  return deletedWorkspace;
-};
-
-module.exports = {
-  createWorkspace,
-  findWorkspaceById,
-  findWorkspace,
-  findWorkspaceByIdAndQueueTracking,
-  findAllWorkspaces,
-  updateWorkspace,
-  deleteWorkspace,
-};

package/config/bull.js

@@ -1,78 +0,0 @@
-const Queue = require("bull");
-const config = require("./config");
-
-/**
- * Create a new queue.
- * @param {string} queueName - The name of the queue.
- * @param {Object} [redisConfig=config.redis] - Redis configuration.
- * @returns {Object} - A collection of queue-related functions.
- */
-const createQueue = (queueName, redisConfig = config.redis) => {
-  const queue = new Queue(queueName, { redis: redisConfig });
-
-  // Attach event listeners for logging
-  queue.on("completed", (job) => console.log(`Job ${job.id} completed.`));
-  queue.on("failed", (job, err) => console.error(`Job ${job.id} failed:`, err));
-
-  /**
-   * Add a job to the queue.
-   * @param {Object} data - Data to be processed by the job.
-   * @param {Object} [options] - Bull job options (e.g., delay, attempts).
-   * @returns {Promise<Job>} - The created job.
-   */
-  const addJob = async (
-    data,
-    options = {
-      attempts: 3,
-      removeOnComplete: true,
-    }
-  ) => {
-    return await queue.add(data, options);
-  };
-
-  /**
-   * Process jobs in the queue.
-   * @param {Function} processor - The function to process each job.
-   */
-  const processJobs = (processor) => {
-    queue.process(processor);
-  };
-
-  /**
-   * Close the queue connection.
-   * @returns {Promise<void>}
-   */
-  const closeConnection = async () => {
-    await queue.close();
-    console.log(`Queue "${queue.name}" connection closed.`);
-  };
-
-  /**
-   * Pause the queue.
-   * @returns {Promise<void>}
-   */
-  const pauseQueue = async () => {
-    await queue.pause();
-    console.log(`Queue "${queue.name}" paused.`);
-  };
-
-  /**
-   * Resume the queue.
-   * @returns {Promise<void>}
-   */
-  const resumeQueue = async () => {
-    await queue.resume();
-    console.log(`Queue "${queue.name}" resumed.`);
-  };
-
-  // Return the functional interface
-  return {
-    addJob,
-    processJobs,
-    closeConnection,
-    pauseQueue,
-    resumeQueue,
-  };
-};
-
-module.exports = { createQueue };

package/config/config.js

@@ -1,14 +0,0 @@
-const ALLOWED_URLS = process.env.ALLOWED_ORIGIN.split(",");
-const WEBHOOK_API_KEY = process.env.API_KEY || process.env.WEBHOOK_API_KEY;
-const mode = process.env.MODE || "production";
-
-const redis = {
-  url: process.env.REDIS_URI,
-};
-
-module.exports = {
-  WEBHOOK_API_KEY,
-  ALLOWED_URLS,
-  mode,
-  redis,
-};

package/config/database.js

@@ -1,7 +0,0 @@
-/* eslint-disable no-undef */
-module.exports = {
-  url:
-    process.env.NODE_ENV === "test"
-      ? process.env.TEST_DB_URL
-      : process.env.DB_URL,
-};

package/config/index.js

@@ -1,13 +0,0 @@
-const bullConfig = require("./bull");
-const redisConfig = require("./redis");
-const config = require("./config");
-const databaseConfig = require("./database");
-const socketConfig = require("./socket");
-
-module.exports = {
-  bullConfig,
-  redisConfig,
-  config,
-  databaseConfig,
-  socketConfig,
-};