Update society presenter logic

presenters/society-controller.js

@@ -0,0 +1,87 @@
+var Redis = require("ioredis");
+var redis = new Redis();
+
+module.exports = {
+  get_society: function (soc_name, complete) {
+    redis.hgetall("society:" + soc_name, function (err, result) {
+      if (result.name) {
+        result.users = JSON.parse(result.users);
+        result.admins = JSON.parse(result.admins);
+        complete({
+          "society": result,
+          "error": 0
+        })
+      } else {
+        complete({
+          "society": {},
+          "error": 1
+        })
+      }
+    });
+  },
+
+  create_society: function (soc_name, admins, description, auth, complete) {
+    var society_name = decodeURIComponent(soc_name);
+    var soc_query = "society:" + society_name;
+    admins = decodeURIComponent(admins);
+    description = decodeURIComponent(description);
+    var admins_str = admins;
+    admins = JSON.parse(admins);
+
+    redis.hget(soc_query, "name", function (err, result) {
+      if (result) {
+        complete({"success": 0,
+                  "error": 2});
+      } else {
+        redis.get("auth-key:" + auth, function (err,result) {
+          var username = result;
+          if (admins.indexOf(result) !== -1) {
+            redis.hset(soc_query, "name", society_name);
+            redis.hset(soc_query, "admins", admins_str);
+            redis.hset(soc_query, "description", description);
+            redis.hset(soc_query, "users", admins_str);
+            complete({"success": 1,
+                      "society" : {
+                       "name": society_name,
+                       "admins": admins,
+                       "description": description,
+                       "users": admins
+                      },
+                      "error": 0});
+          } else {
+            complete({"success": 0,
+                      "error": 3});
+          }
+        });
+      }
+    });
+  },
+
+  get_user_list: function (soc_name, complete) {
+    this.get_society(soc_name, function (result) {
+      if (result.society.name) {
+        complete(result.society.users);
+      } else {
+        complete([]);
+      }
+    });
+  },
+
+  get_admin_list: function (soc_name, complete) {
+    this.get_society(soc_name, function (result) {
+      if (result.society.name) {
+        complete(result.society.admins);
+      } else {
+        complete([]);
+      }
+    })
+  },
+
+  join_society: function (soc_name, auth, complete) {
+
+  },
+
+  leave_society: function (soc_name, auth, complete) {
+
+  }
+}

routes/society/create-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) {
@@ -14,38 +15,8 @@ var perform = function(req,res) {
   var description = req.body.description || req.query.description;
 
   if (society_name && auth_key && admins && description) {
-    var soc_query = "society:" + society_name;
-    society_name = decodeURIComponent(society_name);
-    admins = decodeURIComponent(admins);
-    description = decodeURIComponent(description);
-    var admins_str = admins;
-    admins = JSON.parse(admins);
-    redis.hget(soc_query, "name", function (err, result) {
-      if (result) {
-        res.send({"success": 0,
-                  "error": 2});
-      } else {
-        redis.get("auth-key:" + auth_key, function (err,result) {
-          var username = result;
-          if (admins.indexOf(result) !== -1) {
-            redis.hset(soc_query, "name", society_name);
-            redis.hset(soc_query, "admins", admins_str);
-            redis.hset(soc_query, "description", description);
-            redis.hset(soc_query, "users", admins_str);
-            res.send({"success": 1,
-                      "society" : {
-                       "name": society_name,
-                       "admins": admins,
-                       "description": description,
-                       "users": admins
-                      },
-                      "error": 0});
-          } else {
-            res.send({"success": 0,
-                      "error": 3});
-          }
-        });
-      }
+    society_controller.create_society(society_name, admins, description, auth_key, function (result) {
+      res.send(result);
     });
   } else {
     res.send({"success": 0,

routes/society/view-society.js

@@ -1,5 +1,4 @@
-var Redis = require("ioredis");
-var redis = new Redis();
+var society_controller = require("./../../presenters/society-controller.js");
 
 module.exports = {
   perform: function (a,b) {
@@ -8,19 +7,7 @@ module.exports = {
 }
 
 var perform = function (req, res) {
-  var auth_key = req.body.auth || req.query.auth;
-
-  redis.hgetall("society:" + req.params.societyid).then(function (result) {
-    if (result.name) {
-      result.users = JSON.parse(result.users);
-      result.admins = JSON.parse(result.admins);
-      res.send({
-        "society": result,
-        "error": 0
-      });
-    } else {
-      res.send({"society": {},
-               "error": 1});
-    }
-  });
+  society_controller.get_society(req.params.societyid, function (result) {
+    res.send(result);
+  })
 };

routes/user/login.js

@@ -1,4 +1,4 @@
-var user_controller = require("./../../controllers/user-controller.js");
+var user_controller = require("./../../presenters/user-controller.js");
 
 module.exports = {
   perform: function(a,b) {

routes/user/register.js

@@ -1,4 +1,4 @@
-var user_controller = require("./../../controllers/user-controller.js");
+var user_controller = require("./../../presenters/user-controller.js");
 
 module.exports = {
   perform: function(a,b) {

templates/api-route.js

@@ -1,5 +1,4 @@
-var Redis = require("ioredis");
-var redis = new Redis();
+// var require = require("modulehere");
 
 module.exports = {
   perform: function (a,b) {