Merge pull request #68 from andela/bg-follower-list-169723358

#169723358 Improve follower and following response
andela · Nov 13, 2019 · d888ade · d888ade
2 parents 2799a34 + 5276bce
commit d888ade
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/src/controllers/followController.js b/src/controllers/followController.js
@@ -110,14 +110,20 @@ class Following {
       });
     }
 
-    await Promise.all(followingList.map(async (follower) => {
-      const userInfo = await User.findOne({ where: { id: follower.following } });
-      userList.push({
-        id: userInfo.dataValues.id,
-        username: userInfo.dataValues.userName,
-      });
-      return userList;
-    }));
+    await Promise.all(
+      followingList.map(async (follower) => {
+        const userInfo = await User.findOne({ where: { id: follower.following } });
+        userList.push({
+          id: userInfo.dataValues.id,
+          username: userInfo.dataValues.userName,
+          firstName: userInfo.dataValues.firstName,
+          lastName: userInfo.dataValues.lastName,
+          image: userInfo.dataValues.image,
+          bio: userInfo.dataValues.bio
+        });
+        return userList;
+      })
+    );
     return res.status(200).json({
       data: userList
     });
@@ -151,14 +157,20 @@ class Following {
       });
     }
 
-    await Promise.all(followersList.map(async (follower) => {
-      const userInfo = await User.findOne({ where: { id: follower.follower } });
-      userList.push({
-        id: userInfo.dataValues.id,
-        username: userInfo.dataValues.userName,
-      });
-      return userList;
-    }));
+    await Promise.all(
+      followersList.map(async (follower) => {
+        const userInfo = await User.findOne({ where: { id: follower.follower } });
+        userList.push({
+          id: userInfo.dataValues.id,
+          username: userInfo.dataValues.userName,
+          firstName: userInfo.dataValues.firstName,
+          lastName: userInfo.dataValues.lastName,
+          image: userInfo.dataValues.image,
+          bio: userInfo.dataValues.bio
+        });
+        return userList;
+      })
+    );
     return res.status(200).json({
       data: userList
     });

diff --git a/src/tests/user.test.js b/src/tests/user.test.js
@@ -821,7 +821,7 @@ describe('GET /api/v1/profiles/:userName/following', () => {
         expect(res).to.be.an('object');
         expect(res.body).to.have.keys('data');
         expect(res.body.data).to.be.an('array');
-        expect(res.body.data[0]).to.have.keys('id', 'username');
+        expect(res.body.data[0]).to.have.keys('id', 'username', 'bio', 'firstName', 'image', 'lastName');
         done();
       });
   });
@@ -836,7 +836,7 @@ describe('GET /api/v1/profiles/:userName/followers', () => {
         expect(res).to.be.an('object');
         expect(res.body).to.have.keys('data');
         expect(res.body.data).to.be.an('array');
-        expect(res.body.data[0]).to.have.keys('id', 'username');
+        expect(res.body.data[0]).to.have.keys('id', 'username', 'bio', 'firstName', 'image', 'lastName');
         done();
       });
   });