christoph/lecture-professional-software-development
1
Fork 0
Code Activity

fix UpdateRoleEvent and DeleteUserEvent

Browse Source 
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
This commit is contained in:
killerber4t
2020-03-16 16:50:32 +01:00
parent abd99f6a5e
commit 6991a18405
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mops/gruppen2/domain/Group.java
View File

@ -21,7 +21,7 @@ public class Group {
private long id; private long id;
private String title; private String title;
private String description; private String description;
public List<User> members; private final List<User> members;
private final Map<String, Role> roles; private final Map<String, Role> roles;
private GroupType type; private GroupType type;

2
src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
View File

@ -21,7 +21,7 @@ public class DeleteUserEvent extends Event {
for (User user : group.getMembers()) { for (User user : group.getMembers()) {
if (user.getUser_id().equals(this.user_id)) { if (user.getUser_id().equals(this.user_id)) {
group.members.remove(user); group.members.remove(user);
group.getRoles().remove(user); group.getRoles().remove(user_id);
return; return;
} }
} }

17
src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
View File

@ -25,22 +25,7 @@ public class UpdateRoleEvent extends Event {
} }
public void apply(Group group) { public void apply(Group group) {
User user = new User(user_id, null, null, null); group.getRoles().put(this.user_id, this.newRole);
Optional<User> userOptional = group.getMembers().stream()
.filter(u -> u.getUser_id().equals(user_id))
.findFirst();
if (userOptional.isPresent()) {
user = userOptional.get();
} else {
}
if (group.getRoles().containsKey(user) && newRole == Role.MEMBER) {
group.getRoles().remove(user);
} else {
group.getRoles().put(user.getUser_id(), newRole);
}
} }
} }