diff --git a/.gitignore b/.gitignore index 5d7b69f..3ed356b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ out/ ### VS Code ### .vscode/ +.floo +.flooignore diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index f1bc871..f214d1c 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -125,6 +125,9 @@ public class Gruppen2Controller { public String joinGroup(KeycloakAuthenticationToken token, Model model, @RequestParam(value = "id") Long id) throws EventException { model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); Account account = keyCloakService.createAccountFromPrincipal (token); + User user = new User(account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail()); + Group group = userService.getGroupById(id); + if(group.getMembers().contains(user)) return "errorRenameLater"; //hier soll eigentlich auf die bereits beigetretene Gruppe weitergeleitet werden controllerService.addUser(account,id); return "redirect:/gruppen2/"; }