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

refactor createOrga

Browse Source 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
This commit is contained in:
AndiBuls
2020-03-25 16:30:22 +01:00
parent 5736de146d
commit 95e3c38dd9
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import static mops.gruppen2.domain.Role.ADMIN; import static mops.gruppen2.domain.Role.ADMIN;
@ -92,23 +93,16 @@ public class ControllerService {
} }
public void createOrga(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isLecture, Boolean isMaximumInfinite, Long userMaximum, UUID parent, MultipartFile file) throws EventException, IOException { public void createOrga(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isLecture, Boolean isMaximumInfinite, Long userMaximum, UUID parent, MultipartFile file) throws EventException, IOException {
List<User> userList = new ArrayList<>();
userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum); userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum);
checkFields(description, title, userMaximum); checkFields(description, title, userMaximum);
if (!file.isEmpty()) { List<User> userList = readCsvFile(file);
try {
userList = CsvService.read(file.getInputStream()); if (userList.size() > userMaximum) {
if (userList.size() > userMaximum) { userMaximum = (long) userList.size() + 1;
userMaximum = (long) userList.size() + userMaximum;
}
} catch (UnrecognizedPropertyException | CharConversionException ex) {
logger.warning("File konnte nicht gelesen werden");
throw new WrongFileException(file.getOriginalFilename());
}
} }
UUID groupId = eventService.checkGroup(); UUID groupId = eventService.checkGroup();
Visibility groupVisibility = setGroupVisibility(isVisibilityPrivate); Visibility groupVisibility = setGroupVisibility(isVisibilityPrivate);
GroupType groupType = setGroupType(isLecture); GroupType groupType = setGroupType(isLecture);
@ -152,6 +146,19 @@ public class ControllerService {
} }
} }
public List<User> readCsvFile(MultipartFile file) throws EventException, IOException {
if (!file.isEmpty()) {
try {
List<User> userList = CsvService.read(file.getInputStream());
return userList.stream().distinct().collect(Collectors.toList()); //filters duplicates from list
} catch (UnrecognizedPropertyException | CharConversionException ex) {
logger.warning("File konnte nicht gelesen werden");
throw new WrongFileException(file.getOriginalFilename());
}
}
return new ArrayList<>();
}
public void addUser(Account account, UUID groupId) { public void addUser(Account account, UUID groupId) {
AddUserEvent addUserEvent = new AddUserEvent(groupId, account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); AddUserEvent addUserEvent = new AddUserEvent(groupId, account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
eventService.saveEvent(addUserEvent); eventService.saveEvent(addUserEvent);