chore: resolve conflicts

Author: swarajpure

constants/multer.js

@@ -1,4 +1,4 @@
 module.exports = {
-  FILE_SIZE_1MB: 1000000, // in bytes, 1000000 bytes = 1MB
-  PROFILE_FILE_SIZE: 1000000
+  FILE_SIZE_1MB: 1_000_000, // in bytes, 1000000 bytes = 1MB
+  PROFILE_FILE_SIZE: 2_000_000 // Limiting profile upload size to 2MB
 }

constants/roles.js

@@ -0,0 +1,6 @@
+const ROLES = {
+  SUPER_USER: 'superUser',
+  APP_OWNER: 'appOwner'
+}
+
+module.exports = ROLES

controllers/badge.js

@@ -20,6 +20,25 @@ const getBadges = async (req, res) => {
   }
 }
 
+const getUserBadges = async (req, res) => {
+  try {
+    const result = await badgeQuery.fetchUserBadges(req.params.username)
+    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')
+  }
+}
+
 module.exports = {
-  getBadges
+  getBadges,
+  getUserBadges
 }

controllers/challenge.js

@@ -3,43 +3,62 @@ const challengeQuery = require('../models/challenges')
 const ERROR_MESSAGE = 'Something went wrong. Please try again or contact admin'
 
 /**
- * Get the challenges or add the challenge
+ * Get the challenges
  * @param {Object} req - Express request object
  * @param {Object} res - Express response object
  */
 
