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

change AddUserEvent and DeleteUserEvent

Browse Source
This commit is contained in:
killerber4t
2020-03-16 15:46:23 +01:00
parent 22eede051b
commit 315d1d6011
5 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
View File

@ -3,6 +3,7 @@ package mops.gruppen2.domain.event;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User; import mops.gruppen2.domain.User;
/** /**
@ -16,13 +17,6 @@ public class AddUserEvent extends Event {
String familyname; String familyname;
String email; String email;
public AddUserEvent(Long event_id, Long group_id, String user_id, String givenname, String familyname, String email) {
super(event_id, group_id, user_id);
this.givenname = givenname;
this.familyname = familyname;
this.email = email;
}
public AddUserEvent(Long group_id, String user_id, String givenname, String familyname, String email) { public AddUserEvent(Long group_id, String user_id, String givenname, String familyname, String email) {
super(group_id, user_id); super(group_id, user_id);
this.givenname = givenname; this.givenname = givenname;
@ -30,10 +24,7 @@ public class AddUserEvent extends Event {
this.email = email; this.email = email;
} }
public AddUserEvent(Long event_id, Long group_id, User user) { public void apply(Group group, User user) {
super(event_id, group_id, user.getUser_id()); group.getMembers().add(user);
this.givenname = user.getGivenname();
this.familyname = user.getFamilyname();
this.email = user.getEmail();
} }
} }

4
src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java
View File

@ -7,8 +7,8 @@ import lombok.Value;
@Value @Value
public class DeleteGroupEvent extends Event { public class DeleteGroupEvent extends Event {
public DeleteGroupEvent(long event_id, long group_id, String user_id) { public DeleteGroupEvent(long group_id, String user_id) {
super(event_id, group_id, user_id); super(group_id, user_id);
} }
} }

10
src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
View File

@ -1,15 +1,21 @@
package mops.gruppen2.domain.event; package mops.gruppen2.domain.event;
import lombok.*; import lombok.*;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
/** /**
* Entfernt ein einzelnes Mitglied einer Gruppe. * Entfernt ein einzelnes Mitglied einer Gruppe.
*/ */
@Getter @Getter
public class DeleteUserEvent extends Event { public class DeleteUserEvent extends Event {
public DeleteUserEvent(Long event_id, Long group_id, String user_id) { public DeleteUserEvent(Long group_id, String user_id) {
super(event_id, group_id, user_id); super(group_id, user_id);
} }
public DeleteUserEvent() {} public DeleteUserEvent() {}
public void apply(Group group, User user) {
group.getMembers().remove(user);
}
} }

1
src/main/java/mops/gruppen2/domain/event/Event.java
View File

@ -26,7 +26,6 @@ import lombok.Setter;
}) })
@Setter @Setter
public class Event { public class Event {
Long event_id;
Long group_id; Long group_id;
String user_id; String user_id;

8
src/test/java/mops/gruppen2/service/GroupServiceTest.java
View File

@ -36,9 +36,9 @@ class GroupServiceTest {
eventList.add(new CreateGroupEvent(1L,"Ulli", null, GroupType.LECTURE, Visibility.PRIVATE)); eventList.add(new CreateGroupEvent(1L,"Ulli", null, GroupType.LECTURE, Visibility.PRIVATE));
eventList.add(new DeleteGroupEvent(44, 10, "loescher78")); eventList.add(new DeleteGroupEvent(10, "loescher78"));
eventList.add(new AddUserEvent(900L, 10L, "Ulli", "Ulli", "Honnis", "FC@B.de")); eventList.add(new AddUserEvent(10L, "Ulli", "Ulli", "Honnis", "FC@B.de"));
Assertions.assertThrows(GroupDoesNotExistException.class, () -> { Assertions.assertThrows(GroupDoesNotExistException.class, () -> {
@ -53,7 +53,7 @@ class GroupServiceTest {
eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE)); eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE));
eventList.add(new DeleteGroupEvent(44, 1L, "loescher78")); eventList.add(new DeleteGroupEvent(1L, "loescher78"));
List<Group> list = new ArrayList<>(); List<Group> list = new ArrayList<>();
@ -66,7 +66,7 @@ class GroupServiceTest {
eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE)); eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE));
eventList.add(new AddUserEvent(900L, 1L, "Ulli", "Ulli", "Honnis", "FC@B.de")); eventList.add(new AddUserEvent(1L, "Ulli", "Ulli", "Honnis", "FC@B.de"));
assertThat(groupService.projectEventList(eventList).get(0)).isInstanceOf(Group.class); assertThat(groupService.projectEventList(eventList).get(0)).isInstanceOf(Group.class);
} }