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

a

Browse Source
This commit is contained in:
[Mahgs]
2020-03-26 15:38:39 +01:00
parent 25595c9380
commit 41e035d901
3 changed files with 5 additions and 6 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,7 +24,6 @@ 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;
@ -86,7 +85,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) throws IOException { @RequestParam(value = "file", required = false) MultipartFile file) {
Account account = keyCloakService.createAccountFromPrincipal(token); Account account = keyCloakService.createAccountFromPrincipal(token);
UUID parentUUID = controllerService.getUUID(parent); UUID parentUUID = controllerService.getUUID(parent);

6
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) throws IOException { public void createGroupAsOrga(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isLecture, Boolean isMaximumInfinite, Long userMaximum, UUID parent, MultipartFile file) throws EventException {
userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum); userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum);
List<User> newUsers = readCsvFile(file); List<User> newUsers = readCsvFile(file);
@ -128,12 +128,12 @@ public class ControllerService {
} }
} }
private List<User> readCsvFile(MultipartFile file) throws EventException, IOException { private List<User> readCsvFile(MultipartFile file) throws EventException {
if (!file.isEmpty()) { if (!file.isEmpty()) {
try { try {
List<User> userList = CsvService.read(file.getInputStream()); List<User> userList = CsvService.read(file.getInputStream());
return userList.stream().distinct().collect(Collectors.toList()); //filters duplicates from list return userList.stream().distinct().collect(Collectors.toList()); //filters duplicates from list
} catch (UnrecognizedPropertyException | CharConversionException ex) { } catch (IOException ex) {
logger.warning("File konnte nicht gelesen werden"); logger.warning("File konnte nicht gelesen werden");
throw new WrongFileException(file.getOriginalFilename()); throw new WrongFileException(file.getOriginalFilename());
} }

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

@ -139,7 +139,7 @@ public class EventService {
} }
/** /**
* Gibt true zurück, falls der User aktuell in der Gruppe ist, sonst false * Gibt true zurück, falls der User aktuell in der Gruppe ist, sonst false.
* @param groupId Id der Gruppe * @param groupId Id der Gruppe
* @param userId Id des zu überprüfenden Users * @param userId Id des zu überprüfenden Users
* @return true or false * @return true or false