1

Merge remote-tracking branch 'origin/master' into updateGroupsAPI

# Conflicts:
#	src/main/java/mops/gruppen2/repository/EventRepository.java
This commit is contained in:
LukasEttel
2020-03-12 16:31:23 +01:00
11 changed files with 139 additions and 29 deletions

View File

@ -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;

View File

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

View File

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