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

Merge branch 'refactoring' into error-handling

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
#	src/main/java/mops/gruppen2/domain/Group.java
#	src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
#	src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/Event.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
#	src/main/java/mops/gruppen2/domain/exception/EventException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java
#	src/main/java/mops/gruppen2/domain/exception/NoValueException.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/main/java/mops/gruppen2/service/UserService.java
#	src/main/resources/templates/errorRenameLater.html
This commit is contained in:
Christoph
2020-03-18 23:40:39 +01:00
parent b1460abe48 e9bab1bf3f
commit 849c94481c
57 changed files with 741 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,29 +3,28 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Exceptions.UserNotFoundException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.exception.UserNotFoundException;
/**
* Aktualisiert die Gruppenrolle eines Teilnehmers.
*/
@Getter
@AllArgsConstructor
@NoArgsConstructor
@NoArgsConstructor // For Jackson
public class UpdateRoleEvent extends Event {
private Role newRole;
public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {
super(group_id, user_id);
public UpdateRoleEvent(Long groupId, String userId, Role newRole) {
super(groupId, userId);
this.newRole = newRole;
}
@Override
public void applyEvent(Group group) throws UserNotFoundException {
if (group.getRoles().containsKey(user_id)) {
group.getRoles().put(this.user_id, this.newRole);
if (group.getRoles().containsKey(this.userId)) {
group.getRoles().put(this.userId, this.newRole);
}
throw new UserNotFoundException(this.getClass().toString());