Merge pull request #27 from jfabellera/bootstrap-sucks

Migrates to antd

Author: jfabellera

backend/routes/expenses.js

@@ -25,6 +25,7 @@ const validateGetExpenses = [
   check(['start_date', 'end_date'], 'Invalid date format').optional(),
   check('search').optional().isString(),
   check('group_id').optional().isMongoId(),
+  check('category').optional(),
   check('per_page', 'Invalid number').optional().isInt({ min: 1, max: 100 }),
   check('page', 'Invalid number').optional().isInt({ min: 1 }),
 ];
@@ -85,6 +86,11 @@ getExpenses = async (req, res) => {
       query.group_id = req.query.group_id;
     }
 
+    // Category
+    if (req.query.category) {
+      query.category = req.query.category;
+    }
+
     // handle username
     if (req.params.username) {
       query.user_id = req.user._id;
@@ -257,6 +263,7 @@ router.post(
         date: removeTimeZoneOffset(req.body.date),
         category: req.body.category,
       };
+      console.log(query);
       if (!req.body.group_id && req.user.default_group_id)
         query.group_id = req.user.default_group_id;
       else if (req.body.group_id) query.group_id = req.body.group_id;

backend/routes/groups.js

@@ -8,6 +8,13 @@ const Group = require('../models/groupModel');
 const User = require('../models/userModel');
 const Expense = require('../models/expenseModel');
 
+removeTimeZoneOffset = (inputDate) => {
+  const date = new Date(inputDate);
+  const serverTimezonOffset = date.getTimezoneOffset() * 60000;
+  const utcDate = new Date(date.getTime() - serverTimezonOffset);
+  return utcDate;
+};
+
 getGroups = (req, res) => {
   let err = validationResult(req);
   if (!err.isEmpty()) return res.status(400).json(err.errors);
@@ -24,10 +31,95 @@ getGroups = (req, res) => {
           default: String(group._id) === String(req.user.default_group_id),
         };
       }),
+      default_group_id: req.user.default_group_id,
     });
   });
 };
 
+const validateGetExpenseGroups = [
+  check('start_date').optional().isDate(),
+  check('end_date').optional().isDate(),
+  check('amounts').optional().isBoolean(),
+];
+
+getExpenseGroups = async (req, res) => {
+  let err = validationResult(req);
+  if (!err.isEmpty()) {
+    res.status(400).json(err.errors);
+  } else {
+    let query = {};
+    if (req.params.username) {
+      query.user_id = req.user._id;
+    }
+
+    // Date range
+    if (req.query.start_date) {
+      if (!query.date) query.date = {};
+      query.date.$gte = removeTimeZoneOffset(
+        new Date(req.query.start_date).setHours(00, 00, 00)
+      );
+    }
+
+    if (req.query.end_date) {
+      if (!query.date) query.date = {};
+      query.date.$lte = removeTimeZoneOffset(
+        new Date(req.query.end_date).setHours(23, 59, 59)
+      );
+    }
+
+    Expense.find(query).distinct('group_id', (err, group_ids) => {
+      if (err) throw err;
+
+      let queries = [];
+      if (req.query.amounts && req.query.amounts === 'true') {
+        group_ids.forEach((group_id) => {
+          queries.push(
+            Expense.aggregate([
+              {
+                $match: { ...query, group_id: group_id },
+              },
+              {
+                $group: {
+                  _id: group_id,
+                  total: {
+                    $sum: '$amount',
+                  },
+                },
+              },
+            ]).exec()
+          );
+        });
+      }
+
+      Group.find({ user_id: req.user._id }, (err, groups) => {
+        if (err) throw err;
+        Promise.all(queries).then((results) => {
+          let groupObjArray;
+          if (results.length > 0)
+            groupObjArray = results
+              .map((result) => {
+                const group = groups.filter((group) =>
+                  group._id.equals(result[0]._id)
+                )[0];
+
+                return {
+                  _id: result[0]._id,
+                  name: group ? group.name : '',
+                  total: result[0].total,
+                };
+              })
+              .filter((result) => result.name);
+          else
+            groupObjArray = group_ids.map((group_id) => {
+              return { _id: group_id };
+            });
+          res.status(200).json({ groups: groupObjArray });
+        });
+      });
+    });
+  }
+};
+
 /**
  * Get all groups
  */
@@ -62,11 +154,11 @@ router.post(
             { default_group_id: group._id },
             (err, user) => {
               if (err) throw err;
-              res.sendStatus(200);
+              res.status(200).json({ _id: group._id });
             }
           );
         } else {
-          res.sendStatus(200);
+          res.status(200).json({ _id: group._id });
         }
       }
     );
@@ -145,4 +237,9 @@ router.delete(
   }
 );
 
-module.exports = { router: router, getGroups: getGroups };
+module.exports = {
+  router: router,
+  getGroups: getGroups,
+  validateGetExpenseGroups: validateGetExpenseGroups,
+  getExpenseGroups: getExpenseGroups,
+};

backend/routes/users.js

@@ -10,7 +10,11 @@ const {
   validateGetExpenseCategories,
   getExpenseCategories,
 } = require('./expenses');
-const { getGroups } = require('./groups');
+const {
+  getGroups,
+  validateGetExpenseGroups,
+  getExpenseGroups,
+} = require('./groups');
 
 const config = require('../config');
 
@@ -109,7 +113,7 @@ router.get(
 router.post(
   '/',
   [
-    check('username', 'Username is required').exists(),
+    check('username', 'Username is required').exists().isAlphanumeric(),
     check('password', 'Password is required').exists(),
     check('name').customSanitizer((name) => {
       let newName = { first: '', last: '' };
@@ -256,4 +260,11 @@ router.get(
   getGroups
 );
 
+router.get(
+  '/:username/expenses/groups',
+  auth,
+  validateGetExpenseGroups,
+  getExpenseGroups
+);
+
 module.exports = router;