propro-utils 1.5.95 → 1.5.96

package/middlewares/account_info.js

@@ -6,6 +6,7 @@ const ServiceManager = require('../utils/serviceManager');
 const defaultUserGlobalStyleShortcuts =
   require('./defaultUserGlobalStyleShortcuts.json').defaultGlobalStyleShortcuts;
 const defaultFolders = require('./defaultFolders.json').defaultFolders;
+const User = require('../models/user');
 
 /**
  * Retrieves the account profile data from the authentication server and caches it using Redis.
@@ -61,6 +62,54 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
   }
 };
 
+/**
+ * Consolidates multiple UserGlobalStyles documents for an account into one
+ * @param {string} accountId - The account ID to consolidate styles for
+ * @returns {Promise<Object>} The consolidated UserGlobalStyles document
+ */
+async function consolidateGlobalStyles(accountId) {
+  const userStyleSchema = await ServiceManager.getService('UserStyleSchema');
+
+  // Find all global styles for this account
+  const allStyles = await userStyleSchema
+    .find({ accountId })
+    .sort({ createdAt: 1 });
+
+  if (allStyles.length <= 1) {
+    return allStyles[0];
+  }
+
+  // Use the first document as the main one and merge shortcuts from others
+  const mainStyle = allStyles[0];
+  const uniqueShortcuts = new Map();
+
+  // Merge all shortcuts, keeping the latest version of each shortcut by ID
+  allStyles.forEach(style => {
+    style.styleShortcuts.forEach(shortcut => {
+      uniqueShortcuts.set(shortcut.id.toString(), shortcut);
+    });
+  });
+
+  // Update the main style document with consolidated shortcuts
+  mainStyle.styleShortcuts = Array.from(uniqueShortcuts.values());
+  await mainStyle.save();
+
+  // Delete other style documents
+  await userStyleSchema.deleteMany({
+    accountId,
+    _id: { $ne: mainStyle._id },
+  });
+
+  // Update user reference if needed
+  const userSchema = await ServiceManager.getService('UserSchema');
+  await userSchema.updateMany(
+    { accountId },
+    { userGlobalStyles: mainStyle._id }
+  );
+
+  return mainStyle;
+}
+
 /**
  * Creates a new user global styles document with default style shortcuts.
  *
@@ -69,6 +118,13 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
  * @returns {Promise<Object>} A promise that resolves to the created user global styles object.
  */
 async function createUserGlobalStyles(userStyleSchema, accountId) {
+  // First check if any existing styles need to be consolidated
+  const existingStyles = await userStyleSchema.find({ accountId });
+
+  if (existingStyles.length > 0) {
+    return await consolidateGlobalStyles(accountId);
+  }
+
   return await userStyleSchema.create({
     id: uuidv4(),
     styleShortcuts: defaultUserGlobalStyleShortcuts,
@@ -166,26 +222,8 @@ const checkIfUserExists = async accountId => {
 
       // Handle userGlobalStyles
       if (userStyleSchema) {
-        if (!user.userGlobalStyles) {
-          updates.push(
-            createUserGlobalStyles(userStyleSchema, accountId).then(
-              async styles => {
-                await userSchema.updateOne(
-                  { _id: user._id },
-                  { userGlobalStyles: styles._id }
-                );
-                return styles;
-              }
-            )
-          );
-        } else if (user.userGlobalStyles.styleShortcuts?.length === 0) {
-          updates.push(
-            userStyleSchema.updateOne(
-              { _id: user.userGlobalStyles._id },
-              { styleShortcuts: defaultUserGlobalStyleShortcuts }
-            )
-          );
-        }
+        // Consolidate any duplicate global styles
+        await consolidateGlobalStyles(accountId);
       }
 
       // Handle folders
@@ -320,7 +358,44 @@ const checkIfUserExists = async accountId => {
   }
 };
 
+const updateUserGlobalStyleShortcuts = async (userId, shortcutId, shortcut) => {
+  try {
+    const user = await User.findOne({ id: userId }).populate(
+      'userGlobalStyles'
+    );
+    if (!user) {
+      throw new Error('User not found');
+    }
+
+    // Ensure we have consolidated styles
+    const consolidatedStyles = await consolidateGlobalStyles(user.accountId);
+
+    // Find the index of the shortcut to update
+    const shortcutIndex = consolidatedStyles.styleShortcuts.findIndex(
+      s => s.id.toString() === shortcutId
+    );
+
+    if (shortcutIndex === -1) {
+      // If the shortcut doesn't exist, add it
+      consolidatedStyles.styleShortcuts.push(shortcut);
+    } else {
+      // If the shortcut exists, update it
+      consolidatedStyles.styleShortcuts[shortcutIndex] = {
+        ...consolidatedStyles.styleShortcuts[shortcutIndex],
+        ...shortcut,
+      };
+    }
+
+    await consolidatedStyles.save();
+    return consolidatedStyles;
+  } catch (error) {
+    console.error('Error updating user global style shortcuts:', error);
+    throw error;
+  }
+};
+
 module.exports = {
   getAccountProfile,
   checkIfUserExists,
+  updateUserGlobalStyleShortcuts,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.5.95",
+  "version": "1.5.96",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {