Update management routes for admin users. (#675)

* Dont run expensive populate and loop functions

* Update tests

* Use stream in management route

* Add projection

* Update tests

Author: mpfeil

packages/api/lib/controllers/managementController.js

@@ -6,27 +6,22 @@ const { Box, User } = require('@sensebox/opensensemap-api-models'),
   handleError = require('../helpers/errorHandler'),
   {
     retrieveParameters,
-  } = require('../helpers/userParamHelpers');
+  } = require('../helpers/userParamHelpers'),
+  jsonstringify = require('stringify-stream');
 
 
 const listBoxes = async function listBoxes (req, res, next) {
-  try {
-    let boxes = await Box.find().exec();
-    const users = await User.find().exec();
-
-    boxes = boxes
-      .map(b => b.toJSON({ includeSecrets: true }));
-
-    for (const user of users) {
-      for (const userbox of user.boxes) {
-        const foundbox = boxes.find(box => box._id.equals(userbox));
-        if (foundbox) {
-          foundbox.owner = user.toJSON({ includeSecrets: true });
-        }
-      }
-    }
+  // default format
+  const stringifier = jsonstringify({ open: '[', close: ']' });
 
-    res.send({ code: 'Ok', boxes });
+  try {
+    const stream = await Box.find({}, { _id: 1, name: 1, exposure: 1, model: 1, createdAt: 1, updatedAt: 1 }).cursor({ lean: true });
+    stream
+      .pipe(stringifier)
+      .on('error', function (err) {
+        res.end(`Error: ${err.message}`);
+      })
+      .pipe(res);
   } catch (err) {
     handleError(err, next);
   }
@@ -35,15 +30,10 @@ const listBoxes = async function listBoxes (req, res, next) {
 const listUsers = async function listUsers (req, res, next) {
   try {
     const users = await User.find()
-      .populate('boxes')
       .then(function (users) {
         return users.map(function (user) {
-          const boxes = user.boxes.map(b => b.toJSON({ includeSecrets: true }));
-
           user = user.toJSON({ includeSecrets: true });
 
-          user.boxes = boxes;
-
           return user;
         });
       });

tests/tests/015-admin-test.js

@@ -82,10 +82,6 @@ describe('Management Tests', function () {
       expect(user._id).exist;
       expect(user.boxes).exist;
 
-      for (const box of user.boxes) {
-        expect(box.integrations).exist;
-      }
-
       return chakram.wait();
     });
 
@@ -100,15 +96,8 @@ describe('Management Tests', function () {
 
   describe('boxes management', function () {
     it('should allow to request a list of boxes with secrets', async function () {
-      const { body: { boxes } } = await requestWithAuth('get', `${MANAGEMENT_URL}/boxes`);
-      expect(Array.isArray(boxes)).true;
-      for (const box of boxes) {
-        expect(box.integrations).exist;
-        expect(box.owner).exist;
-        expect(box.owner.name).exist;
-        expect(box.owner.email).exist;
-        expect(box.owner._id).exist;
-      }
+      const { body } = await requestWithAuth('get', `${MANAGEMENT_URL}/boxes`);
+      expect(Array.isArray(body)).true;
 
       return chakram.wait();
     });
@@ -117,10 +106,6 @@ describe('Management Tests', function () {
       const { body } = await requestWithAuth('get', `${MANAGEMENT_URL}/boxes/${normalUserBox._id}`);
       expect(body.name).equal(valid_sensebox().name);
       expect(body.integrations).exist;
-      expect(body.owner).exist;
-      expect(body.owner.name).exist;
-      expect(body.owner.email).exist;
-      expect(body.owner._id).exist;
 
       return chakram.wait();
     });