From ef946c9f8250a1cc70bdc08b192b4f0cc37c4eb3 Mon Sep 17 00:00:00 2001 From: tomvahl Date: Fri, 20 Mar 2020 15:57:16 +0100 Subject: [PATCH] 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()); }