From b6c013e2546e69c766e44bfca3b4491c7f1bba04 Mon Sep 17 00:00:00 2001 From: tomvahl Date: Fri, 20 Mar 2020 15:09:27 +0100 Subject: [PATCH 1/3] fix GroupDelete Co-Authored-By: Talha Caliskan --- .../java/mops/gruppen2/config/Gruppen2Config.java | 11 +++++++---- .../mops/gruppen2/controller/Gruppen2Controller.java | 10 +++++++--- src/main/resources/templates/detailsMember.html | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/mops/gruppen2/config/Gruppen2Config.java b/src/main/java/mops/gruppen2/config/Gruppen2Config.java index 4b60fa5..6f44779 100644 --- a/src/main/java/mops/gruppen2/config/Gruppen2Config.java +++ b/src/main/java/mops/gruppen2/config/Gruppen2Config.java @@ -8,8 +8,11 @@ import org.springframework.context.annotation.Configuration; @Configuration public class Gruppen2Config { - @Autowired - GroupService groupService; - @Autowired - EventService eventService; + final GroupService groupService; + final EventService eventService; + + public Gruppen2Config(GroupService groupService, EventService eventService) { + this.groupService = groupService; + this.eventService = eventService; + } } diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index bc8ef88..8406175 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -43,15 +43,15 @@ public class Gruppen2Controller { private final UserService userService; private final ControllerService controllerService; private final InviteLinkRepositoryService inviteLinkRepositoryService; - @Autowired - Gruppen2Config gruppen2Config; + private final Gruppen2Config gruppen2Config; - public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService) { + public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService, Gruppen2Config gruppen2Config) { this.keyCloakService = keyCloakService; this.groupService = groupService; this.userService = userService; this.controllerService = controllerService; this.inviteLinkRepositoryService = inviteLinkRepositoryService; + this.gruppen2Config = gruppen2Config; } /** @@ -258,6 +258,10 @@ public class Gruppen2Controller { public String pDeleteGroup(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId){ Account account = keyCloakService.createAccountFromPrincipal(token); User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); + Group group = userService.getGroupById(groupId); + if(group.getRoles().get(user.getId()) != Role.ADMIN ){ + return "error"; + } controllerService.deleteGroupEvent(user.getId(), groupId); return "redirect:/gruppen2/"; } diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 157649a..3a6ca19 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -61,7 +61,7 @@
From ef946c9f8250a1cc70bdc08b192b4f0cc37c4eb3 Mon Sep 17 00:00:00 2001 From: tomvahl Date: Fri, 20 Mar 2020 15:57:16 +0100 Subject: [PATCH 2/3] automatic group size for ogra Co-Authored-By: Talha Caliskan --- src/main/java/mops/gruppen2/controller/Gruppen2Controller.java | 3 +++ src/main/java/mops/gruppen2/domain/event/AddUserEvent.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 8406175..59e5efe 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -97,6 +97,9 @@ public class Gruppen2Controller { if (!file.isEmpty()) { try { userList = CsvService.read(file.getInputStream()); + if(userList.size() > userMaximum){ + userMaximum = Long.valueOf(userList.size()) + userMaximum; + } } catch (UnrecognizedPropertyException | CharConversionException ex) { throw new WrongFileException(file.getOriginalFilename()); } diff --git a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java index 9491355..65fc910 100644 --- a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java @@ -36,7 +36,7 @@ public class AddUserEvent extends Event { if (group.getMembers().contains(user)) { throw new UserAlreadyExistsException(this.getClass().toString()); } - //andere exception + if (group.getMembers().size() == group.getUserMaximum()){ throw new GroupFullException(this.getClass().toString()); } From 755f76ef58d932d7e162c761b6172d2153b9aedf Mon Sep 17 00:00:00 2001 From: tomvahl Date: Fri, 20 Mar 2020 16:06:11 +0100 Subject: [PATCH 3/3] Update createOrga.html Co-Authored-By: Talha Caliskan --- src/main/resources/templates/createOrga.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/createOrga.html b/src/main/resources/templates/createOrga.html index d06692a..ca55778 100644 --- a/src/main/resources/templates/createOrga.html +++ b/src/main/resources/templates/createOrga.html @@ -54,7 +54,7 @@
+ type="number" min="1" max="10000">