Add society joining route

presenters/society-controller.js

@@ -55,9 +55,10 @@ module.exports = {
               admins.map(function (admin_name) {
                 redis.hget("user:" + admin_name, "societies", function (err, result) {
                   if (result) {
-                    redis.hset("user:" + admin_name, "societies", result.concat(society_name));
+                    result = JSON.parse(result);
+                    redis.hset("user:" + admin_name, "societies", JSON.stringify(result.concat(society_name)));
                   } else {
-                    redis.hset("user:" + admin_name, "societies", [society_name]);
+                    redis.hset("user:" + admin_name, "societies", JSON.stringify([society_name]));
                   }
                 });
               });
@@ -115,13 +116,15 @@ module.exports = {
           user_query = "user:" + username;
           redis.hget(user_query, "societies", function (err, result) {
             if (result) {
-              redis.hset(user_query, "societies", result.concat(society_name));
+              result = JSON.parse(result);
+              redis.hset(user_query, "societies", JSON.stringify(result.concat(soc_name)));
             } else {
-              redis.hset(user_query, "societies", [society_name]);
+              redis.hset(user_query, "societies", JSON.stringify([soc_name]));
             }
           });
           redis.hget("society:" + soc_name, "users", function (err, users_result) {
-            redis.hset("society" + soc_name, users_result.concat(username));
+            users_result = JSON.parse(users_result);
+            redis.hset("society:" + soc_name, "users", JSON.stringify(users_result.concat(username)));
           });
         });
         complete({
@@ -145,6 +148,12 @@ module.exports = {
     });
     stream.on('end', function () {
       var soc_objects = [];
+      if (society_names.length === 0) {
+        complete({
+          "societies": []
+        });
+        return;
+      }
       for (var ii = 0; ii < society_names.length; ii++) {
         self.get_society(society_names[ii], function(response) {
           soc_objects.push(response.society);
@@ -160,7 +169,7 @@ module.exports = {
           }
         });
       }
-    })
+    });
   },
 
   leave_society: function (soc_name, auth, complete) {

presenters/user-controller.js

@@ -16,6 +16,18 @@ module.exports = {
     });
   },
 
+  get_public_user_info: function (user, complete) {
+    var user_key = "user:" + user;
+
+    redis.hgetall(user_key, function(err, result) {
+      var public = {};
+      public.username = user;
+      public.societies = result.societies || [];
+      public.friends = result.friends || [];
+      public.accepted_events = result.accepted_events || [];
+    });
+  },
+
   get_user_from_auth: function (auth, complete) {
     var auth_key = "auth-key:" + auth;
 
@@ -83,6 +95,11 @@ module.exports = {
 
           redis.hset(user_key, "password", new_user["password"]);
           redis.hset(user_key, "auth-key", new_user["auth-key"]);
+          redis.hset(user_key, "societies", JSON.stringify([]));
+          redis.hset(user_key, "friends", JSON.stringify([]));
+          redis.hset(user_key, "pending_events", JSON.stringify([]));
+          redis.hset(user_key, "accepted_events", JSON.stringify([]));
+          redis.hset(user_key, "declined_events", JSON.stringify([]));
           redis.set(auth_key, user);
           complete({
             "registered": 1,

routes/society/join-society.js

@@ -1,5 +1,6 @@
 var Redis = require("ioredis");
 var redis = new Redis();
+var society_controller = require("./../../presenters/society-controller.js");
 
 module.exports = {
   perform: function (a,b) {
@@ -8,5 +9,15 @@ module.exports = {
 }
 
 var perform = function (req, res) {
+  var soc_name = req.body.society || req.query.society;
+  var auth_key = req.body.auth || req.query.auth;
 
+  if (soc_name && auth_key) {
+    society_controller.join_society(soc_name, auth_key, function (response) {
+      res.send(response);
+    });
+  } else {
+    res.send({"success": 0,
+              "error": 2});
+  }
 };

utils/route-manager.js

@@ -5,6 +5,7 @@ var register = require("../routes/user/register.js");
 var login = require("../routes/user/login.js");
 var soc_create = require("../routes/society/create-society.js");
 var soc_view = require("../routes/society/view-society.js");
+var soc_join = require("../routes/society/join-society.js");
 
 module.exports = router;
 
@@ -15,3 +16,4 @@ router.all('/user/auth/', login.perform);
 
 router.all('/society/create', soc_create.perform);
 router.all('/society/view/(:societyid)?', soc_view.perform);
+router.all('/society/join/', soc_join.perform);