From efc3625215b8ecbddcfeca3551adac411219a24f Mon Sep 17 00:00:00 2001
From: XXNitram <matti.55@hotmail.de>
Date: Tue, 24 Mar 2020 15:44:34 +0100
Subject: [PATCH 01/11] Change active list entry of detailsNoMember.html

---
 src/main/resources/templates/detailsNoMember.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html
index 7895e4e..649dc20 100644
--- a/src/main/resources/templates/detailsNoMember.html
+++ b/src/main/resources/templates/detailsNoMember.html
@@ -12,7 +12,7 @@
 <header>
     <nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation" th:switch="${account.getRoles().contains('orga')}">
         <ul>
-            <li class="active">
+            <li>
                 <a th:href="@{/gruppen2}" href="/">Gruppen</a>
             </li>
             <li th:case="${true}">
@@ -21,7 +21,7 @@
             <li th:case="${false}">
                 <a href="/createStudent" th:href="@{/gruppen2/createStudent}">Erstellen</a>
             </li>
-            <li>
+            <li class="active">
                 <a th:href="@{/gruppen2/findGroup}" href="/findGroup">Suche</a>
             </li>
         </ul>

From 439bd78b5c068c1b8390c9c2d55bd1ccd092b3d1 Mon Sep 17 00:00:00 2001
From: AndiBuls <andreas.buls@uni-duesseldorf.de>
Date: Tue, 24 Mar 2020 15:53:19 +0100
Subject: [PATCH 02/11] fix alignment of title in detailsMember.html

---
 src/main/resources/templates/detailsMember.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index 16584d0..92a4984 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -33,10 +33,14 @@
         <div>
             <div class="shadow-sm p-4 col-8" style="border: 10px solid aliceblue; display: inline-block; border-radius: 5px; background: aliceblue">
                 <div class="row">
-                    <h1 style="color: black; font-weight: bold; font-optical-sizing: auto; overflow-wrap: break-word; width: 95%" th:text="${group.getTitle()}"></h1>
-                    <a th:href="@{/gruppen2/details/changeMetadata/{id}(id=${group.getId()})}"
-                       class="fa fa-pencil" style="font-size:30px; width: 5%"
-                       th:if="${roles.get(user.getId()) == admin}"></a>
+                    <div class="col-11">
+                        <h1 style="color: black; font-weight: bold; font-optical-sizing: auto; overflow-wrap: break-word;" th:text="${group.getTitle()}"></h1>
+                    </div>
+                    <div class="col-1">
+                        <a th:href="@{/gruppen2/details/changeMetadata/{id}(id=${group.getId()})}"
+                           class="fa fa-pencil" style="font-size:30px;"
+                           th:if="${roles.get(user.getId()) == admin}"></a>
+                    </div>
                 </div>
                 <h3>
                     <span class="badge badge-pill badge-dark" style="background: darkslategray"

From 9954f685f53bfbb4c4292c3f487df8d230c73720 Mon Sep 17 00:00:00 2001
From: XXNitram <matti.55@hotmail.de>
Date: Tue, 24 Mar 2020 16:59:45 +0100
Subject: [PATCH 03/11] Fix Group Search

Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
---
 .../controller/Gruppen2Controller.java        | 21 +++++++++----------
 .../mops/gruppen2/service/GroupService.java   | 19 ++++++++++++++---
 src/main/resources/templates/search.html      | 13 ++++++++----
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index fe420d6..0ef450e 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -224,12 +224,12 @@ public class Gruppen2Controller {
                             Model model,
                             @RequestParam(value = "suchbegriff", required = false) String search) throws EventException {
         Account account = keyCloakService.createAccountFromPrincipal(token);
-        List<Group> groupse = new ArrayList<>();
+        List<Group> groups = new ArrayList<>();
         if (search != null) {
-            groupse = groupService.findGroupWith(search, account);
+            groups = groupService.findGroupWith(search, account);
         }
         model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
-        model.addAttribute("gruppen", groupse);
+        model.addAttribute("gruppen", groups);
         return "search";
     }
 
