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

Merge branch 'master' into group-details

Browse Source
This commit is contained in:
kasch309
2020-03-13 16:36:13 +01:00
committed by GitHub
parent bfa008f9ef a8adbbb31c
commit e5b69c0cc0
13 changed files with 163 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());
}
}

4
src/main/java/mops/gruppen2/domain/apiWrapper/UpdatedGroupRequestMapper.java
View File

@ -10,7 +10,7 @@ import java.util.List;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class UpdatedGroupRequestMapper {
public class UpdatedGroupRequestMapper {
private Long status;
private List<Group> groupList;
}
}

8
src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
View File

@ -14,8 +14,12 @@ public class UpdateRoleEvent extends Event {
Role newRole;
public UpdateRoleEvent(Long event_id, Long group_id, String user_id, Role newRole) {
super(event_id,+ group_id, user_id);
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;
}
public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {