christoph/lecture-professional-software-development
1
Fork 0
Code Activity

decreased visibility of group-fields -> adapted tests and GroupService

Browse Source
This commit is contained in:
Christoph
2020-03-06 21:30:58 +01:00
parent fb3a94cf04
commit e05c6f4e3a
4 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/mops/gruppen2/domain/Aggregate.java
View File

@ -1,15 +1,23 @@
package mops.gruppen2.domain;
import lombok.Getter;
import mops.gruppen2.domain.event.Event;
import java.lang.reflect.Method;
public abstract class Aggregate {
@Getter
protected final long id;
protected Aggregate(long id) {
this.id = id;
}
/**
* Ruft die spezifische applyEvent-Methode im entsprechenden Aggregat auf.
*
* @param event
* @param event Einzelne Änderung an dem Aggregat
*/
public void applyEvent(Event event) {
try {

13
src/main/java/mops/gruppen2/domain/Group.java
View File

@ -12,14 +12,13 @@ import java.util.Map;
@EqualsAndHashCode(callSuper=false)
@Getter
public class Group extends Aggregate {
long id;
String title;
String description;
List<User> members;
Map<User, Role> roles;
private String title;
private String description;
private List<User> members;
private Map<User, Role> roles;
private void applyEvent(CreateGroupEvent event){
this.id = event.getGroup_id();
public Group(CreateGroupEvent event) {
super(event.getGroup_id());
this.title = event.getGroupTitle();
this.description = event.getGroupDescription();
this.members = new ArrayList<>();

12
src/main/java/mops/gruppen2/service/GroupService.java
View File

@ -1,6 +1,7 @@
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;
@ -8,8 +9,15 @@ import java.util.List;
@Service
public class GroupService {
Group buildGroupFromEvents(List<Event> eventList){
Group newGroup = new Group();
/**
* Konstruiert eine vollständige Gruppe aus Events, welche dieselbe Gruppe betreffen.
*
* @param event Initiales CreateGroup-Event
* @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);
eventList.forEach(newGroup::applyEvent);

53
src/test/java/mops/gruppen2/domain/GroupTest.java
View File

@ -2,62 +2,46 @@ package mops.gruppen2.domain;
import mops.gruppen2.domain.event.AddUserEvent;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.domain.event.UpdateRoleEvent;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.HashMap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
class GroupTest {
AddUserEvent addUserEvent;
CreateGroupEvent createGroupEvent;
@BeforeEach
public void setUp(){
}
@Disabled
@Test
void applyEvent() {
}
@Test
void applyCreateGroupEvent() {
String userId = "asd";
CreateGroupEvent event = new CreateGroupEvent(1L,2,userId, "hello", "foo");
void createSingleGroup() {
CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L,2, "asd", "hello", "foo");
Group group1 = new Group();
group1.applyEvent(event);
Group group = new Group(createGroupEvent);
Group group2 = new Group();
group2.id = 2L;
group2.title = "hello";
group2.description = "foo";
group2.members = new ArrayList<>();
group2.roles = new HashMap<>();
assertEquals(group2, group1);
assertThat(group.getDescription()).isEqualTo("foo");
assertThat(group.getTitle()).isEqualTo("hello");
assertThat(group.getId()).isEqualTo(2);
}
// Verwendet CreateGroupEvent
@Test
void applyAddUserEvent(){
Group group = new Group();
// Group testGroup = new Group();
User user = new User("prof", "jens", "bendi", "hi@gmail.com");
createGroupEvent = new CreateGroupEvent(1L,1L,"prof1", "hi", "foo");
addUserEvent = new AddUserEvent(1L,1L, user);
void addSingleUser(){
CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L,1L,"prof1", "hi", "foo");
Group group = new Group(createGroupEvent);
group.applyEvent(createGroupEvent);
User user = new User("prof", "jens", "bendi", "hi@gmail.com");
AddUserEvent addUserEvent = new AddUserEvent(1L,1L, user);
group.applyEvent(addUserEvent);
// testGroup.applyEvent(createGroupEvent);
// List<User> testTeil = new ArrayList<>();
// testTeil.add(user);
// testGroup.setMembers(testTeil);
assertThat(group.getMembers().get(0)).isEqualTo(user);
}
@ -66,10 +50,11 @@ class GroupTest {
@Test
void updateRoleForExistingUser() {
// Arrange
Group group = new Group();
CreateGroupEvent createGroupEvent = new CreateGroupEvent(1L, 1L, "1L", "gruppe1", "Eine Testgruppe");
Event addUserEvent = new AddUserEvent(1L, 1L, "5L", "Peter", "Pan", "123@mail.de");
group.applyEvent(new CreateGroupEvent(1L, 1L, "1L", "gruppe1", "Eine Testgruppe"));
group.applyEvent(new AddUserEvent(1L, 1L, "5L", "Peter", "Pan", "123@mail.de"));
Group group = new Group(createGroupEvent);
group.applyEvent(addUserEvent);
// Act
group.applyEvent(new UpdateRoleEvent(1L, 1L, "5L", Role.ORGA));