Merge branch 'master' into showInviteLink

src/main/java/mops/gruppen2/domain/event/AddUserEvent.java

@@ -32,14 +32,14 @@ public class AddUserEvent extends Event {
     }
 
     @Override
-    public void applyEvent(Group group) throws EventException {
+    protected void applyEvent(Group group) throws EventException {
         User user = new User(this.userId, this.givenname, this.familyname, this.email);
 
         if (group.getMembers().contains(user)) {
             throw new UserAlreadyExistsException(this.getClass().toString());
         }
 
-        if (group.getMembers().size() == group.getUserMaximum()){
+        if (group.getMembers().size() == group.getUserMaximum()) {
             throw new GroupFullException(this.getClass().toString());
         }
 

src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java

@@ -28,7 +28,7 @@ public class CreateGroupEvent extends Event {
     }
 
     @Override
-    public void applyEvent(Group group) {
+    protected void applyEvent(Group group) {
         group.setId(this.groupId);
         group.setParent(this.groupParent);
         group.setType(this.groupType);

src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java

@@ -15,7 +15,7 @@ public class DeleteGroupEvent extends Event {
     }
 
     @Override
-    public void applyEvent(Group group) {
+    protected void applyEvent(Group group) {
         group.getRoles().clear();
         group.getMembers().clear();
         group.setTitle(null);

src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java

@@ -21,7 +21,7 @@ public class DeleteUserEvent extends Event {
     }
 
     @Override
-    public void applyEvent(Group group) throws EventException {
+    protected void applyEvent(Group group) throws EventException {
         for (User user : group.getMembers()) {
             if (user.getId().equals(this.userId)) {
                 group.getMembers().remove(user);

src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java

@@ -24,7 +24,7 @@ public class UpdateGroupDescriptionEvent extends Event {
     }
 
     @Override
-    public void applyEvent(Group group) {
+    protected void applyEvent(Group group) {
         if (this.newGroupDescription.isEmpty()) {
             throw new NoValueException(this.getClass().toString());
         }

src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java

@@ -24,7 +24,7 @@ public class UpdateGroupTitleEvent extends Event {
     }
 
     @Override
-    public void applyEvent(Group group) {
+    protected void applyEvent(Group group) {
         if (this.getNewGroupTitle().isEmpty()) {
             throw new NoValueException(this.getClass().toString());
         }

src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java

@@ -25,7 +25,7 @@ public class UpdateRoleEvent extends Event {
     }
 
     @Override
-    public void applyEvent(Group group) throws UserNotFoundException {
+    protected void applyEvent(Group group) throws UserNotFoundException {
         if (group.getRoles().containsKey(this.userId)) {
             group.getRoles().put(this.userId, this.newRole);
             return;

src/main/resources/templates/error.html

@@ -27,8 +27,10 @@
             </div>
         </div>
 
-        <a style="background-color: #52a1eb; color: white" class="btn btn-lg" href="#"
-           onclick="window.history.back(-1);return false;" role="button">Zurück</a>
+        <button class="btn btn-primary"
+                style="background: #52a1eb; border-style: none;">
+            <a  style="color: white" href="#" onclick="window.history.back(-1);return false;" role="button">Zurück</a>
+        </button>
     </div>
 </div>
 </body>

src/main/resources/templates/search.html

@@ -56,8 +56,8 @@
                         <th scope="col">Mitgliederanzahl</th>
                     </tr>
                     </thead>
-                    <tbody th:each="gruppe : ${gruppen}">
-                    <tr>
+                    <tbody>
+                    <tr th:each="gruppe : ${gruppen}">
                         <th scope="row">
                             <a th:href="@{/gruppen2/detailsSearch(id=${gruppe.getId()})}"
                                th:text="${gruppe.title}">Gruppenname</a>

src/test/java/mops/gruppen2/TestBuilder.java

@@ -0,0 +1,201 @@
+package mops.gruppen2;
+
+import com.github.javafaker.Faker;
+import mops.gruppen2.domain.Group;
+import mops.gruppen2.domain.GroupType;
+import mops.gruppen2.domain.Role;
+import mops.gruppen2.domain.Visibility;
+import mops.gruppen2.domain.event.AddUserEvent;
+import mops.gruppen2.domain.event.CreateGroupEvent;
+import mops.gruppen2.domain.event.DeleteUserEvent;
+import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.domain.event.UpdateGroupDescriptionEvent;
+import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
+import mops.gruppen2.domain.event.UpdateRoleEvent;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class TestBuilder {
+
+    private static final Faker faker = new Faker();
+
+    /**
+     * Generiert ein EventLog mit mehreren Gruppen und Usern.
+     *
+     * @param count       Gruppenanzahl
+     * @param membercount Gesamte Mitgliederanzahl
+     * @return Eventliste
+     */
+    public static List<Event> completeGroups(int count, int membercount) {
+        int memPerGroup = membercount / count;
+
+        return IntStream.rangeClosed(0, count)
+                        .parallel()
+                        .mapToObj(i -> completeGroup(memPerGroup))
+                        .flatMap(Collection::stream)
+                        .collect(Collectors.toList());
+    }
+
+    public static List<Event> completeGroup(int membercount) {
+        List<Event> eventList = new ArrayList<>();
+        UUID groupId = UUID.randomUUID();
+
+        eventList.add(createGroupEvent(groupId));
+        eventList.add(updateGroupTitleEvent(groupId));
+        eventList.add(updateGroupDescriptionEvent(groupId));
+        eventList.addAll(addUserEvents(membercount, groupId));
+
+        return eventList;
+    }
+
+    public static List<Event> completeGroup() {
+        return completeGroup(100);
+    }
+
+    /**
+     * Generiert mehrere CreateGroupEvents, 1 <= groupId <= count.
+     *
+     * @param count Anzahl der verschiedenen Gruppen
+     * @return Eventliste
+     */
+    public static List<CreateGroupEvent> createGroupEvents(int count) {
+        return IntStream.rangeClosed(0, count)
+                        .parallel()
+                        .mapToObj(i -> createGroupEvent())
+                        .collect(Collectors.toList());
+    }
+
+    public static CreateGroupEvent createGroupEvent(UUID groupId) {
+        return new CreateGroupEvent(
+                groupId,
+                faker.random().hex(),
+                null,
+                GroupType.SIMPLE,
+                Visibility.PUBLIC,
+                10000000L
+        );
+    }
+
+    public static CreateGroupEvent createGroupEvent() {
+        return createGroupEvent(UUID.randomUUID());
+    }
+
+    /**
+     * Generiert mehrere AddUserEvents für eine Gruppe, 1 <= user_id <= count.
+     *
+     * @param count   Anzahl der Mitglieder
+     * @param groupId Gruppe, zu welcher geaddet wird
+     * @return Eventliste
+     */
+    public static List<Event> addUserEvents(int count, UUID groupId) {
+        return IntStream.rangeClosed(1, count)
+                        .parallel()
+                        .mapToObj(i -> addUserEvent(groupId, String.valueOf(i)))
+                        .collect(Collectors.toList());
+    }
+
+    public static AddUserEvent addUserEvent(UUID groupId, String userId) {
+        String firstname = firstname();
+        String lastname = lastname();
+
+        return new AddUserEvent(
+                groupId,
+                userId,
+                firstname,
+                lastname,
+                firstname + "." + lastname + "@mail.de"
+        );
+    }
+
+    public static AddUserEvent addUserEvent(UUID groupId) {
+        return addUserEvent(groupId, faker.random().hex());
+    }
+
+    public static List<Event> deleteUserEvents(int count, List<Event> eventList) {
+        List<Event> removeEvents = new ArrayList<>();
+        List<Event> shuffle = eventList.parallelStream()
+                                       .filter(event -> event instanceof AddUserEvent)
+                                       .collect(Collectors.toList());
+
+        Collections.shuffle(shuffle);
+
+        for (Event event : shuffle) {
+            removeEvents.add(new DeleteUserEvent(event.getGroupId(), event.getUserId()));
+
+            if (removeEvents.size() >= count) {
+                break;
+            }
+        }
+
+        return removeEvents;
+    }
+
+    /**
+     * Erzeugt mehrere DeleteUserEvents, sodass eine Gruppe komplett geleert wird.
+     *
+     * @param group Gruppe welche geleert wird
+     * @return Eventliste
+     */
+    public static List<DeleteUserEvent> deleteUserEvents(Group group) {
+        return group.getMembers().parallelStream()
+                    .map(user -> deleteUserEvent(group.getId(), user.getId()))
+                    .collect(Collectors.toList());
+    }
+
+    public static DeleteUserEvent deleteUserEvent(UUID groupId, String userId) {
+        return new DeleteUserEvent(
+                groupId,
+                userId
+        );
+    }
+
+    public static UpdateGroupDescriptionEvent updateGroupDescriptionEvent(UUID groupId) {
+        return new UpdateGroupDescriptionEvent(
+                groupId,
+                faker.random().hex(),
+                quote()
+        );
+    }
+
+    public static UpdateGroupTitleEvent updateGroupTitleEvent(UUID groupId) {
+        return new UpdateGroupTitleEvent(
+                groupId,
+                faker.random().hex(),
+                champion()
+        );
+    }
+
+    public static UpdateRoleEvent randomUpdateRoleEvent(UUID groupId, String userId, Role role) {
+        return new UpdateRoleEvent(
+                groupId,
+                userId,
+                role
+        );
+    }
+
+    private static String firstname() {
+        return clean(faker.name().firstName());
+    }
+
+    private static String lastname() {
+        return clean(faker.name().lastName());
+    }
+
+    private static String champion() {
+        return clean(faker.leagueOfLegends().champion());
+    }
+
+    private static String quote() {
+        return clean(faker.leagueOfLegends().quote());
+    }
+
+    private static String clean(String string) {
+        return string.replaceAll("['\";,]", "");
+    }
+}