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

Merge branch 'master' into refactor-controllerService

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
This commit is contained in:
AndiBuls
2020-03-25 16:45:01 +01:00
parent 95e3c38dd9 9045cace9c
commit a140cd22a0
19 changed files with 831 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,26 +46,6 @@ 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.
@ -77,12 +57,10 @@ public class ControllerService {
*/
public void createGroup(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isMaximumInfinite, Long userMaximum, UUID parent) throws EventException {
Visibility groupVisibility = setGroupVisibility(isVisibilityPrivate);
UUID groupId = eventService.checkGroup();
UUID groupId = UUID.randomUUID();
userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum);
checkFields(description, title, userMaximum);
CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, GroupType.SIMPLE, groupVisibility, userMaximum);
eventService.saveEvent(createGroupEvent);
@ -92,18 +70,16 @@ public class ControllerService {
updateRole(account.getName(), groupId);
}
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 UUID createOrga(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isLecture, Boolean isMaximumInfinite, Long userMaximum, UUID parent, MultipartFile file) throws EventException, IOException {
userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum);
checkFields(description, title, userMaximum);
List<User> userList = readCsvFile(file);
if (userList.size() > userMaximum) {
userMaximum = (long) userList.size() + 1;
}
UUID groupId = eventService.checkGroup();
UUID groupId = UUID.randomUUID();
Visibility groupVisibility = setGroupVisibility(isVisibilityPrivate);
GroupType groupType = setGroupType(isLecture);
@ -114,7 +90,8 @@ public class ControllerService {
updateTitle(account, groupId, title);
updateDescription(account, groupId, description);
updateRole(account.getName(), groupId);
addUserList(userList, groupId);
return groupId;
}
private Long checkInfiniteUsers(Boolean isMaximumInfinite, Long userMaximum) {