Merge pull request #1146 from mathematicalthinking/development

User search on Admin Dashboard even more efficient

Author: exidy80

server/controllers/UserController.js

@@ -230,21 +230,27 @@ module.exports = {
               },
             },
             {
-              $unwind: {
-                path: '$roomDetails',
-                preserveNullAndEmptyArrays: true, // Preserve events without a corresponding room
+              $project: {
+                roomDetails: { $arrayElemAt: ['$roomDetails', 0] },
+              },
+            },
+            {
+              $group: {
+                _id: '$roomDetails._id',
+                name: { $first: '$roomDetails.name' },
+                eventsCount: { $sum: 1 },
               },
             },
             {
               $group: {
                 _id: null,
                 activeRooms: {
                   $addToSet: {
-                    _id: '$roomDetails._id',
-                    name: '$roomDetails.name',
+                    _id: '$_id',
+                    name: '$name',
                   },
                 },
-                eventsCount: { $sum: 1 },
+                eventsCount: { $sum: '$eventsCount' },
               },
             },
           ],
@@ -276,21 +282,27 @@ module.exports = {
               },
             },
             {
-              $unwind: {
-                path: '$roomDetails',
-                preserveNullAndEmptyArrays: true, // Preserve messages without a corresponding room
+              $project: {
+                roomDetails: { $arrayElemAt: ['$roomDetails', 0] },
+              },
+            },
+            {
+              $group: {
+                _id: '$roomDetails._id',
+                name: { $first: '$roomDetails.name' },
+                messagesCount: { $sum: 1 },
               },
             },
             {
               $group: {
                 _id: null,
                 activeRooms: {
                   $addToSet: {
-                    _id: '$roomDetails._id',
-                    name: '$roomDetails.name',
+                    _id: '$_id',
+                    name: '$name',
                   },
                 },
-                messagesCount: { $sum: 1 },
+                messagesCount: { $sum: '$messagesCount' },
               },
             },
           ],