Merge branch 'master' into change_DTO

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

@@ -17,7 +17,7 @@ public class Group extends Aggregate {
     private String title;
     private String description;
     private final List<User> members;
-    private final Map<User, Role> roles;
+    private final Map<String, Role> roles;
 
     private GroupType type;
     private Visibility visibility;
@@ -51,7 +51,7 @@ public class Group extends Aggregate {
         if (roles.containsKey(user) && event.getNewRole() == Role.MEMBER) {
             roles.remove(user);
         } else {
-            roles.put(user, event.getNewRole());
+            roles.put(user.getUser_id(), event.getNewRole());
         }
     }
 

src/main/java/mops/gruppen2/domain/apiWrapper/UpdatedGroupRequestMapper.java

@@ -0,0 +1,16 @@
+package mops.gruppen2.domain.apiWrapper;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import mops.gruppen2.domain.Group;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdatedGroupRequestMapper {
+    private Long status;
+    private List<Group> groupList;
+}

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

@@ -15,7 +15,12 @@ public class UpdateRoleEvent extends Event {
 
     public UpdateRoleEvent(Long event_id, Long group_id, String user_id, Role newRole) {
         super(event_id, group_id, user_id);
-
         this.newRole = newRole;
     }
+  
+    public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {
+        super(group_id, user_id);
+        this.newRole = newRole;
+    }
+
 }