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

add deleteUser button and reconfigure the according method

Browse Source
This commit is contained in:
killerber4t
2020-03-18 16:36:54 +01:00
parent 42721e06fc
commit 4b88742776
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,10 +146,10 @@ public class Gruppen2Controller {
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
@PostMapping("/leaveGroup")
public String pLeaveGroup(KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) {
public String pLeaveGroup(KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) throws EventException {
Account account = keyCloakService.createAccountFromPrincipal(token);
User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
controllerService.deleteUser(user, id);
controllerService.deleteUser(user.getUser_id(), id);
return "redirect:/gruppen2/";
}
@ -179,7 +179,8 @@ public class Gruppen2Controller {
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
@PostMapping("/details/members/deleteUser")
public String deleteUser(KeycloakAuthenticationToken token,@RequestParam (value = "group_id") Long group_id,
@RequestParam (value = "user_id") String user_id) {
return null;
@RequestParam (value = "user_id") String user_id) throws EventException {
controllerService.deleteUser(user_id, group_id);
return "redirect:/gruppen2/details/members/" + group_id;
}
}

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

@ -77,7 +77,13 @@ public class ControllerService {
eventService.saveEvent(updateRoleEvent);
}
public void deleteUser(User user, Long group_id){
public void deleteUser(String user_id, Long group_id) throws EventException {
Group group = userService.getGroupById(group_id);
User user = null;
for (User member : group.getMembers()) {
if(member.getUser_id().equals(user_id)) user = member;
}
assert user != null;
DeleteUserEvent deleteUserEvent = new DeleteUserEvent(group_id, user.getUser_id());
eventService.saveEvent(deleteUserEvent);
}