Merge pull request #2225 from OneCommunityGlobal/Sayali-Fix-AllTime-Members-Backend

Sayali: add projectHistory tracking and getAllTimeprojectMembership endpoint

Author: one-community

src/controllers/projectController.js

@@ -5,7 +5,7 @@ const timeentry = require('../models/timeentry');
 const task = require('../models/task');
 const wbs = require('../models/wbs');
 const userProfile = require('../models/userProfile');
-// const { hasPermission } = require('../utilities/permissions');
+const { hasPermission } = require('../utilities/permissions');
 const helper = require('../utilities/permissions');
 const escapeRegex = require('../utilities/escapeRegex');
 const logger = require('../startup/logger');
@@ -492,7 +492,6 @@ const projectController = function (Project) {
    */
   const getprojectMembership = async function (req, res) {
     try {
-      // GETs usually have no body; prefer req.user populated by your auth middleware.
       const requestor =
         (req.user && (req.user._id || req.user.id)) || req.query?.requestor || req.body?.requestor;
 
@@ -514,7 +513,7 @@ const projectController = function (Project) {
 
       const results = await userProfile
         .find(
-          { projects: projectId },
+          { projects: mongoose.Types.ObjectId(projectId) },
           { firstName: 1, lastName: 1, profilePic: 1, _id: 1, isActive: 1 },
         )
         .sort({ firstName: 1, lastName: 1 });
@@ -525,6 +524,32 @@ const projectController = function (Project) {
       return res.status(500).send('Error fetching project members');
     }
   };
+  const getAllTimeprojectMembership = async function (req, res) {
+    const { projectId } = req.params;
+    if (!mongoose.Types.ObjectId.isValid(projectId)) {
+      res.status(400).send('Invalid request');
+      return;
+    }
+    const requestor =
+      (req.user && (req.user._id || req.user.id)) || req.query?.requestor || req.body?.requestor;
+    const getProjMembers = await hasPermission(requestor, 'getProjectMembers');
+    const postTask = await hasPermission(requestor, 'postTask');
+    const updateTask = await hasPermission(requestor, 'updateTask');
+    const suggestTask = await hasPermission(requestor, 'suggestTask');
+    const getId = getProjMembers || postTask || updateTask || suggestTask;
+    userProfile
+      .find(
+        { projectHistory: projectId },
+        { firstName: 1, lastName: 1, isActive: 1, profilePic: 1, _id: getId },
+      )
+      .sort({ firstName: 1, lastName: 1 })
+      .then((results) => {
+        res.status(200).send(results);
+      })
+      .catch((error) => {
+        res.status(500).send(error);
+      });
+  };
 
   /**
    * Get project members summary (fast version)
@@ -555,7 +580,6 @@ const projectController = function (Project) {
         res.status(200).json(results);
       })
       .catch((error) => {
-        console.error('Summary query error:', error);
         res.status(500).send(error);
       });
   };
@@ -667,6 +691,7 @@ const projectController = function (Project) {
     getprojectMembershipSummary,
     searchProjectMembers,
     getProjectsWithActiveUserCounts,
+    getAllTimeprojectMembership,
   };
 };
 

src/controllers/userProfileController.js

@@ -501,6 +501,18 @@ const createControllerMethods = function (UserProfile, Project, cache) {
 
       const addedProjects = newProjects.filter((id) => !oldProjects.includes(id));
       const removedProjects = oldProjects.filter((id) => !newProjects.includes(id));
+      // update the projects history
+      const changedProjectHistoryIds = Array.from(new Set(oldProjects.concat(newProjects))).map(
+        (id) => mongoose.Types.ObjectId(id),
+      );
+
+      const existingProjectIds = new Set(record.projectHistory.map((id) => id.toString()));
+
+      const newProjectIds = changedProjectHistoryIds.filter(
+        (id) => !existingProjectIds.has(id.toString()),
+      );
+
+      record.projectHistory.push(...newProjectIds);
       const changedProjectIds = [...addedProjects, ...removedProjects].map((id) =>
         mongoose.Types.ObjectId(id),
       );
@@ -2857,6 +2869,25 @@ const createControllerMethods = function (UserProfile, Project, cache) {
       return res.status(500).send({ error: 'Internal server error' });
     }
   };
+  const getProjectHistory = async function (req, res) {
+    try {
+      const { userId } = req.params;
+      const user = await UserProfile.findById(userId);
+      const projectHistory = [...user.projectHistory];
+      res.status(200).send(projectHistory);
+    } catch (error) {
+      res.status(500).send(error);
+    }
+  };
+
+  const postClearProjectHistory = async function (req, res) {
+    try {
+      const result = await UserProfile.updateMany({}, { $set: { projectHistory: [] } });
+      res.status(200).send({ message: 'Project history cleared for all users', result });
+    } catch (error) {
+      res.status(500).send({ message: 'Error clearing project history', error });
+    }
+  };
 
   const getAllMembersSkillsAndContact = async function (req, res) {
     try {
@@ -3068,6 +3099,8 @@ const createControllerMethods = function (UserProfile, Project, cache) {
     updateProfileImageFromWebsite,
     getUserByAutocomplete,
     getUserProfileBasicInfo,
+    getProjectHistory,
+    postClearProjectHistory,
     updateUserInformation,
     getAllMembersSkillsAndContact,
     replaceTeamCodeForUsers,

src/models/userProfile.js

@@ -104,7 +104,7 @@ const userProfileSchema = new Schema({
   personalLinks: [{ _id: Schema.Types.ObjectId, Name: String, Link: { type: String } }],
   adminLinks: [{ _id: Schema.Types.ObjectId, Name: String, Link: String }],
   teams: [{ type: mongoose.SchemaTypes.ObjectId, ref: 'team' }],
-  projects: [{ type: mongoose.SchemaTypes.ObjectId, ref: 'project' }],
+  projectHistory: [{ type: mongoose.SchemaTypes.ObjectId, ref: 'project' }],
   badgeCollection: [
     {
       badge: { type: mongoose.SchemaTypes.ObjectId, ref: 'badge' },

src/routes/projectRouter.js

@@ -25,6 +25,10 @@ const routes = function (project) {
     .post(controller.assignProjectToUsers)
     .get(controller.getprojectMembership);
 
+  projectRouter
+    .route('/project/:projectId/alltimeusers/')
+    .get(controller.getAllTimeprojectMembership);
+
   projectRouter
     .route('/project/:projectId/users/summary')
     .get(controller.getprojectMembershipSummary);

src/routes/userProfileRouter.js

@@ -29,6 +29,8 @@ const routes = function (userProfile, project) {
     .get(param('name').exists(), controller.searchUsersByName);
 
   userProfileRouter.route('/userProfile/update').patch(controller.updateUserInformation);
+  userProfileRouter.route('/userProfile/:userId/projectHistory/').get(controller.getProjectHistory);
+  userProfileRouter.route('/clearAllProjectHistory/').post(controller.postClearProjectHistory);
   userProfileRouter.route('/userProfile/basicInfo').get(controller.getUserProfileBasicInfo);
 
   // Endpoint to retrieve basic user profile information after verifying access permission based on the request source.