@@ -302,18 +302,17 @@ public class Gruppen2Controller {
         UUID parentId = group.getParent();
         Group parent = new Group();
 
+        /**
+         * Fix this please!!!
         if (parentId != null) {
             parent = userService.getGroupById(parentId);
-        }
+        }*/
 
-        if (group.getUserMaximum() > group.getMembers().size()) {
-            model.addAttribute("group", group);
-            model.addAttribute("parentId", parentId);
-            model.addAttribute("parent", parent);
+        model.addAttribute("group", group);
+        model.addAttribute("parentId", parentId);
+        model.addAttribute("parent", parent);
 
-            return "detailsNoMember";
-        }
-        throw new GroupNotFoundException(this.getClass().toString());
+        return "detailsNoMember";
     }
 
     @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"})
diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java
index 9a9b6d7..5fc837b 100644
--- a/src/main/java/mops/gruppen2/service/GroupService.java
+++ b/src/main/java/mops/gruppen2/service/GroupService.java
@@ -2,6 +2,7 @@ package mops.gruppen2.service;
 
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.GroupType;
+import mops.gruppen2.domain.User;
 import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.domain.dto.EventDTO;
 import mops.gruppen2.domain.event.Event;
@@ -80,9 +81,21 @@ public class GroupService {
         createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupDescriptionEvent")));
         createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent")));
         createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent")));
+        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("AddUserEvent")));
+        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteUserEvent")));
+        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateUserMaxEvent")));
         List<Group> visibleGroups = projectEventList(createEvents);
 
-        List<UUID> userGroupIds = eventService.findGroupIdsByUser(userId);
+        User user = new User(userId, null, null, null);
+        List<UUID> groupIds = eventService.findGroupIdsByUser(user.getId());
+        List<Event> events = getGroupEvents(groupIds);
+        List<Group> groups = projectEventList(events);
+        List<UUID> userGroupIds = new ArrayList<>();
+        for (Group group : groups) {
+            if (group.getMembers().contains(user)) {
+                userGroupIds.add(group.getId());
+            }
+        }
 
         return visibleGroups.parallelStream()
                             .filter(group -> group.getType() != null)
@@ -118,8 +131,8 @@ public class GroupService {
         return getAllGroupWithVisibilityPublic(account.getName())
                 .parallelStream()
                 .filter(group ->
-                                group.getTitle().toLowerCase().contains(search.toLowerCase()) ||
-                                        group.getDescription().toLowerCase().contains(search.toLowerCase()))
+                        group.getTitle().toLowerCase().contains(search.toLowerCase()) ||
+                                group.getDescription().toLowerCase().contains(search.toLowerCase()))
                 .collect(Collectors.toList());
     }
 }
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index 0737267..83d8e1f 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -56,16 +56,21 @@
                         <th scope="col">Mitgliederanzahl</th>
                     </tr>
                     </thead>
-                    <tbody th:each="gruppe : ${gruppen}">
-                    <tr>
+                    <tbody>
+                    <tr th:each="gruppe : ${gruppen}" th:switch="${gruppe.getUserMaximum() != 100000}">
                         <th scope="row">
                             <a th:href="@{/gruppen2/detailsSearch(id=${gruppe.getId()})}"
-                               th:text="${gruppe.title}">Gruppenname</a>
+                               th:text="${gruppe.getTitle()}">Gruppenname</a>
                         </th>
                         <td style="" th:text="${#strings.abbreviate(gruppe.getDescription(), 50)}">
                             Beschreibung
                         </td>
-                        <td th:text="${gruppe.getMembers().size()}">Mitgliederanzahl</td>
+                        <td th:case="${true}">
+                            <a th:text="${gruppe.getMembers().size()}"></a>
+                            <a>/</a>
+                            <a th:text="${gruppe.getUserMaximum()}"></a>
+                        </td>
+                        <td th:case="${false}">unbegrenzt</td>
                     </tr>
                     </tbody>
                 </table>

From 7b47a78e99f5624c34ee0db580b99b253094bb95 Mon Sep 17 00:00:00 2001
From: XXNitram <matti.55@hotmail.de>
Date: Tue, 24 Mar 2020 17:57:23 +0100
Subject: [PATCH 04/11] Fix handing over of parent

---
 .../java/mops/gruppen2/controller/Gruppen2Controller.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 0ef450e..b16f748 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -302,11 +302,9 @@ public class Gruppen2Controller {
         UUID parentId = group.getParent();
         Group parent = new Group();
 
-        /**
-         * Fix this please!!!
-        if (parentId != null) {
+        if (!controllerService.idIsEmpty(parentId)) {
             parent = userService.getGroupById(parentId);
-        }*/
+        }
 
         model.addAttribute("group", group);
         model.addAttribute("parentId", parentId);

