Merge branch 'refactoring' into error-handling

# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
#	src/main/java/mops/gruppen2/domain/Group.java
#	src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
#	src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/Event.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
#	src/main/java/mops/gruppen2/domain/exception/EventException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java
#	src/main/java/mops/gruppen2/domain/exception/NoValueException.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/main/java/mops/gruppen2/service/UserService.java
#	src/main/resources/templates/errorRenameLater.html

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

@@ -1,7 +1,5 @@
 package mops.gruppen2.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,17 +11,15 @@ import java.util.Map;
 /**
  * Repräsentiert den aggregierten Zustand einer Gruppe.
  */
-@EqualsAndHashCode(callSuper = false)
 @Getter
 @Setter
-@AllArgsConstructor
 public class Group {
+
+    private final List<User> members;
+    private final Map<String, Role> roles;
     private Long id;
     private String title;
     private String description;
-    private final List<User> members;
-    private final Map<String, Role> roles;
-
     private GroupType type;
     private Visibility visibility;
     private Long parent;

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

@@ -1,17 +1,16 @@
 package mops.gruppen2.domain;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.Getter;
 
-@Data
+@Getter
 @AllArgsConstructor
-@NoArgsConstructor
 @EqualsAndHashCode(exclude = {"givenname", "familyname", "email"})
 public class User {
-    String user_id;
-    String givenname;
-    String familyname;
-    String email;
+
+    private final String id;
+    private final String givenname;
+    private final String familyname;
+    private final String email;
 }

src/main/java/mops/gruppen2/domain/api/GroupRequestWrapper.java

@@ -0,0 +1,16 @@
+package mops.gruppen2.domain.api;
+
+import lombok.AllArgsConstructor;
+import mops.gruppen2.domain.Group;
+
+import java.util.List;
+
+/**
+ * Kombiniert den Status und die Gruppenliste zur ausgabe über die API.
+ */
+@AllArgsConstructor
+public class GroupRequestWrapper {
+
+    private final Long status;
+    private final List<Group> groupList;
+}

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

@@ -1,16 +0,0 @@
-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/dto/EventDTO.java

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

src/main/java/mops/gruppen2/domain/dto/InviteLinkDTO.java

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

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

@@ -3,26 +3,26 @@ package mops.gruppen2.domain.event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.UserAlreadyExistsException;
 
 /**
  * Fügt einen einzelnen Nutzer einer Gruppe hinzu.
  */
 @Getter
 @AllArgsConstructor
-@NoArgsConstructor
+@NoArgsConstructor // For Jackson
 public class AddUserEvent extends Event {
 
     private String givenname;
     private String familyname;
     private String email;
 
-    public AddUserEvent(Long group_id, String user_id, String givenname, String familyname, String email) {
-        super(group_id, user_id);
+    public AddUserEvent(Long groupId, String userId, String givenname, String familyname, String email) {
+        super(groupId, userId);
         this.givenname = givenname;
         this.familyname = familyname;
         this.email = email;
@@ -30,13 +30,13 @@ public class AddUserEvent extends Event {
 
     @Override
     public void applyEvent(Group group) throws EventException {
-        User user = new User(this.user_id, this.givenname, this.familyname, this.email);
+        User user = new User(this.userId, this.givenname, this.familyname, this.email);
 
         if (group.getMembers().contains(user)) {
             throw new UserAlreadyExistsException(this.getClass().toString());
         }
 
         group.getMembers().add(user);
-        group.getRoles().put(user_id, Role.MEMBER);
+        group.getRoles().put(userId, Role.MEMBER);
     }
 }

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

@@ -9,23 +9,23 @@ import mops.gruppen2.domain.Visibility;
 
 @Getter
 @AllArgsConstructor
-@NoArgsConstructor
+@NoArgsConstructor // For Jackson
 public class CreateGroupEvent extends Event {
 
     private Visibility groupVisibility;
     private Long groupParent;
     private GroupType groupType;
 
-    public CreateGroupEvent(Long group_id, String user_id, Long parent, GroupType type, Visibility visibility) {
-        super(group_id, user_id);
+    public CreateGroupEvent(Long groupId, String userId, Long parent, GroupType type, Visibility visibility) {
+        super(groupId, userId);
         this.groupParent = parent;
         this.groupType = type;
         this.groupVisibility = visibility;
     }
 
     @Override
-    public void applyEvent(Group group) {
-        group.setId(this.group_id);
+    public void apply(Group group) {
+        group.setId(this.groupId);
         group.setParent(this.groupParent);
         group.setType(this.groupType);
         group.setVisibility(this.groupVisibility);

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

@@ -1,15 +1,15 @@
 package mops.gruppen2.domain.event;
 
-import lombok.EqualsAndHashCode;
-import lombok.Value;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import mops.gruppen2.domain.Group;
 
-@EqualsAndHashCode(callSuper = true)
-@Value
+@Getter
+@NoArgsConstructor // For Jackson
 public class DeleteGroupEvent extends Event {
 
-    public DeleteGroupEvent(long group_id, String user_id) {
-        super(group_id, user_id);
+    public DeleteGroupEvent(Long groupId, String userId) {
+        super(groupId, userId);
     }
 
     @Override

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

@@ -2,28 +2,28 @@ package mops.gruppen2.domain.event;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.UserNotFoundException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.UserNotFoundException;
 
 /**
  * Entfernt ein einzelnes Mitglied einer Gruppe.
  */
 @Getter
-@NoArgsConstructor
+@NoArgsConstructor // For Jackson
 public class DeleteUserEvent extends Event {
 
-    public DeleteUserEvent(Long group_id, String user_id) {
-        super(group_id, user_id);
+    public DeleteUserEvent(Long groupId, String userId) {
+        super(groupId, userId);
     }
 
     @Override
     public void applyEvent(Group group) throws EventException {
         for (User user : group.getMembers()) {
-            if (user.getUser_id().equals(this.user_id)) {
+            if (user.getId().equals(this.userId)) {
                 group.getMembers().remove(user);
-                group.getRoles().remove(user.getUser_id());
+                group.getRoles().remove(user.getId());
                 return;
             }
         }

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

@@ -5,32 +5,29 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.GroupIdMismatchException;
 import mops.gruppen2.domain.Group;
+import mops.gruppen2.domain.exception.EventException;
+
 
 @JsonTypeInfo(
-        include = JsonTypeInfo.As.PROPERTY,
         use = JsonTypeInfo.Id.NAME,
         property = "type"
 )
 @JsonSubTypes({
-        @JsonSubTypes.Type(value = AddUserEvent.class, name = "AddUserEvent"),
-        @JsonSubTypes.Type(value = CreateGroupEvent.class, name = "CreateGroupEvent"),
-        @JsonSubTypes.Type(value = DeleteUserEvent.class, name = "DeleteUserEvent"),
-        @JsonSubTypes.Type(value = UpdateGroupDescriptionEvent.class, name = "UpdateGroupDescriptionEvent"),
-        @JsonSubTypes.Type(value = UpdateGroupTitleEvent.class, name = "UpdateGroupTitleEvent"),
-        @JsonSubTypes.Type(value = UpdateRoleEvent.class, name = "UpdateRoleEvent"),
-})
+                      @JsonSubTypes.Type(value = AddUserEvent.class, name = "AddUserEvent"),
+                      @JsonSubTypes.Type(value = CreateGroupEvent.class, name = "CreateGroupEvent"),
+                      @JsonSubTypes.Type(value = DeleteUserEvent.class, name = "DeleteUserEvent"),
+                      @JsonSubTypes.Type(value = UpdateGroupDescriptionEvent.class, name = "UpdateGroupDescriptionEvent"),
+                      @JsonSubTypes.Type(value = UpdateGroupTitleEvent.class, name = "UpdateGroupTitleEvent"),
+                      @JsonSubTypes.Type(value = UpdateRoleEvent.class, name = "UpdateRoleEvent"),
+              })
 @Getter
-@Setter
-@NoArgsConstructor // Needed by Lombok in Subclasses
+@NoArgsConstructor
 @AllArgsConstructor
 public abstract class Event {
 
-    protected Long group_id;
-    protected String user_id;
+    protected Long groupId;
+    protected String userId;
 
     public void apply(Group group) throws EventException {
         checkGroupIdMatch(group.getId());
@@ -39,8 +36,8 @@ public abstract class Event {
 
     protected abstract void applyEvent(Group group) throws EventException;
 
-    private void checkGroupIdMatch(Long group_id) {
-        if (group_id == null || this.group_id.equals(group_id)) {
+    private void checkGroupIdMatch(Long groupId) {
+        if (groupId == null || this.group_id.equals(groupId)) {
             return;
         }
 

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

@@ -11,13 +11,13 @@ import mops.gruppen2.domain.Group;
  */
 @Getter
 @AllArgsConstructor
-@NoArgsConstructor
+@NoArgsConstructor // For Jackson
 public class UpdateGroupDescriptionEvent extends Event {
 
     private String newGroupDescription;
 
-    public UpdateGroupDescriptionEvent(Long group_id, String user_id, String newGroupDescription) {
-        super(group_id, user_id);
+    public UpdateGroupDescriptionEvent(Long groupId, String userId, String newGroupDescription) {
+        super(groupId, userId);
         this.newGroupDescription = newGroupDescription;
     }
 

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

@@ -11,13 +11,13 @@ import mops.gruppen2.domain.Group;
  */
 @Getter
 @AllArgsConstructor
-@NoArgsConstructor
+@NoArgsConstructor // For Jackson
 public class UpdateGroupTitleEvent extends Event {
 
     private String newGroupTitle;
 
-    public UpdateGroupTitleEvent(Long group_id, String user_id, String newGroupTitle) {
-        super(group_id, user_id);
+    public UpdateGroupTitleEvent(Long groupId, String userId, String newGroupTitle) {
+        super(groupId, userId);
         this.newGroupTitle = newGroupTitle;
     }
 

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

@@ -3,29 +3,28 @@ package mops.gruppen2.domain.event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.UserNotFoundException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
+import mops.gruppen2.domain.exception.UserNotFoundException;
 
 /**
  * Aktualisiert die Gruppenrolle eines Teilnehmers.
  */
 @Getter
 @AllArgsConstructor
-@NoArgsConstructor
+@NoArgsConstructor // For Jackson
 public class UpdateRoleEvent extends Event {
 
     private Role newRole;
 
-    public UpdateRoleEvent(Long group_id, String user_id, Role newRole) {
-        super(group_id, user_id);
+    public UpdateRoleEvent(Long groupId, String userId, Role newRole) {
+        super(groupId, userId);
         this.newRole = newRole;
     }
-
     @Override
     public void applyEvent(Group group) throws UserNotFoundException {
-        if (group.getRoles().containsKey(user_id)) {
-            group.getRoles().put(this.user_id, this.newRole);
+        if (group.getRoles().containsKey(this.userId)) {
+            group.getRoles().put(this.userId, this.newRole);
         }
 
         throw new UserNotFoundException(this.getClass().toString());

src/main/java/mops/gruppen2/domain/exception/EventException.java

@@ -1,4 +1,4 @@
-package mops.gruppen2.domain.Exceptions;
+package mops.gruppen2.domain.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;

src/main/java/mops/gruppen2/domain/exception/UserAlreadyExistsException.java

@@ -0,0 +1,8 @@
+package mops.gruppen2.domain.exception;
+
+public class UserAlreadyExistsException extends EventException {
+
+    public UserAlreadyExistsException(String msg) {
+        super(msg);
+    }
+}

src/main/java/mops/gruppen2/domain/exception/UserNotFoundException.java

@@ -0,0 +1,8 @@
+package mops.gruppen2.domain.exception;
+
+public class UserNotFoundException extends EventException {
+
+    public UserNotFoundException(String msg) {
+        super(msg);
+    }
+}