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

fixed exeptionname

Browse Source 
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
This commit is contained in:
Lukas Ettel
2020-03-19 16:42:27 +01:00
parent 89a40cb64b
commit 5917d9b0fc
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -6,7 +6,7 @@ import mops.gruppen2.domain.Role;
import mops.gruppen2.domain.User; import mops.gruppen2.domain.User;
import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.exception.EventException;
import mops.gruppen2.domain.exception.GroupNotFoundException; import mops.gruppen2.domain.exception.GroupNotFoundException;
import mops.gruppen2.domain.exception.NoAdminAfterActionExeption; import mops.gruppen2.domain.exception.NoAdminAfterActionException;
import mops.gruppen2.security.Account; import mops.gruppen2.security.Account;
import mops.gruppen2.service.ControllerService; import mops.gruppen2.service.ControllerService;
import mops.gruppen2.service.CsvService; import mops.gruppen2.service.CsvService;
@ -234,7 +234,7 @@ public class Gruppen2Controller {
Account account = keyCloakService.createAccountFromPrincipal(token); Account account = keyCloakService.createAccountFromPrincipal(token);
if (userId.equals(account.getName())) { if (userId.equals(account.getName())) {
if (controllerService.passIfLastAdmin(account, groupId)){ if (controllerService.passIfLastAdmin(account, groupId)){
throw new NoAdminAfterActionExeption("Du otto bist letzter Admin"); throw new NoAdminAfterActionException("Du otto bist letzter Admin");
} }
controllerService.updateRole(userId, groupId); controllerService.updateRole(userId, groupId);
return "redirect:/gruppen2/details/" + groupId; return "redirect:/gruppen2/details/" + groupId;

4
src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionExeption.java → src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionException.java
View File

@ -2,9 +2,9 @@ package mops.gruppen2.domain.exception;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
public class NoAdminAfterActionExeption extends EventException { public class NoAdminAfterActionException extends EventException {
public NoAdminAfterActionExeption (String info) { public NoAdminAfterActionException(String info) {
super(HttpStatus.INTERNAL_SERVER_ERROR, "Nach dieser Aktion hätte die Gruppe keinen Admin mehr", info); super(HttpStatus.INTERNAL_SERVER_ERROR, "Nach dieser Aktion hätte die Gruppe keinen Admin mehr", info);
} }
} }

3
src/main/java/mops/gruppen2/service/ControllerService.java
View File

@ -13,12 +13,9 @@ import mops.gruppen2.domain.event.UpdateGroupDescriptionEvent;
import mops.gruppen2.domain.event.UpdateGroupTitleEvent; import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
import mops.gruppen2.domain.event.UpdateRoleEvent; import mops.gruppen2.domain.event.UpdateRoleEvent;
import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.exception.EventException;
import mops.gruppen2.domain.exception.NoAdminAfterActionExeption;
import mops.gruppen2.domain.exception.UserNotFoundException; import mops.gruppen2.domain.exception.UserNotFoundException;
import mops.gruppen2.security.Account; import mops.gruppen2.security.Account;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import springfox.documentation.schema.Entry;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;