add deleteUser button and reconfigure the according method

src/main/java/mops/gruppen2/controller/Gruppen2Controller.java

@@ -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) {
+                             @RequestParam (value = "user_id") String user_id) throws EventException {
-        return null;
+        controllerService.deleteUser(user_id, group_id);
+        return "redirect:/gruppen2/details/members/" + group_id;
     }
 }

src/main/java/mops/gruppen2/service/ControllerService.java

@@ -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);
     }

src/main/resources/templates/editMembers.html

@@ -51,9 +51,9 @@
                                         <input type="hidden" th:name="user_id" th:value="${member.getUser_id()}">
                                         <button type="submit"  class="btn btn-warning btn-sm">Rolle ändern</button><!-- th:if -->
                                     </form>
-                                    <form method="post" action="/gruppen2/details/members/changeRole">
+                                    <form method="post" action="/gruppen2/details/members/deleteUser">
-                                        <input type="hidden" th:name="group_id" th:value="${group.getId()}"></input>
+                                        <input type="hidden" th:name="group_id" th:value="${group.getId()}">
-                                        <input type="hidden" th:name="user_id" th:value="${member.getUser_id()}"></input>
+                                        <input type="hidden" th:name="user_id" th:value="${member.getUser_id()}">
                                         <button class="btn btn-danger btn-sm">Mitglied entfernen</button>
                                     </form>
                                 </td>

src/main/resources/templates/index.html

@@ -21,7 +21,7 @@
                 <li>
                     <a th:href="@{/gruppen2/findGroup}" href="/findGroup">Suche</a>
                 </li>
-            </ul>
+            </ul>--
         </nav>
 </header>
 <main th:fragment="bodycontent">