mindol1004/reactive-timesheet-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes issue with the cascading by the delete of user

Browse Source
This commit is contained in:
szsa
2022-03-27 20:51:14 +02:00
parent 82fe7e5e74
commit b093715845
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/szymonsawicki/reactivetimesheetapp/application/service/UserService.java
View File

@@ -55,20 +55,25 @@ public class UserService {
public Mono<GetUserDto> deleteUser(String userId) {
return userRepository
.findById(userId)
.flatMap(user -> {
// when teamId is not null then list of members in related team will be updated
String teamId = UserUtils.toTeamId.apply(user);
.flatMap(user -> userRepository.delete(userId)
.then(deleteMemberFromTeam(user)))
.switchIfEmpty(Mono.error(new UserServiceException("cannot find user to delete")));
}
private Mono<GetUserDto> deleteMemberFromTeam(User member) {
var teamId = UserUtils.toTeamId.apply(member);
if (teamId != null) {
return teamRepository
.findById(teamId)
.flatMap(team -> {
TeamUtils.toMembers.apply(team).remove(user);
return teamRepository.save(team);
});
TeamUtils.toMembers.apply(team).remove(member);
return teamRepository.save(team)
.flatMap(t -> Mono.just(member.toGetUserDto()));
})
.then(userRepository.delete(userId))
.then(Mono.just(user.toGetUserDto());
.switchIfEmpty(Mono.error(new UserServiceException("cannot find user to delete")));
.switchIfEmpty(Mono.error(new UserServiceException("cannot find user's team")));
}
return Mono.just(member.toGetUserDto());
}
}