From 8e914d80117ded1defc1992a0c07152ea44a9693 Mon Sep 17 00:00:00 2001
From: XXNitram <matti.55@hotmail.de>
Date: Wed, 25 Mar 2020 13:36:47 +0100
Subject: [PATCH 05/11] Refactoring

---
 src/main/java/mops/gruppen2/controller/WebController.java | 2 +-
 src/main/resources/templates/detailsNoMember.html         | 4 ++--
 src/main/resources/templates/search.html                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java
index f1b5f46..27b7a69 100644
--- a/src/main/java/mops/gruppen2/controller/WebController.java
+++ b/src/main/java/mops/gruppen2/controller/WebController.java
@@ -203,7 +203,7 @@ public class WebController {
         if (search != null) {
             groups = groupService.findGroupWith(search, account);
         }
-        model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
+        model.addAttribute("account", account);
         model.addAttribute("gruppen", groups);
         return "search";
     }
diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html
index 649dc20..f57f300 100644
--- a/src/main/resources/templates/detailsNoMember.html
+++ b/src/main/resources/templates/detailsNoMember.html
@@ -53,8 +53,8 @@
                             <form method="post" action="/gruppen2/detailsBeitreten">
                                 <button class="btn btn-primary"
                                         style="background: #52a1eb; border-style: none;"
-                                        th:href="@{/gruppen2/detailsBeitreten(id=${group.getId()})}"
-                                        th:name="id" th:value="${group.id}"
+                                        th:href="@{/gruppen2/detailsBeitreten}"
+                                        th:name="id" th:value="${group.getId()}"
                                         type="submit">Gruppe beitreten
                                 </button>
                             </form>
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index 83d8e1f..efb1dbf 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -49,7 +49,7 @@
                 <br>
                 <table class="table">
                     <!-- Erscheint dann, wenn man "Suchen" Button klickt und Ergebnisse angezeigt werden, aber so solls aussehen -->
-                    <thead th:if="${!gruppen.isEmpty()}">
+                    <thead th:if='${!gruppen.isEmpty()}'>
                     <tr>
                         <th scope="col">Gruppenname</th>
                         <th scope="col">Beschreibung</th>

From ddfd21c6effadce45a59139195c6529ee80d4338 Mon Sep 17 00:00:00 2001
From: tomvahl <tom-vahl@hotmail.com>
Date: Wed, 25 Mar 2020 13:44:08 +0100
Subject: [PATCH 06/11] add MaxMemberException

Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
---
 .../domain/exception/NoMaximumMemberException.java  | 10 ++++++++++
 .../mops/gruppen2/service/ControllerService.java    | 13 ++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java

diff --git a/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java b/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java
new file mode 100644
index 0000000..0ec684d
--- /dev/null
+++ b/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java
@@ -0,0 +1,10 @@
+package mops.gruppen2.domain.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class NoMaximumMemberException extends EventException {
+
+	public NoMaximumMemberException(String info) {
+		super(HttpStatus.INTERNAL_SERVER_ERROR, "Es wurde keine maximale Gruppenanzahl festgelegt", info);
+	}
+}
diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
index 694a696..334c5b5 100644
--- a/src/main/java/mops/gruppen2/service/ControllerService.java
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -15,6 +15,7 @@ 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.NoMaximumMemberException;
 import mops.gruppen2.domain.exception.UserNotFoundException;
 import mops.gruppen2.domain.exception.WrongFileException;
 import mops.gruppen2.security.Account;
