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

refactor createGroup and createOrga

Browse Source 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
                tomvahl <tom-vahl@hotmail.com>
This commit is contained in:
AndiBuls
2020-03-25 15:38:37 +01:00
parent dd7404553c
commit 5736de146d
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,28 +74,15 @@ public class ControllerService {
* @param title Gruppentitel * @param title Gruppentitel
* @param description Gruppenbeschreibung * @param description Gruppenbeschreibung
*/ */
public void createGroup(Account account, String title, String description, Boolean visibility, Boolean maxInfiniteUsers, Long userMaximum, UUID parent) throws EventException { public void createGroup(Account account, String title, String description, Boolean isVisibilityPrivate, Boolean isMaximumInfinite, Long userMaximum, UUID parent) throws EventException {
Visibility visibility1; Visibility groupVisibility = setGroupVisibility(isVisibilityPrivate);
UUID groupId = eventService.checkGroup(); UUID groupId = eventService.checkGroup();
maxInfiniteUsers = maxInfiniteUsers != null; userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum);
if(maxInfiniteUsers) {
userMaximum = 100000L;
}
checkFields(description, title, userMaximum); checkFields(description, title, userMaximum);
visibility = visibility == null; CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, GroupType.SIMPLE, groupVisibility, userMaximum);
if (visibility) {
visibility1 = Visibility.PUBLIC;
} else {
visibility1 = Visibility.PRIVATE;
}
CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, GroupType.SIMPLE, visibility1, userMaximum);
eventService.saveEvent(createGroupEvent); eventService.saveEvent(createGroupEvent);
addUser(account, groupId); addUser(account, groupId);
@ -104,12 +91,10 @@ public class ControllerService {
updateRole(account.getName(), groupId); updateRole(account.getName(), groupId);
} }
public void createOrga(Account account, String title, String description, Boolean visibility, Boolean lecture, Boolean maxInfiniteUsers, 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<>(); List<User> userList = new ArrayList<>();
maxInfiniteUsers = maxInfiniteUsers != null;
if(maxInfiniteUsers) { userMaximum = checkInfiniteUsers(isMaximumInfinite, userMaximum);
userMaximum = 100000L;
}
checkFields(description, title, userMaximum); checkFields(description, title, userMaximum);
@ -124,24 +109,11 @@ public class ControllerService {
throw new WrongFileException(file.getOriginalFilename()); throw new WrongFileException(file.getOriginalFilename());
} }
} }
visibility = visibility == null;
lecture = lecture != null;
Visibility visibility1;
UUID groupId = eventService.checkGroup(); UUID groupId = eventService.checkGroup();
if (visibility) { Visibility groupVisibility = setGroupVisibility(isVisibilityPrivate);
visibility1 = Visibility.PUBLIC; GroupType groupType = setGroupType(isLecture);
} else {
visibility1 = Visibility.PRIVATE;
}
GroupType groupType; CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, groupType, groupVisibility, userMaximum);
if (lecture) {
groupType = GroupType.LECTURE;
} else {
groupType = GroupType.SIMPLE;
}
CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, groupType, visibility1, userMaximum);
eventService.saveEvent(createGroupEvent); eventService.saveEvent(createGroupEvent);
addUser(account, groupId); addUser(account, groupId);
@ -151,6 +123,34 @@ public class ControllerService {
addUserList(userList, groupId); addUserList(userList, groupId);
} }
private Long checkInfiniteUsers(Boolean isMaximumInfinite, Long userMaximum) {
isMaximumInfinite = isMaximumInfinite != null;
if(isMaximumInfinite) {
userMaximum = 100000L;
}
return userMaximum;
}
private Visibility setGroupVisibility(Boolean isVisibilityPrivate) {
isVisibilityPrivate = isVisibilityPrivate != null;
if (isVisibilityPrivate) {
return Visibility.PRIVATE;
} else {
return Visibility.PUBLIC;
}
}
private GroupType setGroupType(Boolean isLecture) {
isLecture = isLecture != null;
if (isLecture) {
return GroupType.LECTURE;
} else {
return GroupType.SIMPLE;
}
}
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());