Skip to content

Fix to make member remain as team lead when their role is changed. #256

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

Merged
JamesBirni merged 1 commit into from
Apr 1, 2025
Merged

Fix to make member remain as team lead when their role is changed. #256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 19 additions & 4 deletions backend/task-manager/src/main/java/com/example/task_manager/service/AdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.example.task_manager.service;

import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -128,7 +129,7 @@ public AdminDTO promoteToAdmin(int teamMemberId) {
.orElseThrow(() -> new RuntimeException("Team Member not found with ID: " + teamMemberId));

// Find all teams led by this member
removeIfTeamLead(teamMemberId);
List<Team> teamsMemberLeads = removeAndSaveTeamIfTeamLead(teamMemberId);

// Extract info
String oldName = teamMember.getUserName();
Expand Down Expand Up @@ -166,12 +167,17 @@ public AdminDTO promoteToAdmin(int teamMemberId) {
isAssigned.setTeamMember(savedAdmin);
}

for (Team team : teamsMemberLeads) {
team.setTeamLead(savedAdmin);
}

for (IsMemberOf isMemberOf : newMemberships) {
isMemberOf.setTeamMember(savedAdmin);
}

isAssignedRepository.saveAll(newAssignments);
isMemberOfRepository.saveAll(newMemberships);
teamRepository.saveAll(teamsMemberLeads);

return convertToDTO(savedAdmin);
}
Expand All @@ -182,7 +188,7 @@ public TeamMemberDTO demoteToTeamMember(int adminId) {
.orElseThrow(() -> new RuntimeException("Admin not found with ID: " + adminId));

// Find all teams led by this member
removeIfTeamLead(adminId);
List<Team> teamsMemberLeads = removeAndSaveTeamIfTeamLead(adminId);

// Extract info
String oldName = admin.getUserName();
Expand Down Expand Up @@ -221,25 +227,34 @@ public TeamMemberDTO demoteToTeamMember(int adminId) {
isAssigned.setTeamMember(savedTeamMember);
}

for (Team team : teamsMemberLeads) {
team.setTeamLead(savedTeamMember);
}

for (IsMemberOf isMemberOf : newMemberships) {
isMemberOf.setTeamMember(savedTeamMember);
}

isAssignedRepository.saveAll(newAssignments);
isMemberOfRepository.saveAll(newMemberships);

teamRepository.saveAll(teamsMemberLeads);

return convertToDTO(savedTeamMember);
}

private void removeIfTeamLead(int memberId) {
private List<Team> removeAndSaveTeamIfTeamLead(int memberId) {
List<Team> teamsMemberLeads = new ArrayList<>();
List<Team> teamsLed = teamRepository.findByTeamLead_AccountId(memberId);

for (Team team : teamsLed) {
teamsMemberLeads.add(team);
team.setTeamLead(null);
}

teamRepository.saveAll(teamsLed);
teamRepository.flush();

return teamsMemberLeads;
}

private void clearMemberRelations(TeamMember member) {
Expand Down