@@ -78,9 +79,13 @@ public class ControllerService {
 
     public void createOrga(Account account, String title, String description, Boolean visibility, Boolean lecture, Boolean maxInfiniteUsers, Long userMaximum, UUID parent, MultipartFile file) throws EventException, IOException {
         List<User> userList = new ArrayList<>();
-        if (userMaximum == null) {
+        maxInfiniteUsers = maxInfiniteUsers != null;
+        if(maxInfiniteUsers){
             userMaximum = 100000L;
         }
+        if (userMaximum == null) {
+            throw new NoMaximumMemberException(this.getClass().toString());
+        }
         if (!file.isEmpty()) {
             try {
                 userList = CsvService.read(file.getInputStream());
@@ -94,7 +99,6 @@ public class ControllerService {
         }
         visibility = visibility == null;
         lecture = lecture != null;
-        maxInfiniteUsers = maxInfiniteUsers != null;
         Visibility visibility1;
         UUID groupId = eventService.checkGroup();
         if (visibility) {
@@ -110,11 +114,6 @@ public class ControllerService {
             groupType = GroupType.SIMPLE;
         }
 
-
-        if(maxInfiniteUsers){
-            userMaximum = 100000L;
-        }
-
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, groupType, visibility1, userMaximum);
         eventService.saveEvent(createGroupEvent);
 

From 473d58ae3bd05b7850c31aec88a8044b09b1e65c Mon Sep 17 00:00:00 2001
From: Christoph <tobi@urpost.de>
Date: Wed, 25 Mar 2020 13:56:43 +0100
Subject: [PATCH 07/11] partial fix search: group is displayed again after
 leaving

Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
---
 .../gruppen2/repository/EventRepository.java  |  3 ++
 .../mops/gruppen2/service/EventService.java   | 10 ++---
 .../mops/gruppen2/service/GroupService.java   | 42 +++++++++----------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/main/java/mops/gruppen2/repository/EventRepository.java b/src/main/java/mops/gruppen2/repository/EventRepository.java
index f2e6d4d..e5249a4 100644
--- a/src/main/java/mops/gruppen2/repository/EventRepository.java
+++ b/src/main/java/mops/gruppen2/repository/EventRepository.java
@@ -31,4 +31,7 @@ public interface EventRepository extends CrudRepository<EventDTO, Long> {
 
     @Query("SELECT * FROM event WHERE event_type = :type")
     List<EventDTO> findAllEventsByType(@Param("type") String type);
+
+    @Query("SELECT *  FROM event WHERE event_type = :type AND user_id = :userId")
+    List<EventDTO> findEventsByTypeAndUserId(@Param("type") String type, @Param("userId") String userId);
 }
diff --git a/src/main/java/mops/gruppen2/service/EventService.java b/src/main/java/mops/gruppen2/service/EventService.java
index 3fbc8e8..ec834bb 100644
--- a/src/main/java/mops/gruppen2/service/EventService.java
+++ b/src/main/java/mops/gruppen2/service/EventService.java
@@ -127,13 +127,9 @@ public class EventService {
     }
 
     public List<UUID> findGroupIdsByUser(String userId) {
-        List<String> groupIDs = eventStore.findGroup_idsWhereUser_id(userId);
-
-        System.out.println(groupIDs);
-
-        return groupIDs.stream()
-                       .map(UUID::fromString)
-                       .collect(Collectors.toList());
+        return eventStore.findGroup_idsWhereUser_id(userId).stream()
+                         .map(UUID::fromString)
+                         .collect(Collectors.toList());
     }
 
 }
diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java
index 5fc837b..24a0f8b 100644
--- a/src/main/java/mops/gruppen2/service/GroupService.java
+++ b/src/main/java/mops/gruppen2/service/GroupService.java
@@ -70,43 +70,43 @@ public class GroupService {
     }
 
     /**
-     * Sucht alle Zeilen in der DB mit visibility=true.
-     * Erstellt eine Liste aus öffentlichen Gruppen (ohen bereits beigetretenen Gruppen).
+     * Wird verwendet bei der Suche nach Gruppen: Titel, Beschreibung werden benötigt.
+     * Außerdem wird beachtet, ob der eingeloggte User bereits in entsprechenden Gruppen mitglied ist.
      *
      * @return Liste von projizierten Gruppen
      * @throws EventException Projektionsfehler
      */
     public List<Group> getAllGroupWithVisibilityPublic(String userId) throws EventException {
-        List<Event> createEvents = eventService.translateEventDTOs(eventRepository.findAllEventsByType("CreateGroupEvent"));
-        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupDescriptionEvent")));
-        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent")));
-        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent")));
-        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("AddUserEvent")));
-        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteUserEvent")));
-        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateUserMaxEvent")));
-        List<Group> visibleGroups = projectEventList(createEvents);
+        List<Event> groupEvents = eventService.translateEventDTOs(eventRepository.findAllEventsByType("CreateGroupEvent"));
+        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupDescriptionEvent")));
+        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent")));
+        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent")));
+        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateUserMaxEvent")));
 
-        User user = new User(userId, null, null, null);
-        List<UUID> groupIds = eventService.findGroupIdsByUser(user.getId());
-        List<Event> events = getGroupEvents(groupIds);
-        List<Group> groups = projectEventList(events);
-        List<UUID> userGroupIds = new ArrayList<>();
-        for (Group group : groups) {
-            if (group.getMembers().contains(user)) {
-                userGroupIds.add(group.getId());
-            }
-        }
+        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findEventsByTypeAndUserId("AddUserEvent", userId)));
+        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findEventsByTypeAndUserId("DeleteUserEvent", userId)));
+
+        List<Group> visibleGroups = projectEventList(groupEvents);
+
+        User currentUserDummy = new User(userId, null, null, null);
 
         return visibleGroups.parallelStream()
                             .filter(group -> group.getType() != null)
