Mise à jour de routes

routes/api/dropzones.js

@@ -7,19 +7,18 @@ const auth = require('../auth');
 
 
 router.get('/', auth.required, function (req, res, next) {
-    var limit = 20;
-    var offset = 0;
-    if (typeof req.query.limit !== 'undefined') {
-        limit = req.query.limit;
-    }
-    if (typeof req.query.offset !== 'undefined') {
-        offset = req.query.offset;
-    }
-
     User.findById(req.payload.id).then(function (user) {
         if (!user) {
             return res.sendStatus(401);
         }
+        var limit = 25;
+        var offset = 0;
+        if (typeof req.query.limit !== 'undefined') {
+            limit = req.query.limit;
+        }
+        if (typeof req.query.offset !== 'undefined') {
+            offset = req.query.offset;
+        }
         var query = [
             {
                 '$match': {
@@ -37,22 +36,87 @@ router.get('/', auth.required, function (req, res, next) {
                         '$sum': 1
                     }
                 }
+            }, {
+                '$sort':
+                {
+                    '_id': 1
+                },
             }
         ];
-        Promise.all([
-            Jump.aggregate(query)
-            .limit(Number(limit))
-            .skip(Number(offset))
-            .exec()
-        ]).then(function (results) {
-            var dropzones = results[0];
+        Jump.aggregate(query)
+        .limit(Number(limit))
+        .skip(Number(offset))
+        .exec()
+        .then(function (result) {
+            var dropzones = result;
             return res.json({
                 dropzones: dropzones,
                 dropzonesCount: dropzones.length
             });
         }).catch(next);
     }).catch(next);
+});
 
+router.get('/allByDate', auth.required, function (req, res, next) {
+    User.findById(req.payload.id).then(function (user) {
+        if (!user) {
+            return res.sendStatus(401);
+        }
+        var limit = 25;
+        var offset = 0;
+        if (typeof req.query.limit !== 'undefined') {
+            limit = req.query.limit;
+        }
+        if (typeof req.query.offset !== 'undefined') {
+            offset = req.query.offset;
+        }
+        var query = [
+            {
+                '$match': {
+                    '$expr': {
+                        '$eq': [ '$author' , { '$toObjectId': user._id.toString() } ]
+                    }
+                }
+            }, {
+                '$project': {
+                    '_id': 0,
+                    'lieu': 1,
+                    'oaci': 1,
+                    'year': {
+                        '$year': '$date'
+                    }
+                }
+            }, {
+                '$group': {
+                    '_id': {
+                        'lieu': '$lieu',
+                        'oaci': '$oaci',
+                        'year': '$year'
+                    },
+                    'count': {
+                        '$sum': 1
+                    }
+                }
+            }, {
+                '$sort': {
+                    '_id': 1
+                }
+            }
+        ];
+
+        Jump.aggregate(query)
+        .limit(Number(limit))
+        .skip(Number(offset))
+        .exec()
+        .then(function (result) {
+            var dropzones = result;
+            //console.log(dropzones);
+            return res.json({
+                dropzones: dropzones,
+                dropzonesCount: dropzones.length
+            });
+        }).catch(next);
+    }).catch(next);
 });
 
 module.exports = router;