2 Commits

Author	SHA1	Message	Date
Christoph	1c5139da8c	Merge refactor into error-handling + fix merge errors ... Co-authored-by: [Mahgs] <maxoerter@gmx.de> Co-authored-by: Christoph <tobi@urpost.de>	2020-03-18 23:45:07 +01:00
Christoph	849c94481c	Merge branch 'refactoring' into error-handling ... # 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	2020-03-18 23:40:39 +01:00