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

Merge remote-tracking branch 'origin/master' into refactor-controllerService

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
This commit is contained in:
Lukas Ettel
2020-03-26 13:57:10 +01:00
parent 8c1eb876c5 f15d1f850d
commit 91e745e939
13 changed files with 90 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package mops.gruppen2.service;
import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Role;
@ -15,15 +14,11 @@ import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
import mops.gruppen2.domain.event.UpdateRoleEvent;
import mops.gruppen2.domain.event.UpdateUserMaxEvent;
import mops.gruppen2.domain.exception.EventException;
import mops.gruppen2.domain.exception.BadParameterException;
import mops.gruppen2.domain.exception.UserNotFoundException;
import mops.gruppen2.domain.exception.WrongFileException;
import mops.gruppen2.security.Account;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.CharConversionException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@ -206,8 +201,8 @@ public class ControllerService {
eventService.saveEvent(deleteUserEvent);
}
public void deleteGroupEvent(String user_id, UUID groupId) {
DeleteGroupEvent deleteGroupEvent = new DeleteGroupEvent(groupId, user_id);
public void deleteGroupEvent(String userId, UUID groupId) {
DeleteGroupEvent deleteGroupEvent = new DeleteGroupEvent(groupId, userId);
eventService.saveEvent(deleteGroupEvent);
}
@ -224,8 +219,8 @@ public class ControllerService {
return false;
}
private boolean isLastAdmin(Account account, Group group){
for (Map.Entry<String, Role> entry : group.getRoles().entrySet()){
private boolean isLastAdmin(Account account, Group group) {
for (Map.Entry<String, Role> entry : group.getRoles().entrySet()) {
if (entry.getValue() == ADMIN) {
if (!(entry.getKey().equals(account.getName()))) {
return false;