From ca469d83af44ca5872c6d90c999e12653e7b514b Mon Sep 17 00:00:00 2001 From: Lukas Ettel <34522828+LukasEttel@users.noreply.github.com> Date: Mon, 16 Mar 2020 17:01:44 +0100 Subject: [PATCH] even further stuff Co-Authored-By: Talha Caliskan Co-Authored-By: tomvahl Co-Authored-By: xxnitram Co-Authored-By: kasch309 --- .../mops/gruppen2/domain/event/DeleteGroupEvent.java | 11 +++++++++++ .../mops/gruppen2/domain/event/DeleteUserEvent.java | 7 ++----- .../gruppen2/domain/event/DeleteUserEventTest.java | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java index 93b4fce..4b8a6e3 100644 --- a/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/DeleteGroupEvent.java @@ -2,6 +2,7 @@ package mops.gruppen2.domain.event; import lombok.EqualsAndHashCode; import lombok.Value; +import mops.gruppen2.domain.Group; @EqualsAndHashCode(callSuper = true) @Value @@ -11,4 +12,14 @@ public class DeleteGroupEvent extends Event { super(group_id, user_id); } + @Override + public void apply(Group group) { + group.getRoles().clear(); + group.getMembers().clear(); + group.setTitle(null); + group.setDescription(null); + group.setVisibility(null); + group.setType(null); + group.setParent(null); + } } diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java index b22bcd3..6deb074 100644 --- a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java +++ b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java @@ -14,14 +14,11 @@ public class DeleteUserEvent extends Event { super(group_id, user_id); } - public DeleteUserEvent() { - } - public void apply(Group group) { for (User user : group.getMembers()) { if (user.getUser_id().equals(this.user_id)) { - group.members.remove(user); - group.getRoles().remove(user_id); + group.getMembers().remove(user); + group.getRoles().remove(user.getUser_id()); return; } } diff --git a/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java b/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java index a903776..59fc2de 100644 --- a/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java +++ b/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java @@ -28,6 +28,8 @@ class DeleteUserEventTest { event.apply(group); + assertThat(group.getMembers().size()).isEqualTo(1); assertThat(group.getRoles().size()).isEqualTo(1); + } } \ No newline at end of file