Merge pull request #135 from hhu-propra2/fix_createGroup

Fix create group

src/main/java/mops/gruppen2/controller/WebController.java

@@ -120,11 +120,8 @@ public class WebController {
                                  @RequestParam(value = "parent", required = false) String parent) throws EventException {
 
         Account account = keyCloakService.createAccountFromPrincipal(token);
-        visibility = visibility == null;
-        maxInfiniteUsers = maxInfiniteUsers != null;
         UUID parentUUID = controllerService.getUUID(parent);
         controllerService.createGroup(account, title, description, visibility, maxInfiniteUsers, userMaximum, parentUUID);
-
         return "redirect:/gruppen2/";
     }
 

src/main/java/mops/gruppen2/domain/exception/BadParameterException.java

@@ -0,0 +1,10 @@
+package mops.gruppen2.domain.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class BadParameterException extends EventException {
+
+	public BadParameterException(String info) {
+		super(HttpStatus.INTERNAL_SERVER_ERROR, "Fehlerhafter Parameter angegeben!", info);
+	}
+}

src/main/java/mops/gruppen2/service/ControllerService.java

@@ -15,6 +15,7 @@ import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
 import mops.gruppen2.domain.event.UpdateRoleEvent;
 import mops.gruppen2.domain.event.UpdateUserMaxEvent;
 import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.BadParameterException;
 import mops.gruppen2.domain.exception.UserNotFoundException;
 import mops.gruppen2.domain.exception.WrongFileException;
 import mops.gruppen2.security.Account;
@@ -44,6 +45,26 @@ public class ControllerService {
         this.logger = Logger.getLogger("controllerServiceLogger");
     }
 
+    /**
+     * Überprüft ob alle Felder richtig gesetzt sind.
+     * @param description
+     * @param title
+     * @param userMaximum
+     */
+    private void checkFields(String description, String title, Long userMaximum ) {
+        if(description == null) {
+            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
+        }
+
+        if(title == null) {
+            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
+        }
+
+        if (userMaximum == null) {
+            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
+        }
+    }
+
     /**
      * Erzeugt eine neue Gruppe, fügt den User, der die Gruppe erstellt hat, hinzu und setzt seine Rolle als Admin fest.
      * Zudem wird der Gruppentitel und die Gruppenbeschreibung erzeugt, welche vorher der Methode übergeben wurden.
@@ -53,20 +74,27 @@ public class ControllerService {
      * @param title       Gruppentitel
      * @param description Gruppenbeschreibung
      */
-    public void createGroup(Account account, String title, String description, Boolean maxInfiniteUsers, Boolean visibility, Long userMaximum, UUID parent) throws EventException {
+    public void createGroup(Account account, String title, String description, Boolean visibility, Boolean maxInfiniteUsers, Long userMaximum, UUID parent) throws EventException {
         Visibility visibility1;
         UUID groupId = eventService.checkGroup();
 
+        maxInfiniteUsers = maxInfiniteUsers != null;
+
+
+        if(maxInfiniteUsers) {
+            userMaximum = 100000L;
+        }
+
+        checkFields(description, title, userMaximum);
+
+        visibility = visibility == null;
+
         if (visibility) {
             visibility1 = Visibility.PUBLIC;
         } else {
             visibility1 = Visibility.PRIVATE;
         }
 
-        if(maxInfiniteUsers){
-            userMaximum = 100000L;
-        }
-
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, GroupType.SIMPLE, visibility1, userMaximum);
         eventService.saveEvent(createGroupEvent);
 
@@ -78,9 +106,13 @@ public class ControllerService {
 
     public void createOrga(Account account, String title, String description, Boolean visibility, Boolean lecture, Boolean maxInfiniteUsers, Long userMaximum, UUID parent, MultipartFile file) throws EventException, IOException {
         List<User> userList = new ArrayList<>();
-        if (userMaximum == null) {
+        maxInfiniteUsers = maxInfiniteUsers != null;
+        if(maxInfiniteUsers) {
             userMaximum = 100000L;
         }
+
+        checkFields(description, title, userMaximum);
+
         if (!file.isEmpty()) {
             try {
                 userList = CsvService.read(file.getInputStream());
@@ -94,7 +126,6 @@ public class ControllerService {
         }
         visibility = visibility == null;
         lecture = lecture != null;
-        maxInfiniteUsers = maxInfiniteUsers != null;
         Visibility visibility1;
         UUID groupId = eventService.checkGroup();
         if (visibility) {
@@ -110,11 +141,6 @@ public class ControllerService {
             groupType = GroupType.SIMPLE;
         }
 
-
-        if(maxInfiniteUsers){
-            userMaximum = 100000L;
-        }
-
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, groupType, visibility1, userMaximum);
         eventService.saveEvent(createGroupEvent);