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

if group empty gets delete

Browse Source 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
This commit is contained in:
tomvahl
2020-03-20 14:00:41 +01:00
parent 71ea7eec40
commit 73f6798c2c
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -247,6 +247,9 @@ public class Gruppen2Controller {
User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
controllerService.passIfLastAdmin(account, groupId);
controllerService.deleteUser(user.getId(), groupId);
if(userService.getGroupById(groupId).getMembers().size() == 0){
controllerService.deleteGroupEvent(user.getId(), groupId);
}
return "redirect:/gruppen2/";
}
@ -255,7 +258,7 @@ public class Gruppen2Controller {
public String pDeleteGroup(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId){
Account account = keyCloakService.createAccountFromPrincipal(token);
User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
controllerService.deleteGroupEvent(user, groupId);
controllerService.deleteGroupEvent(user.getId(), groupId);
return "redirect:/gruppen2/";
}
@ -295,9 +298,12 @@ public class Gruppen2Controller {
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
@PostMapping("/details/members/deleteUser")
public String deleteUser(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId,
public String deleteUser(@RequestParam("group_id") Long groupId,
@RequestParam("user_id") String userId) throws EventException {
controllerService.deleteUser(userId, groupId);
if(userService.getGroupById(groupId).getMembers().size() == 0){
controllerService.deleteGroupEvent(userId ,groupId);
}
return "redirect:/gruppen2/details/members/" + groupId;
}
}