try to make naming more consistent

src/main/java/mops/gruppen2/domain/Group.java

@@ -18,50 +18,50 @@ import java.util.Map;
 @Data
 public class Group extends Aggregate {
 	long id;
-	String titel;
+	String title;
-	String beschreibung;
+	String description;
-	List<User> teilnehmersList;
+	List<User> members;
-	Map<User, Role> rollenList;
+	Map<User, Role> roles;
 
 	public void applyEvent(CreateGroupEvent event){
-		this.id = event.getGruppe_id();
+		this.id = event.getGroup_id();
-		this.titel = event.getTitel();
+		this.title = event.getGroupTitle();
-		this.beschreibung = event.getBeschreibung();
+		this.description = event.getGroupDescription();
-		this.teilnehmersList = new ArrayList<>();
+		this.members = new ArrayList<>();
-		this.rollenList = new HashMap<>();
+		this.roles = new HashMap<>();
 	}
 
 	public void applyEvent(UpdateRoleEvent event) {
-		teilnehmersList.stream()
+		members.stream()
-				.filter(user -> user.getId().equals(event.getUser_id()))
+				.filter(user -> user.getUser_id().equals(event.getUser_id()))
 				.findFirst()
-				.ifPresentOrElse(user -> rollenList.put(user, event.getRole()),
+				.ifPresentOrElse(user -> roles.put(user, event.getNewRole()),
 						() -> System.out.println("UserNotFoundException"));
 	}
 
 	public void  applyEvent(AddUserEvent event){
 		User user = new User();
 
-		user.setId(event.getUser_id());
+		user.setUser_id(event.getUser_id());
-		user.setVorname(event.getVorname());
+		user.setGivenname(event.getGivenname());
-		user.setNachname(event.getNachname());
+		user.setFamilyname(event.getFamilyname());
 		user.setEmail(event.getEmail());
 
-		this.teilnehmersList.add(user);
+		this.members.add(user);
 	}
 
 	public void applyEvent(UpdateGroupTitleEvent event) {
-		this.titel = event.getTitel();
+		this.title = event.getNewGroupTitle();
 	}
 
 	public void applyEvent(UpdateGroupDescriptionEvent event) {
-		this.beschreibung = event.getBeschreibung();
+		this.description = event.getNewGroupDescription();
 	}
 
 	public void applyEvent(DeleteUserEvent event) {
-		for (User user : teilnehmersList) {
+		for (User user : members) {
-			if (user.getId().equals(event.getUser_id())) {
+			if (user.getUser_id().equals(event.getUser_id())) {
-				this.teilnehmersList.remove(user);
+				this.members.remove(user);
 				break;
 			}
 		}

src/main/java/mops/gruppen2/domain/User.java

@@ -1,14 +1,13 @@
 package mops.gruppen2.domain;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
+@AllArgsConstructor
 public class User {
-	String id;
+	String user_id;
-	String vorname;
+	String givenname;
-	String nachname;
+	String familyname;
 	String email;
-	List<Group> gruppen;
 }

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

@@ -4,12 +4,12 @@ import lombok.Getter;
 
 @Getter
 public class AddUserEvent extends Event{
-	String vorname, nachname, email;
+	String givenname, familyname, email;
 
-	public AddUserEvent(long id, long gruppe_id, String user_id, String vorname, String nachname, String email) {
+	public AddUserEvent(long event_id, long group_id, String user_id, String givenname, String familyname, String email) {
-		super(id, gruppe_id, user_id);
+		super(event_id, group_id, user_id);
-		this.vorname = vorname;
+		this.givenname = givenname;
-		this.nachname = nachname;
+		this.familyname = familyname;
 		this.email = email;
 	}
 }

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

@@ -4,12 +4,12 @@ import lombok.Getter;
 
 @Getter
 public class CreateGroupEvent extends Event {
-	String titel;
+	String groupTitle;
-	String beschreibung;
+	String groupDescription;
 
-	public CreateGroupEvent(long id, long gruppe_id, String user_id, String titel, String beschreibung) {
+	public CreateGroupEvent(long event_id, long group_id, String user_id, String groupTitle, String groupDescription) {
-		super(id, gruppe_id, user_id);
+		super(event_id, group_id, user_id);
-		this.titel = titel;
+		this.groupTitle = groupTitle;
-		this.beschreibung = beschreibung;
+		this.groupDescription = groupDescription;
 	}
 }

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

@@ -5,7 +5,7 @@ import lombok.Getter;
 @Getter
 public class DeleteUserEvent extends Event{
 
-    public DeleteUserEvent(long id, long gruppe_id, String user_id) {
+    public DeleteUserEvent(long event_id, long group_id, String user_id) {
-        super(id, gruppe_id, user_id);
+        super(event_id, group_id, user_id);
     }
 }

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

@@ -6,7 +6,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public class Event {
-	long id;
+	long event_id;
-	long gruppe_id;
+	long group_id;
 	String user_id;
 }

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

@@ -4,10 +4,10 @@ import lombok.Getter;
 
 @Getter
 public class UpdateGroupDescriptionEvent extends Event {
-    String beschreibung;
+    String newGroupDescription;
 
-    public UpdateGroupDescriptionEvent(long id, long gruppe_id, String user_id, String beschreibung) {
+    public UpdateGroupDescriptionEvent(long event_id, long group_id, String user_id, String newGroupDescription) {
-        super(id, gruppe_id, user_id);
+        super(event_id, group_id, user_id);
-        this.beschreibung = beschreibung;
+        this.newGroupDescription = newGroupDescription;
     }
 }

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

@@ -4,10 +4,10 @@ import lombok.Getter;
 
 @Getter
 public class UpdateGroupTitleEvent extends Event {
-    String titel;
+    String newGroupTitle;
 
-    public UpdateGroupTitleEvent(long id, long gruppe_id, String user_id, String titel) {
+    public UpdateGroupTitleEvent(long event_id, long group_id, String user_id, String newGroupTitle) {
-        super(id, gruppe_id, user_id);
+        super(event_id, group_id, user_id);
-        this.titel = titel;
+        this.newGroupTitle = newGroupTitle;
     }
 }

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

@@ -6,11 +6,11 @@ import mops.gruppen2.domain.Role;
 @Getter
 public class UpdateRoleEvent extends Event {
 
-    private final Role role;
+    private final Role newRole;
 
-    public UpdateRoleEvent(long id, long gruppe_id, String user_id, Role newRole) {
+    public UpdateRoleEvent(long event_id, long group_id, String user_id, Role newRole) {
-        super(id, gruppe_id, user_id);
+        super(event_id, group_id, user_id);
 
-        this.role = newRole;
+        this.newRole = newRole;
     }
 }

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

@@ -8,9 +8,11 @@ import java.util.List;
 @Service
 public class GroupService {
 
-	Group buildGroup(List<Event> eventList){
+	Group buildGroupFromEvents(List<Event> eventList){
 		Group newGroup = new Group();
+
 		eventList.forEach(newGroup::applyEvent);
+
 		return newGroup;
 	}
 }

src/test/java/mops/gruppen2/domain/GroupTest.java

@@ -20,7 +20,6 @@ class GroupTest {
 
     @BeforeEach
     public void setUp(){
-
     }
 
 
@@ -32,20 +31,16 @@ class GroupTest {
     void applyAddUserEvent(){
         Group group = new Group();
         Group testGroup = new Group();
-        User user = new User();
+        User user = new User("prof", "jens", "bendi", "hi@gmail.com");
         addUserEvent = new AddUserEvent(1L,1L,"prof","jens","bendi", "hi@gmail.com");
         createGroupEvent = new CreateGroupEvent(1L,1L,"prof1", "hi", "foo");
 
         group.applyEvent(createGroupEvent);
         group.applyEvent(addUserEvent);
         testGroup.applyEvent(createGroupEvent);
-        user.setId("prof");
-        user.setVorname("jens");
-        user.setNachname("bendi");
-        user.setEmail("hi@gmail.com");
         List<User> testTeil = new ArrayList<>();
         testTeil.add(user);
-        testGroup.setTeilnehmersList(testTeil);
+        testGroup.setMembers(testTeil);
 
         assertEquals(testGroup, group);
     }
@@ -64,8 +59,8 @@ class GroupTest {
         group.applyEvent(new UpdateRoleEvent(1L, 1L, "5L", org));
 
         // Assert
-        assertThat(group.getRollenList())
+        assertThat(group.getRoles())
-                .containsOnlyKeys(group.getTeilnehmersList().get(0))
+                .containsOnlyKeys(group.getMembers().get(0))
                 .containsValue(org);
     }
 
@@ -79,10 +74,10 @@ class GroupTest {
 
         Group group2 = new Group();
         group2.id = 2L;
-        group2.titel = "hello";
+        group2.title = "hello";
-        group2.beschreibung = "foo";
+        group2.description = "foo";
-        group2.teilnehmersList = new ArrayList<>();
+        group2.members = new ArrayList<>();
-        group2.rollenList = new HashMap<>();
+        group2.roles = new HashMap<>();
 
         assertEquals(group2, group1);
     }