christoph/lecture-professional-software-development
1
Fork 0
Code Activity

merged with master

Browse Source
This commit is contained in:
[Mahgs]
2020-03-26 15:11:12 +01:00
parent c62524aa8a
commit 25595c9380
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/mops/gruppen2/controller/WebController.java
View File

@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -85,7 +86,7 @@ public class WebController {
@RequestParam("userMaximum") Long userMaximum, @RequestParam("userMaximum") Long userMaximum,
@RequestParam(value = "maxInfiniteUsers", required = false) Boolean maxInfiniteUsers, @RequestParam(value = "maxInfiniteUsers", required = false) Boolean maxInfiniteUsers,
@RequestParam(value = "parent", required = false) String parent, @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); Account account = keyCloakService.createAccountFromPrincipal(token);
UUID parentUUID = controllerService.getUUID(parent); UUID parentUUID = controllerService.getUUID(parent);

2
src/main/java/mops/gruppen2/service/ControllerService.java
View File

@ -74,7 +74,7 @@ public class ControllerService {
return groupId; 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); userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum);
List<User> newUsers = readCsvFile(file); List<User> newUsers = readCsvFile(file);