Made the code cleaner

Author: Vividh25

controllers/badge.js

@@ -23,9 +23,15 @@ const getBadges = async (req, res) => {
 const getUserBadges = async (req, res) => {
   try {
     const result = await badgeQuery.fetchUserBadges(req.params.username)
-    return result.userExists
-      ? res.json({ message: 'User badges returned successfully!', userBadges: result.userBadges })
-      : res.boom.notFound('The user does not exist')
+    let responseMsg = ''
+    if (result.userExists) {
+      responseMsg = result.userBadges.length !== 0
+        ? 'User badges returned successfully!'
+        : 'This user does not have any badges'
+      return res.json({ message: responseMsg, userBadges: result.userBadges })
+    } else {
+      return res.boom.notFound('The user does not exist')
+    }
   } catch (error) {
     logger.error(`Error while fetching all user badges: ${error}`)
     return res.boom.serverUnavailable('Something went wrong please contact admin')

models/badges.js

@@ -44,12 +44,12 @@ const fetchUserBadges = async (username) => {
       const userID = result.user.id
       const snapshot = await badgeModel.get()
       snapshot.forEach((item) => {
-        if (item.data().users.includes(userID)) {
+        if (item.data()?.users?.includes(userID)) {
           userBadges.push({ title: item.data().title, description: item.data().description })
         }
       })
     }
-    return { userExists: userExists, userBadges: userBadges }
+    return { userExists, userBadges }
   } catch (err) {
     logger.error('Error retrieving user badges', err)
     return err

test/fixtures/userBadges/userBadges.js

@@ -15,4 +15,9 @@ const userNotFound = {
   userBadges: []
 }
 
-module.exports = { userFound, userNotFound }
+const badgesEmpty = {
+  userExists: true,
+  userBadges: []
+}
+
+module.exports = { userFound, userNotFound, badgesEmpty }

test/integration/userBadges.test.js

@@ -41,6 +41,20 @@ describe('User badges', function () {
           expect(res.body.error).to.equal('Not Found')
           expect(res.body.message).to.equal('The user does not exist')
 
+          return done()
+        })
+    })
+    it('Should return no badges message if the user does not have any badges', function (done) {
+      sinon.stub(badges, 'fetchUserBadges').returns(userBadges.badgesEmpty)
+      chai
+        .request(app)
+        .get('/badges/some-user')
+        .end((err, res) => {
+          if (err) { return done() }
+          expect(res).to.have.status(200)
+          expect(res.body).to.be.a('object')
+          expect(res.body.message).to.equal('This user does not have any badges')
+
           return done()
         })
     })