Skip to content

Yu Yan - Take over PR #1748 - fix: Removed userId of deleted users from task->resources and teams->members #2149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yany960 wants to merge 7 commits into
base: development
Choose a base branch
from
Open

Yu Yan - Take over PR #1748 - fix: Removed userId of deleted users from task->resources and teams->members #2149

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3413487
fix: removed userId of deleted users from task->resources and teams-m…
ujjwalbPipKcK Sep 24, 2025
59669f5
fix: convert userId to ObjectId for proper MongoDB matching when dele…
yany0309 Apr 3, 2026
e225073
fix: add error handling for ObjectId conversion to prevent 500 errors
yany0309 Apr 3, 2026
2667e9d
fix(user-profile): clean deleted users from tasks and teams
yany0309 Apr 12, 2026
9aa347d
fix(user-profile): remove deleted users with raw id matching
yany0309 May 1, 2026
2a155b2
fix(user-profile): avoid logging bio status values
yany0309 May 1, 2026
50dad0b
chore: trigger sonar analysis
yany0309 May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/controllers/userProfileController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
const yearMonthDayDateValidator = require('../utilities/yearMonthDayDateValidator');
const cacheClosure = require('../utilities/nodeCache');
const followUp = require('../models/followUp');
const task = require('../models/task');
const team = require('../models/team');
const HGNFormResponses = require('../models/hgnFormResponse');
const userService = require('../services/userService');
const { hasPermission, canRequestorUpdateUser } = require('../utilities/permissions');
Expand Down Expand Up @@ -1427,6 +1429,25 @@
await UserProfile.deleteOne({ _id: userId });
// delete followUp for deleted user
await followUp.findOneAndDelete({ userId });
// Validate and convert userId to ObjectId for proper matching in MongoDB
let userIdObject;
try {
userIdObject = new mongoose.Types.ObjectId(userId);
} catch (idError) {
// If conversion fails, userId might already be an ObjectId or invalid
logger.logInfo(`Invalid userId format for ObjectId conversion: ${userId}`);
userIdObject = userId;
}

Check warning on line 1440 in src/controllers/userProfileController.js

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Handle this exception or don't catch it at all. 


See more on https://sonarcloud.io/project/issues?id=OneCommunityGlobal_HGNRest&issues=AZ1RZQ0qHkM_Q1xd4d4g&open=AZ1RZQ0qHkM_Q1xd4d4g&pullRequest=2149
// delete user from task-resources
await task.updateMany(
{ 'resources.userID': userIdObject },
{ $pull: { resources: { userID: userIdObject } } },
);
// delete user from teams-members
await team.updateMany(
{ 'members.userId': userIdObject },
{ $pull: { members: { userId: userIdObject } } },
);
res.status(200).send({ message: 'Executed Successfully' });
auditIfProtectedAccountUpdated({
requestorId: req.body.requestor.requestorId,
Expand Down
Loading