code cleanup

Author: drizzentic

src/upgradeDB.js

@@ -299,83 +299,54 @@ upgradeFuncs.push({
 
 upgradeFuncs.push({
   description: 'Create default roles with permissions and update user groups',
-  func() {
-    return new Promise(async (resolve, reject) => {
-      try {
-        // Fetch channels and get the role names with their associated channels
-        const channels = await ChannelModel.find()
-        const existingRoles = JSON.parse(JSON.stringify(roles)) // Deep clone the roles object
-
-        channels.forEach(channel => {
-          if (Array.isArray(channel.allow)) {
-            if (channel.txViewAcl && channel.txViewAcl.length > 0) {
-              channel.txViewAcl.forEach(role => {
-                if (!existingRoles[role]) {
-                  existingRoles[role] = { permissions: {} }
-                }
-                if (!existingRoles[role].permissions['transaction-view-specified']) {
-                  existingRoles[role].permissions['transaction-view-specified'] = []
-                }
-                existingRoles[role].permissions['transaction-view-specified'].push(channel.name)
-                if (!existingRoles[role].permissions['channel-view-specified']) {
-                  existingRoles[role].permissions['channel-view-specified'] = []
-                }
-                existingRoles[role].permissions['channel-view-specified'].push(channel.name)
-                existingRoles[role].permissions['client-view-all'] = true
-              })
-            }
-            if (channel.txRerunAcl && channel.txRerunAcl.length > 0) {
-              channel.txRerunAcl.forEach(role => {
-                if (!existingRoles[role]) {
-                  existingRoles[role] = { permissions: {} }
-                }
-                if (!existingRoles[role].permissions['transaction-rerun-specified']) {
-                  existingRoles[role].permissions['transaction-rerun-specified'] = []
-                }
-                existingRoles[role].permissions['transaction-rerun-specified'].push(channel.name)
-                if (!existingRoles[role].permissions['channel-view-specified']) {
-                  existingRoles[role].permissions['channel-view-specified'] = []
-                }
-                existingRoles[role].permissions['channel-view-specified'].push(channel.name)
-                existingRoles[role].permissions['client-view-all'] = true
-              })
-            }
-            if (channel.txViewFullAcl && channel.txViewFullAcl.length > 0) {
-              channel.txViewFullAcl.forEach(role => {
-                if (!existingRoles[role]) {
-                  existingRoles[role] = { permissions: {} }
-                }
-                if (!existingRoles[role].permissions['transaction-view-body-specified']) {
-                  existingRoles[role].permissions['transaction-view-body-specified'] = []
-                }
-                existingRoles[role].permissions['transaction-view-body-specified'].push(channel.name)
-                if (!existingRoles[role].permissions['channel-view-specified']) {
-                  existingRoles[role].permissions['channel-view-specified'] = []
-                }
-                existingRoles[role].permissions['channel-view-specified'].push(channel.name)
-                existingRoles[role].permissions['client-view-all'] = true
-              })
-            }
-          }
-        })
+  func: async () => {
+    try {
+      const channels = await ChannelModel.find()
+      const existingRoles = JSON.parse(JSON.stringify(roles)) // Deep clone the roles object
+
+      const updateRolePermissions = (role, permissionType, channelName) => {
+        if (!existingRoles[role]) {
+          existingRoles[role] = { permissions: {} }
+        }
+        if (!existingRoles[role].permissions[permissionType]) {
+          existingRoles[role].permissions[permissionType] = []
+        }
+        existingRoles[role].permissions[permissionType].push(channelName)
+        existingRoles[role].permissions['channel-view-specified'] = existingRoles[role].permissions['channel-view-specified'] || []
+        existingRoles[role].permissions['channel-view-specified'].push(channelName)
+        existingRoles[role].permissions['client-view-all'] = true
+      }
 
-        // Create or update roles
-        for (const [roleName, roleData] of Object.entries(existingRoles)) {
-          await RoleModel.findOneAndUpdate(
-            { name: roleName },
-            { name: roleName, permissions: roleData.permissions },
-            { upsert: true, new: true }
-          )
-          logger.info(`Role ${roleName} created or updated with permissions`)
+      channels.forEach(channel => {
+        if (Array.isArray(channel.allow)) {
+          const aclTypes = [
+            { acl: channel.txViewAcl, permissionType: 'transaction-view-specified' },
+            { acl: channel.txRerunAcl, permissionType: 'transaction-rerun-specified' },
+            { acl: channel.txViewFullAcl, permissionType: 'transaction-view-body-specified' }
+          ]
+
+          aclTypes.forEach(({ acl, permissionType }) => {
+            if (acl && acl.length > 0) {
+              acl.forEach(role => updateRolePermissions(role, permissionType, channel.name))
+            }
+          })
         }
+      })
 
-        logger.info('Successfully updated roles')
-        resolve()
-      } catch (err) {
-        logger.error(`Error updating roles: ${err}`)
-        reject(err)
-      }
-    })
+      // Create or update roles
+      await Promise.all(Object.entries(existingRoles).map(([roleName, roleData]) =>
+        RoleModel.findOneAndUpdate(
+          { name: roleName },
+          { name: roleName, permissions: roleData.permissions },
+          { upsert: true, new: true }
+        )
+      ))
+
+      logger.info('Successfully updated roles')
+    } catch (err) {
+      logger.error(`Error updating roles: ${err}`)
+      throw err
+    }
   }
 })
 
@@ -389,7 +360,7 @@ async function upgradeDbInternal() {
     const dbVer =
       (await DbVersionModel.findOne()) ||
       new DbVersionModel({version: 0, lastUpdated: new Date()})
-      const upgradeFuncsToRun = upgradeFuncs.slice(dbVer.version)
+    const upgradeFuncsToRun = upgradeFuncs.slice(dbVer.version)
     for (const upgradeFunc of upgradeFuncsToRun) {
       await upgradeFunc.func()
       dbVer.version++

test/unit/upgradeDBTest.js

@@ -579,10 +579,10 @@ describe('Upgrade DB Tests', () => {
 
       await upgradeFunc()
 
-      const roles = await RoleModel.find()
-      roles.length.should.be.exactly(Object.keys(roles).length)
+      const existingRoles = await RoleModel.find()
+      existingRoles.length.should.be.exactly(Object.keys(roles).length)
 
-      const adminRoles = roles.filter(r => r.name === 'admin')
+      const adminRoles = existingRoles.filter(r => r.name === 'admin')
       adminRoles.length.should.be.exactly(1)
     })