Merge pull request #385 from harshith-venkatesh/develop

Create QueryModel to fetch users of RDS with roles of member

Author: sumitd94

constants/users.js

@@ -1,2 +1,9 @@
 const userStatusEnum = ['ooo', 'idle', 'active']
-module.exports = userStatusEnum
+const ROLES = {
+  ADMIN: 'admin',
+  APPOWNER: 'app_owner',
+  DEFAULT: 'default',
+  MEMBER: 'member',
+  SUPERUSER: 'super_user'
+}
+module.exports = { userStatusEnum, ROLES }

controllers/members.js

@@ -1,4 +1,5 @@
-const { fetchMembers, migrateUsers, deleteIsMemberProperty } = require('../models/members')
+const { ROLES } = require('../constants/users')
+const { fetchUsers, migrateUsers, deleteIsMemberProperty, fetchUsersWithRole } = require('../models/members')
 const tasks = require('../models/tasks')
 
 /**
@@ -10,11 +11,11 @@ const tasks = require('../models/tasks')
 
 const getMembers = async (req, res) => {
   try {
-    const allMembers = await fetchMembers()
+    const allUsers = await fetchUsers()
 
     return res.json({
-      message: allMembers.length ? 'Members returned successfully!' : 'No member found',
-      members: allMembers
+      message: allUsers.length ? 'Members returned successfully!' : 'No member found',
+      members: allUsers
     })
   } catch (error) {
     logger.error(`Error while fetching all members: ${error}`)
@@ -31,9 +32,9 @@ const getMembers = async (req, res) => {
 
 const getIdleMembers = async (req, res) => {
   try {
-    const allMembers = await fetchMembers()
+    const onlyMembers = await fetchUsersWithRole(ROLES.MEMBER)
     const taskParticipants = await tasks.fetchActiveTaskMembers()
-    const idleMembers = allMembers?.filter(({ id }) => !taskParticipants.has(id))
+    const idleMembers = onlyMembers?.filter(({ id }) => !taskParticipants.has(id))
     const idleMemberUserNames = idleMembers?.map((member) => member.username)
 
     return res.json({

middlewares/validators/user.js

@@ -1,5 +1,5 @@
 const joi = require('joi')
-const userStatusEnum = require('../../constants/users')
+const { userStatusEnum } = require('../../constants/users')
 
 const updateUser = async (req, res, next) => {
   const schema = joi.object().keys({

models/members.js

@@ -7,11 +7,11 @@ const firestore = require('../utils/firestore')
 const userModel = firestore.collection('users')
 
 /**
- * Fetches the data about our members
+ * Fetches the data about our users
  * @return {Promise<userModel|Array>}
  */
 
-const fetchMembers = async () => {
+const fetchUsers = async () => {
   try {
     const snapshot = await userModel.get()
 
@@ -98,8 +98,37 @@ const deleteIsMemberProperty = async () => {
   }
 }
 
+/**
+ * Fetches the data about our users with roles
+ * @return {Promise<userModel|Array>}
+ */
+
+const fetchUsersWithRole = async (role) => {
+  try {
+    const snapshot = await userModel.where(`roles.${role}`, '==', true).get()
+    const onlyMembers = []
+
+    if (!snapshot.empty) {
+      snapshot.forEach((doc) => {
+        onlyMembers.push({
+          id: doc.id,
+          ...doc.data(),
+          phone: undefined,
+          email: undefined,
+          tokens: undefined
+        })
+      })
+    }
+    return onlyMembers
+  } catch (err) {
+    logger.error('Error retrieving members data with roles of member', err)
+    throw err
+  }
+}
+
 module.exports = {
-  fetchMembers,
+  fetchUsers,
   migrateUsers,
-  deleteIsMemberProperty
+  deleteIsMemberProperty,
+  fetchUsersWithRole
 }