Merge branch 'master' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts.

src/test/java/mops/gruppen2/builder/EventBuilder.java

@@ -1,7 +1,9 @@
 package mops.gruppen2.builder;
 
 import com.github.javafaker.Faker;
+import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
+import mops.gruppen2.domain.User;
 import mops.gruppen2.domain.event.*;
 
 import java.util.ArrayList;
@@ -9,19 +11,44 @@ import java.util.List;
 
 public class EventBuilder {
 
-    public static CreateGroupEvent randomCreateGroupEvent() {
+    public static List<Event> completeGroup(long group_id) {
         Faker faker = new Faker();
 
-        return null;/*new CreateGroupEvent(
-                faker.random().nextLong(),
-                faker.random().nextLong(),
-                faker.random().hex(),
-                faker.leagueOfLegends().champion(),
-                faker.leagueOfLegends().quote()
-        );*/
+        List<Event> eventList = new ArrayList<>();
+
+        eventList.add(EventBuilder.createGroupEvent(group_id));
+        eventList.add(EventBuilder.updateGroupTitleEvent(group_id));
+        eventList.add(EventBuilder.updateGroupDescriptionEvent());
     }
 
-    public static AddUserEvent randomAddUserEvent(long group_id) {
+    public static CreateGroupEvent createGroupEvent(long group_id) {
+        Faker faker = new Faker();
+
+        return new CreateGroupEvent(
+                group_id,
+                faker.random().nextLong(),
+                faker.random().hex(),
+
+        );
+    }
+
+    /**
+     * Generiert mehrere CreateGroupEvents, 1 <= group_id <= count
+     *
+     * @param count Anzahl der verschiedenen Gruppen.
+     * @return
+     */
+    public static List<CreateGroupEvent> createGroupEvents(int count) {
+        List<CreateGroupEvent> eventList = new ArrayList<>();
+
+        for (int i = 1; i <= count; i++) {
+            eventList.add(createGroupEvent(i));
+        }
+
+        return eventList;
+    }
+
+    public static AddUserEvent addUserEvent(long group_id, String user_id) {
         Faker faker = new Faker();
 
         String firstname = faker.name().firstName();
@@ -30,24 +57,31 @@ public class EventBuilder {
         return new AddUserEvent(
                 faker.random().nextLong(),
                 group_id,
-                faker.random().hex(),
+                user_id,
                 firstname,
                 lastname,
                 firstname + "." + lastname + "@mail.de"
         );
     }
 
-    public static List<Event> randomAddUserEvents(int count, long group_id) {
+    /**
+     * Generiert mehrere AddUserEvents für eine Gruppe, 1 <= user_id <= count
+     *
+     * @param count
+     * @param group_id
+     * @return
+     */
+    public static List<Event> addUserEvents(int count, long group_id) {
         List<Event> eventList = new ArrayList<>();
 
-        for (int i = 0; i < count; i++) {
-            eventList.add(EventBuilder.randomAddUserEvent(group_id));
+        for (int i = 1; i <= count; i++) {
+            eventList.add(EventBuilder.addUserEvent(group_id, "" + i));
         }
 
         return eventList;
     }
 
-    public static DeleteUserEvent randomDeleteUserEvent(long group_id, String user_id) {
+    public static DeleteUserEvent deleteUserEvent(long group_id, String user_id) {
         Faker faker = new Faker();
 
         return new DeleteUserEvent(
@@ -57,7 +91,23 @@ public class EventBuilder {
         );
     }
 
-    public static UpdateGroupDescriptionEvent randomUpdateGroupDescriptionEvent(long group_id) {
+    /**
+     * Erzeugt mehrere DeleteUserEvents, sodass eine Gruppe komplett geleert wird
+     *
+     * @param group Gruppe welche geleert wird
+     * @return
+     */
+    public static List<DeleteUserEvent> deleteUserEvents(Group group) {
+        List<DeleteUserEvent> eventList = new ArrayList<>();
+
+        for (User user : group.getMembers()) {
+            eventList.add(EventBuilder.deleteUserEvent(group.getId(), user.getUser_id()));
+        }
+
+        return eventList;
+    }
+
+    public static UpdateGroupDescriptionEvent updateGroupDescriptionEvent(long group_id) {
         Faker faker = new Faker();
 
         return new UpdateGroupDescriptionEvent(
@@ -68,7 +118,7 @@ public class EventBuilder {
         );
     }
 
-    public static UpdateGroupTitleEvent randomUpdateGroupTitleEvent(long group_id) {
+    public static UpdateGroupTitleEvent updateGroupTitleEvent(long group_id) {
         Faker faker = new Faker();
 
         return new UpdateGroupTitleEvent(