-const sendChallengeResponse = async (req, res) => {
+const fetchChallenges = async (req, res) => {
   try {
-    if (req.method === 'GET') {
-      const allChallenges = await challengeQuery.fetchChallenges()
-      if (allChallenges.length > 0) {
-        return res.status(200).json({
-          message: 'Challenges returned successfully!',
-          challenges: allChallenges
-        })
-      } else {
-        return res.boom.notFound('No challenges found')
-      }
+    const allChallenges = await challengeQuery.fetchChallenges()
+    const promiseArray = await getParticipantsofChallenges(allChallenges)
+    const challengesWithParticipants = await Promise.all(promiseArray)
+    return res.json({
+      message: challengesWithParticipants.length ? 'Challenges returned successfully!' : 'No Challenges found',
+      challenges: challengesWithParticipants
+    })
+  } catch (err) {
+    logger.error(`Error while retrieving challenges ${err}`)
+    return res.boom.serverUnavailable(ERROR_MESSAGE)
+  }
+}
+
+/**
+ * Add a challenge
+ * @param {Object} req - Express request object
+ * @param {Object} res - Express response object
+ */
+
+const createChallenge = async (req, res) => {
+  try {
+    const challengeAdded = await challengeQuery.postChallenge(req.body)
+    if (challengeAdded) {
+      return res.json({
+        message: 'Challenge added successfully'
+      })
     } else {
-      if (req.method === 'POST') {
-        const challengeAdded = await challengeQuery.postChallenge(req.body)
-        if (challengeAdded) {
-          return res.status(200).json({
-            message: 'Challenge added successfully',
-            challenges: challengeAdded
-          })
-        }
-      } else {
-        return res.boom.notFound('Unable to add challenge')
-      }
+      return res.boom.badRequest('Unable to add challenge')
     }
-    return ''
   } catch (err) {
-    logger.error(`Error while retriving challenges ${err}`)
+    logger.error(`Error while adding challenge ${err}`)
     return res.boom.serverUnavailable(ERROR_MESSAGE)
   }
 }
 
+/**
+ * @param {Array} allChallenges
+ * @returns {Promise<participants|Array>}
+ */
+const getParticipantsofChallenges = async (allChallenges) => {
+  return allChallenges.map(async (challenge) => {
+    const participants = await challengeQuery.fetchParticipantsData(challenge.participants)
+    return {
+      ...challenge,
+      participants
+    }
+  })
+}
+
 /**
  * Suscribe user to a challenge
  * @param {Object} req - Express request object
@@ -52,7 +71,8 @@ const subscribeToChallenge = async (req, res) => {
     const subscribeUser = await challengeQuery.subscribeUserToChallenge(userId, challengeId)
     if (subscribeUser) {
       return res.status(200).json({
-        message: 'User has subscribed to challenge'
+        challenge_id: challengeId,
+        is_user_subscribed: 1
       })
     } else {
       return res.boom.notFound('User cannot be subscribed to challenge')
@@ -64,6 +84,7 @@ const subscribeToChallenge = async (req, res) => {
 }
 
 module.exports = {
-  sendChallengeResponse,
+  fetchChallenges,
+  createChallenge,
   subscribeToChallenge
 }

controllers/members.js

@@ -1,6 +1,9 @@
 const { ROLES } = require('../constants/users')
-const { fetchUsers, migrateUsers, deleteIsMemberProperty, fetchUsersWithRole } = require('../models/members')
+const { fetchUsers, migrateUsers, deleteIsMemberProperty, fetchUsersWithRole, moveToMembers: updateToMemberRole } = require('../models/members')
 const tasks = require('../models/tasks')
+const { fetchUser } = require('../models/users')
+
+const ERROR_MESSAGE = 'Something went wrong. Please try again or contact admin'
 
 /**
  * Fetches the data about our members
@@ -47,12 +50,38 @@ const getIdleMembers = async (req, res) => {
   }
 }
 
+/**
+ * Makes a new member a member
+ *
+ * @param req {Object} - Express request object
+ * @param res {Object} - Express response object
+ */
+
+const moveToMembers = async (req, res) => {
+  try {
+    const { username } = req.params
+    const result = await fetchUser({ username })
+    if (result.userExists) {
+      const successObject = await updateToMemberRole(result.user.id)
+      if (successObject.isAlreadyMember) {
+        return res.boom.badRequest('User is already a member')
+      }
+      return res.status(204).send()
+    }
+    return res.boom.notFound("User doesn't exist")
+  } catch (err) {
+    logger.error(`Error while retriving contributions ${err}`)
+    return res.boom.badImplementation(ERROR_MESSAGE)
+  }
+}
+
 /**
  * Returns the lists of usernames migrated
  *
  * @param req {Object} - Express request object
  * @param res {Object} - Express response object
  */
+
 const migrateUserRoles = async (req, res) => {
   try {
     const migratedUserData = await migrateUsers()
@@ -88,6 +117,7 @@ const deleteIsMember = async (req, res) => {
 module.exports = {
   getMembers,
   getIdleMembers,
+  moveToMembers,
   migrateUserRoles,
   deleteIsMember
 }

docs/swaggerDefinition.js

@@ -482,6 +482,17 @@ const swaggerOptions = {
             }
           }
         },
+        userBadges: {
+          type: 'object',
+          properties: {
+            title: {
+              type: 'string'
+            },
+            description: {
+              type: 'string'
+            }
+          }
+        },
         userAvailable: {
           type: 'object',
           properties: {

middlewares/validators/challenges.js

@@ -0,0 +1,22 @@
+const joi = require('joi')
+
+const createChallenge = async (req, res, next) => {
+  const schema = joi.object().strict().keys({
+    title: joi.string().required(),
+    level: joi.string().required(),
+    start_date: joi.number().required(),
+    end_date: joi.number().required()
+  })
+
+  try {
+    await schema.validateAsync(req.body)
+    next()
+  } catch (error) {
+    logger.error(`Error validating createChallenge payload : ${error}`)
+    res.boom.badRequest(error.details[0].message)
+  }
+}
+
+module.exports = {
+  createChallenge
+}

models/badges.js

@@ -1,5 +1,6 @@
 const firestore = require('../utils/firestore')
 const badgeModel = firestore.collection('badges')
+const { fetchUser } = require('../models/users')
 
 /**
  * Fetches the data about our badges
@@ -27,6 +28,38 @@ const fetchBadges = async ({
   }
 }
 
+/**
+ * Fetches the data about user badges
+ * @param query { Object }: Filter for badges data
+ * @return {Promise<userBadgeModel|Array>}
+ */
+
+const fetchUserBadges = async (username) => {
+  try {
+    const userBadges = []
+    let userExists = false
+    const result = await fetchUser({ username })
+    if (result.userExists) {
+      userExists = true
+      const userID = result.user.id
+      const snapshot = await badgeModel.get()
+
+      snapshot.forEach((item) => {
+        if (item.data()?.users?.includes(userID)) {
+          const { title, description } = item.data()
+          userBadges.push({ title, description })
+        }
+      })
+    }
+
+    return { userExists, userBadges }
+  } catch (err) {
+    logger.error('Error retrieving user badges', err)
+    return err
+  }
+}
+
 module.exports = {
-  fetchBadges
+  fetchBadges,
+  fetchUserBadges
 }

models/challenges.js

@@ -5,6 +5,7 @@
 
 const Firestore = require('@google-cloud/firestore')
 const firestore = require('../utils/firestore')
+const { fetchUser } = require('./users')
 
 const challengesModel = firestore.collection('challenges')
 const userModel = firestore.collection('users')
@@ -35,22 +36,47 @@ const fetchChallenges = async () => {
   }
 }
 
+/**
+ * Fetch the <user object> from participants array
+ * @param {Array} participants
+ * @returns {Promise<challengesModel|Array>}
+ */
+const fetchParticipantsData = async (participants) => {
+  try {
+    const promises = participants.map(async (userId) => {
+      const { user } = await fetchUser({ userId })
+      return {
+        ...user,
+        phone: undefined,
+        email: undefined
+      }
+    })
+    const fetchedparticipants = await Promise.all(promises)
+    return fetchedparticipants
+  } catch (err) {
+    logger.error('Failed to get participated users', err)
+    throw err
+  }
+}
+
 /**
  * Post the challenge
  *  @return {Promise<challengesModel|Array>}
  */
 
 const postChallenge = async (challengeData) => {
   try {
-    const response = await challengesModel.add({
+    const { start_date: startDate, end_date: endDate } = challengeData
+    const startdate = new Firestore.Timestamp(startDate, 0)
+    const enddate = new Firestore.Timestamp(endDate, 0)
+    const challengeRef = await challengesModel.add({
       ...challengeData,
+      start_date: startdate,
+      end_date: enddate,
       participants: [],
       is_active: true
     })
-    const allChallenges = await fetchChallenges()
-    if (response.id && allChallenges.length > 0) {
-      return allChallenges
-    } else return ''
+    return challengeRef.id
   } catch (err) {
     logger.error(ERROR_MESSAGE, err)
     throw err
@@ -66,10 +92,10 @@ const postChallenge = async (challengeData) => {
 const subscribeUserToChallenge = async (userId, challengeId) => {
   try {
     const getUser = await userModel.doc(userId).get()
-    const user = getUser.data().github_display_name
+    const user = getUser.data()
     if (user) {
       const challengeRef = await challengesModel.doc(challengeId)
-      await challengeRef.update({ participants: Firestore.FieldValue.arrayUnion({ name: user }) })
+      await challengeRef.update({ participants: Firestore.FieldValue.arrayUnion(userId) })
       return challengeRef.get()
     } else {
       throw new Error(USER_DOES_NOT_EXIST_ERROR)
@@ -83,5 +109,6 @@ const subscribeUserToChallenge = async (userId, challengeId) => {
 module.exports = {
   fetchChallenges,
   postChallenge,
-  subscribeUserToChallenge
+  subscribeUserToChallenge,
+  fetchParticipantsData
 }