shuttlepro-shared 1.2.58 → 1.2.60

package/common/repositories/userRole.repository.js

@@ -171,15 +171,17 @@ const findUserWorkspaces = async (userId) => {
       })
       .lean()
       .exec();
-    userRoleWithWorkspaces = userRoleWithWorkspaces.map((ur) => {
-      return {
-        ...ur?.workspaceId,
-        id: ur?.workspaceId?._id?.toString(),
-        _id: ur?.workspaceId?._id?.toString(),
-        role: ur?.roleId?.name || "",
-        permissions: ur?.roleId?.modulePermissions?.modules || [],
-      };
-    });
+    userRoleWithWorkspaces = userRoleWithWorkspaces
+      ?.filter((userRole) => userRole?.workspaceId)
+      ?.map((ur) => {
+        return {
+          ...ur?.workspaceId,
+          id: ur?.workspaceId?._id?.toString(),
+          _id: ur?.workspaceId?._id?.toString(),
+          role: ur?.roleId?.name || "",
+          permissions: ur?.roleId?.modulePermissions?.modules || [],
+        };
+      });
     if (userRoleWithWorkspaces) {
       await setRedisData(cacheKey, userRoleWithWorkspaces, null, 0);
     }

package/config/database.js

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

package/models/Order.js

@@ -108,7 +108,11 @@ const OrderSchema = new Schema(
     ivrGenerated: { type: Boolean, default: false },
     isActivityGenerated: { type: Boolean, default: false },
     platformFinancialStatus: { type: String, default: "pending" },
-    payment: {},
+    payment: {
+      isPaid: { type: Boolean, default: false },
+      paymentDate: { type: String, default: "" },
+      paymentDetails: {},
+    },
     credentials: {},
     sender: { type: String, default: "" },
     orderName: { type: String, default: "" },

package/package.json

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