From 25595c9380fbbb4b1f98ce05c7f45b14017a2c75 Mon Sep 17 00:00:00 2001 From: "[Mahgs]" Date: Thu, 26 Mar 2020 15:11:12 +0100 Subject: [PATCH] merged with master --- src/main/java/mops/gruppen2/controller/WebController.java | 3 ++- src/main/java/mops/gruppen2/service/ControllerService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java index 74b3cc6..80c7a2a 100644 --- a/src/main/java/mops/gruppen2/controller/WebController.java +++ b/src/main/java/mops/gruppen2/controller/WebController.java @@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.security.RolesAllowed; import javax.servlet.http.HttpServletRequest; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -85,7 +86,7 @@ public class WebController { @RequestParam("userMaximum") Long userMaximum, @RequestParam(value = "maxInfiniteUsers", required = false) Boolean maxInfiniteUsers, @RequestParam(value = "parent", required = false) String parent, - @RequestParam(value = "file", required = false) MultipartFile file) { + @RequestParam(value = "file", required = false) MultipartFile file) throws IOException { Account account = keyCloakService.createAccountFromPrincipal(token); UUID parentUUID = controllerService.getUUID(parent); diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index cb69539..d23c70c 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -74,7 +74,7 @@ public class ControllerService { return groupId; } - public void createGroupAsOrga(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isLecture, Boolean isMaximumInfinite, Long userMaximum, UUID parent, MultipartFile file) { + public void createGroupAsOrga(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isLecture, Boolean isMaximumInfinite, Long userMaximum, UUID parent, MultipartFile file) throws IOException { userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum); List newUsers = readCsvFile(file);