From 57df0263d4b91132780931f9029b49fcd20582b1 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Wed, 25 Mar 2020 16:52:43 +0100 Subject: [PATCH] refactor ValidationService --- src/main/java/mops/gruppen2/controller/WebController.java | 1 + .../domain/event/UpdateGroupDescriptionEvent.java | 2 +- .../mops/gruppen2/domain/event/UpdateGroupTitleEvent.java | 2 +- .../java/mops/gruppen2/service/ValidationService.java | 8 ++++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java index 57ef550..4db0721 100644 --- a/src/main/java/mops/gruppen2/controller/WebController.java +++ b/src/main/java/mops/gruppen2/controller/WebController.java @@ -46,6 +46,7 @@ public class WebController { * @param model tolles model * @return index.html */ + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"}) @GetMapping("") public String index(KeycloakAuthenticationToken token, Model model) throws EventException { diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java index 1510213..4eae31f 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java @@ -20,7 +20,7 @@ public class UpdateGroupDescriptionEvent extends Event { public UpdateGroupDescriptionEvent(UUID groupId, String userId, String newGroupDescription) { super(groupId, userId); - this.newGroupDescription = newGroupDescription; + this.newGroupDescription = newGroupDescription.trim(); } @Override diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java index 14d59e3..b3a57ba 100644 --- a/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java @@ -20,7 +20,7 @@ public class UpdateGroupTitleEvent extends Event { public UpdateGroupTitleEvent(UUID groupId, String userId, String newGroupTitle) { super(groupId, userId); - this.newGroupTitle = newGroupTitle; + this.newGroupTitle = newGroupTitle.trim(); } @Override diff --git a/src/main/java/mops/gruppen2/service/ValidationService.java b/src/main/java/mops/gruppen2/service/ValidationService.java index 9b830d5..0f4b867 100644 --- a/src/main/java/mops/gruppen2/service/ValidationService.java +++ b/src/main/java/mops/gruppen2/service/ValidationService.java @@ -123,16 +123,20 @@ public class ValidationService { * @param userMaximum */ public void checkFields(String description, String title, Long userMaximum, Boolean maxInfiniteUsers) { - if (description == null) { + if (description == null || description.trim().length() == 0) { throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben"); } - if (title == null) { + if (title == null || title.trim().length() == 0) { throw new BadParameterException("Der Titel wurde nicht korrekt angegeben"); } if (userMaximum == null && maxInfiniteUsers == null) { throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben"); } + + if (userMaximum < 1 || userMaximum > 10000L) { + throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben"); + } } }