wip #76 revert and fix studyGroup.controller createStudyGroup

jacobrs · Mar 24, 2017 · a8a1caa · a8a1caa
1 parent 4ded3e9
commit a8a1caa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/server/controllers/studyGroup.controller.js b/server/controllers/studyGroup.controller.js
@@ -1,3 +1,4 @@
+import User from '../models/user'
 import StudyGroup from '../models/studyGroup';
 import Message from '../models/message';
 import cuid from 'cuid';
@@ -29,7 +30,18 @@ export function createStudyGroup(req, res) {
     if (err) {
       return res.status(500).send(err);
     }
-    return res.json(saved);
+    User.findOne({ cuid: req.body.cuid }).exec((err, user) => {
+      if (err) {
+        return res.status(500).send(err);
+      }
+      user.studyGroups.push(newStudyGroup);
+      user.save((err, saved) => {
+        if (err) {
+          return res.status(500).send(err);
+        }
+        return res.json({ studyGroup: saved });
+      });
+    });
   });
 }
 

diff --git a/server/server.js b/server/server.js
@@ -106,7 +106,9 @@ passport.serializeUser(function (user, done) {
 
 passport.deserializeUser(function (id, done) {
   User.findOne({ 'cuid': id }, function (err, user) {
-    user.password = undefined;
+    if (user != null) {
+      user.password = undefined;
+    }
     done(err, user);
   });
 });