WIP

- refact statistics

src/server/routes/apiv3/statistics.js

@@ -8,46 +8,61 @@ const router = express.Router();
 
 const helmet = require('helmet');
 
+const USER_STATUS_MASTER = {
+  1: 'registered',
+  2: 'active',
+  3: 'suspended',
+  4: 'deleted',
+  5: 'invited',
+};
+
+
 /**
  * @swagger
  *  tags:
  *    name: Statistics
  */
-
 module.exports = (crowi) => {
 
   const models = crowi.models;
   const User = models.User;
+  const util = require('util');
 
   router.get('/user', helmet.noCache(), async(req, res) => {
-    const activeUsersCount = await User.countListByStatus(User.STATUS_ACTIVE);
-    const invitedUsersCount = await User.countListByStatus(User.STATUS_INVITED);
-    const deletedUsersCount = await User.countListByStatus(User.STATUS_DELETED);
-    const suspendedUsersCount = await User.countListByStatus(User.STATUS_SUSPENDED);
-    const registeredUsersCount = await User.countListByStatus(User.STATUS_REGISTERED);
-    const inactiveUsersCount = invitedUsersCount + deletedUsersCount + suspendedUsersCount + registeredUsersCount;
-    const adminUsersCount = await new Promise((resolve, reject) => {
-      User.findAdmins((err, admins) => {
-        resolve(admins.length);
-      });
+    const userCountGroupByStatus = await User.aggregate().group({
+      _id: '$status',
+      totalCount: { $sum: 1 },
     });
 
+    const userCountResults = {
+      active: 0,
+      invited: 0,
+      deleted: 0,
+      suspended: 0,
+      registered: 0,
+    };
+
+    userCountGroupByStatus.forEach((userCount) => {
+      const key = USER_STATUS_MASTER[userCount._id];
+      userCountResults[key] = userCount.totalCount;
+    });
+    const activeUserCount = userCountResults.active;
+
+    delete userCountResults.active;
+
+    userCountResults.total = userCountResults.invited + userCountResults.deleted + userCountResults.suspended + userCountResults.registered;
+
+    const findAdmins = util.promisify(User.findAdmins).bind(User);
+    const adminUsers = await findAdmins();
+
     const data = {
-      total: activeUsersCount + inactiveUsersCount,
+      total: activeUserCount + userCountResults.total,
       active: {
-        total: activeUsersCount,
-        admin: adminUsersCount,
-      },
-      inactive: {
-        total: inactiveUsersCount,
-        // 以下ステータス別
-        invited: invitedUsersCount,
-        deleted: deletedUsersCount,
-        suspended: suspendedUsersCount,
-        registered: registeredUsersCount,
+        total: activeUserCount,
+        admin: adminUsers.length,
       },
+      inactive: userCountResults,
     };
-
     res.status(200).send({ data });
   });