Matt Coles лет назад: 9
Родитель
Сommit
fe101d775f
1 измененных файлов с 17 добавлено и 7 удалено
  1. 17 7
      presenters/user-controller.js

+ 17 - 7
presenters/user-controller.js

21
 
21
 
22
     redis.hgetall(user_key, function(err, result) {
22
     redis.hgetall(user_key, function(err, result) {
23
       if (result.password) {
23
       if (result.password) {
24
+
24
         var public = {};
25
         var public = {};
25
         public.username = user;
26
         public.username = user;
26
         public.societies = JSON.parse(result.societies) || [];
27
         public.societies = JSON.parse(result.societies) || [];
27
-        public.friends = JSON.parse(result.friends) || [];
28
-        public.accepted_events = JSON.parse(result.accepted_events) || [];
29
-        public.declined_events = JSON.parse(result.declined_events) || [];
30
-        complete({
31
-          "user": public,
32
-          "error": 0
33
-        });
28
+        var society_controller = require("./society-controller.js");
29
+        var soc_names = [];
30
+        for (var ii = 0; ii < societies.length; ii++) {
31
+          society_controller.get_society(societies[ii], function (response) {
32
+            soc_names.push(response.society.name);
33
+            if (soc_names.length === societies.length) {
34
+              public.friends = JSON.parse(result.friends) || [];
35
+              public.accepted_events = JSON.parse(result.accepted_events) || [];
36
+              public.declined_events = JSON.parse(result.declined_events) || [];
37
+              complete({
38
+                "user": public,
39
+                "error": 0
40
+              });
41
+            }
42
+          });
43
+        }
34
       } else {
44
       } else {
35
         complete({
45
         complete({
36
           "user": {},
46
           "user": {},