changes based on comments

Author: harshith-venkatesh

constants/users.js

@@ -1,2 +1,8 @@
 const userStatusEnum = ['ooo', 'idle', 'active']
-module.exports = userStatusEnum
+const ROLES = {
+  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, fetchOnlyMembers } = require('../models/members')
+const { ROLES } = require('../constants/users')
+const { fetchUsers, migrateUsers, deleteIsMemberProperty, fetchUsersWithRole } = require('../models/members')
 const tasks = require('../models/tasks')
 
 /**
@@ -10,7 +11,7 @@ const tasks = require('../models/tasks')
 
 const getMembers = async (req, res) => {
   try {
-    const allMembers = await fetchMembers()
+    const allMembers = await fetchUsers()
 
     return res.json({
       message: allMembers.length ? 'Members returned successfully!' : 'No member found',
@@ -31,7 +32,7 @@ const getMembers = async (req, res) => {
 
 const getIdleMembers = async (req, res) => {
   try {
-    const onlyMembers = await fetchOnlyMembers()
+    const onlyMembers = await fetchUsersWithRole(ROLES.MEMBER)
     const taskParticipants = await tasks.fetchActiveTaskMembers()
     const idleMembers = onlyMembers?.filter(({ id }) => !taskParticipants.has(id))
     const idleMemberUserNames = idleMembers?.map((member) => member.username)

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()
 
@@ -99,13 +99,13 @@ const deleteIsMemberProperty = async () => {
 }
 
 /**
- * Fetches the data about our members with role member:true
+ * Fetches the data about our users with roles
  * @return {Promise<userModel|Array>}
  */
 
-const fetchOnlyMembers = async () => {
+const fetchUsersWithRole = async (role) => {
   try {
-    const snapshot = await userModel.where('roles.member', '==', true).get()
+    const snapshot = await userModel.where(`roles.${role}`, '==', true).get()
     const onlyMembers = []
 
     if (!snapshot.empty) {
@@ -127,8 +127,8 @@ const fetchOnlyMembers = async () => {
 }
 
 module.exports = {
-  fetchMembers,
+  fetchUsers,
   migrateUsers,
   deleteIsMemberProperty,
-  fetchOnlyMembers
+  fetchUsersWithRole
 }