-                            .filter(group -> !userGroupIds.contains(group.getId()))
+                            .filter(group -> !group.getMembers().contains(currentUserDummy))
                             .filter(group -> group.getVisibility() == Visibility.PUBLIC)
                             .collect(Collectors.toList());
 
     }
 
+    /**
+     * Wird verwendet beim Gruppe erstellen bei der Parent-Auswahl: nur Titel benötigt.
+     *
+     * @return
+     * @throws EventException
+     */
     public List<Group> getAllLecturesWithVisibilityPublic() throws EventException {
         List<Event> createEvents = eventService.translateEventDTOs(eventRepository.findAllEventsByType("CreateGroupEvent"));
+        createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent")));
         createEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateGroupTitleEvent")));
 
         List<Group> visibleGroups = projectEventList(createEvents);

From 062a0505be718a1ed846f6968e62dc34118cdbac Mon Sep 17 00:00:00 2001
From: Lukas Ettel <34522828+LukasEttel@users.noreply.github.com>
Date: Wed, 25 Mar 2020 14:03:12 +0100
Subject: [PATCH 08/11] Deleted the html

Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
---
 .../gruppen2/controller/WebController.java    |  6 ++---
 .../templates/privateGroupNoMember.html       | 26 -------------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 src/main/resources/templates/privateGroupNoMember.html

diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java
index e8f9248..feaad22 100644
--- a/src/main/java/mops/gruppen2/controller/WebController.java
+++ b/src/main/java/mops/gruppen2/controller/WebController.java
@@ -163,7 +163,7 @@ public class WebController {
         Group parent = new Group();
         if (!group.getMembers().contains(user)) {
             if (group.getVisibility() == Visibility.PRIVATE) {
-                return "privateGroupNoMember";
+                throw new NoAccessException("Die Gruppe ist privat");
             }
             model.addAttribute("group", group);
             model.addAttribute("parentId", parentId);
@@ -226,7 +226,7 @@ public class WebController {
 
         if (!group.getMembers().contains(user)) {
             if (group.getVisibility() == Visibility.PRIVATE) {
-                return "privateGroupNoMember";
+                throw new NoAccessException("Die Gruppe ist privat");
             }
             model.addAttribute("group", group);
             model.addAttribute("parentId", parentId);
@@ -358,7 +358,7 @@ public class WebController {
                 return "redirect:/details/";
             }
         } else {
-            return "privateGroupNoMember";
+            throw new NoAccessException("Die Gruppe ist privat");
         }
     }
 
diff --git a/src/main/resources/templates/privateGroupNoMember.html b/src/main/resources/templates/privateGroupNoMember.html
deleted file mode 100644
index 28d48cb..0000000
--- a/src/main/resources/templates/privateGroupNoMember.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="utf-8">
-    <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
-    <link crossorigin="anonymous" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-          integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" rel="stylesheet">
-    <meta charset="UTF-8">
-    <title>Seite nicht gefunden</title>
-</head>
-<body>
-<div class="mx-auto" style="vertical-align: border-radius: 5px; center; horiz-align: center; top: 50%; left: 50%;">
-    <div class="jumbotron" style="background: aliceblue">
-        <div class="container">
-            <h1 class="display-3">Kein Zugriff auf die Gruppe</h1>
-            <p class="lead">Sorry, du hast keine Berechtigung auf diese Funktionen der Gruppe zuzugreifen</p><br>
-        </div>
-    </div>
-    <div class="container">
-        <p><a class="btn btn-primary btn-lg" href="#" onclick="window.history.back(-1);return false;" role="button">Zurück</a>
-        </p>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file

From be37fcbd508a1f5561758a0dc12fa0956c1721fb Mon Sep 17 00:00:00 2001
From: tomvahl <tom-vahl@hotmail.com>
Date: Wed, 25 Mar 2020 14:40:59 +0100
Subject: [PATCH 09/11] add Exceptions

Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
---
 .../gruppen2/controller/WebController.java    |  3 --
 .../exception/BadParameterException.java      | 10 +++++
 .../exception/NoMaximumMemberException.java   | 10 -----
 .../gruppen2/service/ControllerService.java   | 42 +++++++++++++++----
 4 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/mops/gruppen2/domain/exception/BadParameterException.java
 delete mode 100644 src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java

diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java
index e8f9248..69f96ee 100644
--- a/src/main/java/mops/gruppen2/controller/WebController.java
+++ b/src/main/java/mops/gruppen2/controller/WebController.java
@@ -120,11 +120,8 @@ public class WebController {
                                  @RequestParam(value = "parent", required = false) String parent) throws EventException {
 
         Account account = keyCloakService.createAccountFromPrincipal(token);
-        visibility = visibility == null;
-        maxInfiniteUsers = maxInfiniteUsers != null;
         UUID parentUUID = controllerService.getUUID(parent);
         controllerService.createGroup(account, title, description, visibility, maxInfiniteUsers, userMaximum, parentUUID);
-
         return "redirect:/gruppen2/";
     }
 
diff --git a/src/main/java/mops/gruppen2/domain/exception/BadParameterException.java b/src/main/java/mops/gruppen2/domain/exception/BadParameterException.java
new file mode 100644
index 0000000..b1767d2
--- /dev/null
+++ b/src/main/java/mops/gruppen2/domain/exception/BadParameterException.java
@@ -0,0 +1,10 @@
+package mops.gruppen2.domain.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class BadParameterException extends EventException {
+
+	public BadParameterException(String info) {
+		super(HttpStatus.INTERNAL_SERVER_ERROR, "Fehlerhafter Parameter angegeben!", info);
+	}
+}
diff --git a/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java b/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java
deleted file mode 100644
index 0ec684d..0000000
--- a/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package mops.gruppen2.domain.exception;
-
-import org.springframework.http.HttpStatus;
-
-public class NoMaximumMemberException extends EventException {
-
-	public NoMaximumMemberException(String info) {
-		super(HttpStatus.INTERNAL_SERVER_ERROR, "Es wurde keine maximale Gruppenanzahl festgelegt", info);
-	}
-}
diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
index 334c5b5..bd38ce7 100644
--- a/src/main/java/mops/gruppen2/service/ControllerService.java
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -15,7 +15,7 @@ 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.NoMaximumMemberException;
+import mops.gruppen2.domain.exception.BadParameterException;
 import mops.gruppen2.domain.exception.UserNotFoundException;
 import mops.gruppen2.domain.exception.WrongFileException;
 import mops.gruppen2.security.Account;
@@ -54,20 +54,37 @@ public class ControllerService {
      * @param title       Gruppentitel
      * @param description Gruppenbeschreibung
      */
-    public void createGroup(Account account, String title, String description, Boolean maxInfiniteUsers, Boolean visibility, Long userMaximum, UUID parent) throws EventException {
+    public void createGroup(Account account, String title, String description, Boolean visibility, Boolean maxInfiniteUsers, Long userMaximum, UUID parent) throws EventException {
         Visibility visibility1;
         UUID groupId = eventService.checkGroup();
 
+        maxInfiniteUsers = maxInfiniteUsers != null;
+
+
+        if(maxInfiniteUsers) {
+            userMaximum = 100000L;
+        }
+
+        if(description == null) {
+            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
+        }
+
+        if(title == null) {
+            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
+        }
+
+        if (userMaximum == null) {
+            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
+        }
+
+        visibility = visibility == null;
+
         if (visibility) {
             visibility1 = Visibility.PUBLIC;
         } else {
             visibility1 = Visibility.PRIVATE;
         }
 
-        if(maxInfiniteUsers){
-            userMaximum = 100000L;
-        }
-
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, GroupType.SIMPLE, visibility1, userMaximum);
         eventService.saveEvent(createGroupEvent);
 
@@ -80,11 +97,20 @@ public class ControllerService {
     public void createOrga(Account account, String title, String description, Boolean visibility, Boolean lecture, Boolean maxInfiniteUsers, Long userMaximum, UUID parent, MultipartFile file) throws EventException, IOException {
         List<User> userList = new ArrayList<>();
         maxInfiniteUsers = maxInfiniteUsers != null;
-        if(maxInfiniteUsers){
+        if(maxInfiniteUsers) {
             userMaximum = 100000L;
         }
+
+        if(description == null) {
+            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
+        }
+
+        if(title == null) {
+            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
+        }
+
         if (userMaximum == null) {
-            throw new NoMaximumMemberException(this.getClass().toString());
+            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
         }
         if (!file.isEmpty()) {
             try {

From 22ae8a81dc5248bb50f60eba217933c478525cca Mon Sep 17 00:00:00 2001
From: Christoph <tobi@urpost.de>
Date: Wed, 25 Mar 2020 14:46:02 +0100
Subject: [PATCH 10/11] partial fix search: max user anzahl display

Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: XXNitram <matti.55@hotmail.de>
---
 .../mops/gruppen2/controller/WebController.java |  2 ++
 .../gruppen2/repository/EventRepository.java    |  6 ++++++
 .../mops/gruppen2/service/EventService.java     |  4 ++++
 .../mops/gruppen2/service/GroupService.java     | 17 +++++++----------
 src/main/resources/templates/search.html        |  4 +---
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java
index 27b7a69..1b4720d 100644
--- a/src/main/java/mops/gruppen2/controller/WebController.java
+++ b/src/main/java/mops/gruppen2/controller/WebController.java
@@ -199,10 +199,12 @@ public class WebController {
                             Model model,
                             @RequestParam(value = "suchbegriff", required = false) String search) throws EventException {
         Account account = keyCloakService.createAccountFromPrincipal(token);
+
         List<Group> groups = new ArrayList<>();
         if (search != null) {
             groups = groupService.findGroupWith(search, account);
         }
+
         model.addAttribute("account", account);
         model.addAttribute("gruppen", groups);
         return "search";
diff --git a/src/main/java/mops/gruppen2/repository/EventRepository.java b/src/main/java/mops/gruppen2/repository/EventRepository.java
index e5249a4..b306452 100644
--- a/src/main/java/mops/gruppen2/repository/EventRepository.java
+++ b/src/main/java/mops/gruppen2/repository/EventRepository.java
@@ -34,4 +34,10 @@ public interface EventRepository extends CrudRepository<EventDTO, Long> {
 
     @Query("SELECT *  FROM event WHERE event_type = :type AND user_id = :userId")
     List<EventDTO> findEventsByTypeAndUserId(@Param("type") String type, @Param("userId") String userId);
+
+    @Query("SELECT COUNT(*) FROM event WHERE event_type = :type AND group_id = :groupId")
+    Long countEventsByTypeAndGroupId(@Param("type") String type, @Param("groupId") String groupId);
+
+    @Query("SELECT COUNT(*) FROM event WHERE group_id = :groupId AND user_id = :userId AND event_type = :type")
+    Long countEventsByGroupIdAndUserIdAndEventType(@Param("groupId") String groupId, @Param("userId") String userId, @Param("type") String type);
 }
diff --git a/src/main/java/mops/gruppen2/service/EventService.java b/src/main/java/mops/gruppen2/service/EventService.java
index ec834bb..4d52888 100644
--- a/src/main/java/mops/gruppen2/service/EventService.java
+++ b/src/main/java/mops/gruppen2/service/EventService.java
@@ -132,4 +132,8 @@ public class EventService {
                          .collect(Collectors.toList());
     }
 
+    public boolean userInGroup(UUID groupId, String userId) {
+        return eventStore.countEventsByGroupIdAndUserIdAndEventType(groupId.toString(), userId, "AddUserEvent")
+                > eventStore.countEventsByGroupIdAndUserIdAndEventType(groupId.toString(), userId, "DeleteUserEvent");
+    }
 }
diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java
index 24a0f8b..aa22132 100644
--- a/src/main/java/mops/gruppen2/service/GroupService.java
+++ b/src/main/java/mops/gruppen2/service/GroupService.java
@@ -2,7 +2,6 @@ package mops.gruppen2.service;
 
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.GroupType;
-import mops.gruppen2.domain.User;
 import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.domain.dto.EventDTO;
 import mops.gruppen2.domain.event.Event;
@@ -83,19 +82,13 @@ public class GroupService {
         groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("DeleteGroupEvent")));
         groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findAllEventsByType("UpdateUserMaxEvent")));
 
-        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findEventsByTypeAndUserId("AddUserEvent", userId)));
-        groupEvents.addAll(eventService.translateEventDTOs(eventRepository.findEventsByTypeAndUserId("DeleteUserEvent", userId)));
-
         List<Group> visibleGroups = projectEventList(groupEvents);
 
-        User currentUserDummy = new User(userId, null, null, null);
-
         return visibleGroups.parallelStream()
                             .filter(group -> group.getType() != null)
-                            .filter(group -> !group.getMembers().contains(currentUserDummy))
+                            .filter(group -> !eventService.userInGroup(group.getId(), userId))
                             .filter(group -> group.getVisibility() == Visibility.PUBLIC)
                             .collect(Collectors.toList());
-
     }
 
     /**
@@ -128,11 +121,15 @@ public class GroupService {
      * @throws EventException Projektionsfehler
      */
     public List<Group> findGroupWith(String search, Account account) throws EventException {
+        if (search.isEmpty()) {
+            return getAllGroupWithVisibilityPublic(account.getName());
+        }
+
         return getAllGroupWithVisibilityPublic(account.getName())
                 .parallelStream()
                 .filter(group ->
-                        group.getTitle().toLowerCase().contains(search.toLowerCase()) ||
-                                group.getDescription().toLowerCase().contains(search.toLowerCase()))
+                                group.getTitle().toLowerCase().contains(search.toLowerCase()) ||
+                                        group.getDescription().toLowerCase().contains(search.toLowerCase()))
                 .collect(Collectors.toList());
     }
 }
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index efb1dbf..bc38f71 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -53,7 +53,7 @@
                     <tr>
                         <th scope="col">Gruppenname</th>
                         <th scope="col">Beschreibung</th>
-                        <th scope="col">Mitgliederanzahl</th>
+                        <th scope="col">Max. Mitgliederanzahl</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -66,8 +66,6 @@
                             Beschreibung
                         </td>
                         <td th:case="${true}">
-                            <a th:text="${gruppe.getMembers().size()}"></a>
-                            <a>/</a>
                             <a th:text="${gruppe.getUserMaximum()}"></a>
                         </td>
                         <td th:case="${false}">unbegrenzt</td>

From d703b1f255d35cc8e36bd4781d67eeb9740c454b Mon Sep 17 00:00:00 2001
From: tomvahl <tom-vahl@hotmail.com>
Date: Wed, 25 Mar 2020 14:47:46 +0100
Subject: [PATCH 11/11] refactor Exceptions

Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
---
 .../gruppen2/service/ControllerService.java   | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
index bd38ce7..1e57d6d 100644
--- a/src/main/java/mops/gruppen2/service/ControllerService.java
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -45,6 +45,26 @@ public class ControllerService {
         this.logger = Logger.getLogger("controllerServiceLogger");
     }
 
+    /**
+     * Überprüft ob alle Felder richtig gesetzt sind.
+     * @param description
+     * @param title
+     * @param userMaximum
+     */
+    private void checkFields(String description, String title, Long userMaximum ) {
+        if(description == null) {
+            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
+        }
+
+        if(title == null) {
+            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
+        }
+
+        if (userMaximum == null) {
+            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
+        }
+    }
+
     /**
      * Erzeugt eine neue Gruppe, fügt den User, der die Gruppe erstellt hat, hinzu und setzt seine Rolle als Admin fest.
      * Zudem wird der Gruppentitel und die Gruppenbeschreibung erzeugt, welche vorher der Methode übergeben wurden.
@@ -65,17 +85,7 @@ public class ControllerService {
             userMaximum = 100000L;
         }
 
-        if(description == null) {
-            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
-        }
-
-        if(title == null) {
-            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
-        }
-
-        if (userMaximum == null) {
-            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
-        }
+        checkFields(description, title, userMaximum);
 
         visibility = visibility == null;
 
@@ -101,17 +111,8 @@ public class ControllerService {
             userMaximum = 100000L;
         }
 
-        if(description == null) {
-            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
-        }
+        checkFields(description, title, userMaximum);
 
-        if(title == null) {
-            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
-        }
-
-        if (userMaximum == null) {
-            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
-        }
         if (!file.isEmpty()) {
             try {
                 userList = CsvService.read(file.getInputStream());