Merge remote-tracking branch 'origin/master' into updateGroupsAPI
# Conflicts: # src/main/java/mops/gruppen2/repository/EventRepository.java
This commit is contained in:
@ -9,9 +9,7 @@ import lombok.Value;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode(exclude = {"givenname", "familyname", "email"})
|
||||
public class User {
|
||||
|
||||
String user_id;
|
||||
|
||||
String givenname;
|
||||
String familyname;
|
||||
String email;
|
||||
|
||||
@ -17,4 +17,9 @@ public class UpdateGroupDescriptionEvent extends Event {
|
||||
super(event_id, group_id, user_id);
|
||||
this.newGroupDescription = newGroupDescription;
|
||||
}
|
||||
|
||||
public UpdateGroupDescriptionEvent(Long group_id, String user_id, String newGroupDescription) {
|
||||
super(group_id, user_id);
|
||||
this.newGroupDescription = newGroupDescription;
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,4 +17,9 @@ public class UpdateGroupTitleEvent extends Event {
|
||||
super(event_id, group_id, user_id);
|
||||
this.newGroupTitle = newGroupTitle;
|
||||
}
|
||||
|
||||
public UpdateGroupTitleEvent(Long group_id, String user_id, String newGroupTitle) {
|
||||
super(group_id, user_id);
|
||||
this.newGroupTitle = newGroupTitle;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user