From 86a4975c008261e9651df985404227a42870c395 Mon Sep 17 00:00:00 2001
From: Christoph <tobi@urpost.de>
Date: Mon, 9 Mar 2020 12:46:29 +0100
Subject: [PATCH] fix tests after refactor

---
 src/main/java/mops/gruppen2/domain/Aggregate.java |  2 +-
 src/main/java/mops/gruppen2/domain/Group.java     |  1 +
 .../java/mops/gruppen2/service/GroupService.java  |  6 +++---
 src/test/java/mops/gruppen2/domain/GroupTest.java | 15 +++++++++------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/mops/gruppen2/domain/Aggregate.java b/src/main/java/mops/gruppen2/domain/Aggregate.java
index 8439b6c..294cc60 100644
--- a/src/main/java/mops/gruppen2/domain/Aggregate.java
+++ b/src/main/java/mops/gruppen2/domain/Aggregate.java
@@ -8,9 +8,9 @@ import java.lang.reflect.Method;
 /**
  * Repräsentiert viele Events als aggregiertes Objekt.
  */
+@Getter
 public abstract class Aggregate {
 
-    @Getter
     protected long id;
 
     /**
diff --git a/src/main/java/mops/gruppen2/domain/Group.java b/src/main/java/mops/gruppen2/domain/Group.java
index fceae1e..2716aeb 100644
--- a/src/main/java/mops/gruppen2/domain/Group.java
+++ b/src/main/java/mops/gruppen2/domain/Group.java
@@ -25,6 +25,7 @@ public class Group extends Aggregate {
     private void applyEvent(CreateGroupEvent event) {
         title = event.getGroupTitle();
         description = event.getGroupDescription();
+        id = event.getGroup_id();
     }
 
     private void applyEvent(UpdateRoleEvent event) {
diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java
index 52a717b..42e9d31 100644
--- a/src/main/java/mops/gruppen2/service/GroupService.java
+++ b/src/main/java/mops/gruppen2/service/GroupService.java
@@ -1,9 +1,9 @@
 package mops.gruppen2.service;
 
 import mops.gruppen2.domain.Group;
-import mops.gruppen2.domain.event.CreateGroupEvent;
 import mops.gruppen2.domain.event.Event;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 
 @Service
@@ -16,8 +16,8 @@ public class GroupService {
      * @param eventList Die restlichen Events für diese Gruppe
      * @return Gruppe auf aktuellem Stand
      */
-    Group buildGroupFromEvents(CreateGroupEvent event, List<Event> eventList) {
-        Group newGroup = new Group(event);
+    Group buildGroupFromEvents(List<Event> eventList) {
+        Group newGroup = new Group();
 
         eventList.forEach(newGroup::applyEvent);
 
diff --git a/src/test/java/mops/gruppen2/domain/GroupTest.java b/src/test/java/mops/gruppen2/domain/GroupTest.java
index 73d8db7..3901fe0 100644
--- a/src/test/java/mops/gruppen2/domain/GroupTest.java
+++ b/src/test/java/mops/gruppen2/domain/GroupTest.java
@@ -23,9 +23,10 @@ class GroupTest {
 
     @Test
     void createSingleGroup() {
-        CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L,2, "asd", "hello", "foo");
+        CreateGroupEvent createGroupEvent = new CreateGroupEvent(1,2, "asd", "hello", "foo");
 
-        Group group = new Group(createGroupEvent);
+        Group group = new Group();
+        group.applyEvent(createGroupEvent);
 
         assertThat(group.getDescription()).isEqualTo("foo");
         assertThat(group.getTitle()).isEqualTo("hello");
@@ -35,11 +36,12 @@ class GroupTest {
     // Verwendet CreateGroupEvent
     @Test
     void addSingleUser() {
-        CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L,1L,"prof1", "hi", "foo");
-        Group group = new Group(createGroupEvent);
+        CreateGroupEvent createGroupEvent = new CreateGroupEvent(1,1,"prof1", "hi", "foo");
+        Group group = new Group();
+        group.applyEvent(createGroupEvent);
 
         User user = new User("prof", "jens", "bendi", "hi@gmail.com");
-        AddUserEvent addUserEvent = new AddUserEvent(1L,1L, user);
+        AddUserEvent addUserEvent = new AddUserEvent(1,1, user);
         group.applyEvent(addUserEvent);
 
         assertThat(group.getMembers().get(0)).isEqualTo(user);
@@ -52,7 +54,8 @@ class GroupTest {
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L, 1L, "1L", "gruppe1", "Eine Testgruppe");
         AddUserEvent addUserEvent = new AddUserEvent(1L, 1L, "5L", "Peter", "Pan", "123@mail.de");
 
-        Group group = new Group(createGroupEvent);
+        Group group = new Group();
+        group.applyEvent(createGroupEvent);
         group.applyEvent(addUserEvent);
 
         UpdateRoleEvent updateRoleEvent = new UpdateRoleEvent(1L, 1L, "5L", Role.ORGA);