1

fix merge errors

Co-authored-by: Christoph <tobi@urpost.de>
This commit is contained in:
Christoph
2020-03-19 00:00:33 +01:00
parent 1c5139da8c
commit fdd9d44aac
3 changed files with 16 additions and 8 deletions

View File

@ -1,11 +1,13 @@
package mops.gruppen2.domain.dto; package mops.gruppen2.domain.dto;
import lombok.Value; import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.relational.core.mapping.Table; import org.springframework.data.relational.core.mapping.Table;
@Table("event") @Table("event")
@Value @Getter
@AllArgsConstructor
public class EventDTO { public class EventDTO {
@Id @Id

View File

@ -1,12 +1,13 @@
package mops.gruppen2.domain.dto; package mops.gruppen2.domain.dto;
import lombok.Value; import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.relational.core.mapping.Table; import org.springframework.data.relational.core.mapping.Table;
@SuppressWarnings("checkstyle:membername")
@Table("invite") @Table("invite")
@Value @Getter
@AllArgsConstructor
public class InviteLinkDTO { public class InviteLinkDTO {
@Id @Id

View File

@ -13,6 +13,7 @@ import mops.gruppen2.domain.event.UpdateGroupDescriptionEvent;
import mops.gruppen2.domain.event.UpdateGroupTitleEvent; import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
import mops.gruppen2.domain.event.UpdateRoleEvent; import mops.gruppen2.domain.event.UpdateRoleEvent;
import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.exception.EventException;
import mops.gruppen2.domain.exception.UserNotFoundException;
import mops.gruppen2.security.Account; import mops.gruppen2.security.Account;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -98,7 +99,11 @@ public class ControllerService {
user = member; user = member;
} }
} }
assert user != null;
if (user == null) {
throw new UserNotFoundException(this.getClass().toString());
}
if (group.getRoles().get(user.getId()) == Role.ADMIN) { if (group.getRoles().get(user.getId()) == Role.ADMIN) {
updateRoleEvent = new UpdateRoleEvent(groupId, user.getId(), Role.MEMBER); updateRoleEvent = new UpdateRoleEvent(groupId, user.getId(), Role.MEMBER);
} else { } else {