Merge refactor into error-handling + fix merge errors

Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>

src/main/java/mops/gruppen2/controller/Gruppen2Controller.java

@@ -1,12 +1,11 @@
 package mops.gruppen2.controller;
 
 import mops.gruppen2.config.Gruppen2Config;
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.GroupNotFoundException;
 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.GroupNotFoundException;
 import mops.gruppen2.security.Account;
 import mops.gruppen2.service.ControllerService;
 import mops.gruppen2.service.CsvService;

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

@@ -1,10 +0,0 @@
-package mops.gruppen2.domain.Exceptions;
-
-import org.springframework.http.HttpStatus;
-
-public class UserAlreadyExistsException extends EventException {
-
-    public UserAlreadyExistsException(String info) {
-        super(HttpStatus.INTERNAL_SERVER_ERROR, "Der User existiert bereits.", info);
-    }
-}

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

@@ -1,10 +0,0 @@
-package mops.gruppen2.domain.Exceptions;
-
-import org.springframework.http.HttpStatus;
-
-public class UserNotFoundException extends EventException {
-
-    public UserNotFoundException(String info) {
-        super(HttpStatus.NOT_FOUND, "Der User wurde nicht gefunden.", info);
-    }
-}

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

@@ -24,7 +24,7 @@ public class CreateGroupEvent extends Event {
     }
 
     @Override
-    public void apply(Group group) {
+    public void applyEvent(Group group) {
         group.setId(this.groupId);
         group.setParent(this.groupParent);
         group.setType(this.groupType);

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

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.GroupIdMismatchException;
 
 
 @JsonTypeInfo(
@@ -37,7 +38,7 @@ public abstract class Event {
     protected abstract void applyEvent(Group group) throws EventException;
 
     private void checkGroupIdMatch(Long groupId) {
-        if (groupId == null || this.group_id.equals(groupId)) {
+        if (groupId == null || this.groupId.equals(groupId)) {
             return;
         }
 

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

@@ -3,8 +3,8 @@ package mops.gruppen2.domain.event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.NoValueException;
 import mops.gruppen2.domain.Group;
+import mops.gruppen2.domain.exception.NoValueException;
 
 /**
  * Ändert nur die Gruppenbeschreibung.

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

@@ -3,8 +3,8 @@ package mops.gruppen2.domain.event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.NoValueException;
 import mops.gruppen2.domain.Group;
+import mops.gruppen2.domain.exception.NoValueException;
 
 /**
  * Ändert nur den Gruppentitel.

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

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

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

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

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

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

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

@@ -1,8 +1,10 @@
 package mops.gruppen2.domain.exception;
 
+import org.springframework.http.HttpStatus;
+
 public class UserAlreadyExistsException extends EventException {
 
-    public UserAlreadyExistsException(String msg) {
-        super(msg);
+    public UserAlreadyExistsException(String info) {
+        super(HttpStatus.INTERNAL_SERVER_ERROR, "Der User existiert bereits.", info);
     }
 }

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

@@ -1,8 +1,10 @@
 package mops.gruppen2.domain.exception;
 
+import org.springframework.http.HttpStatus;
+
 public class UserNotFoundException extends EventException {
 
-    public UserNotFoundException(String msg) {
-        super(msg);
+    public UserNotFoundException(String info) {
+        super(HttpStatus.NOT_FOUND, "Der User wurde nicht gefunden.", info);
     }
 }

src/main/java/mops/gruppen2/service/UserService.java

@@ -4,6 +4,7 @@ import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.User;
 import mops.gruppen2.domain.event.Event;
 import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.GroupNotFoundException;
 import mops.gruppen2.repository.EventRepository;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +40,7 @@ public class UserService {
 
     public Group getGroupById(Long groupId) throws EventException {
         List<Long> groupIds = new ArrayList<>();
-        group_ids.add(groupId);
+        groupIds.add(groupId);
 
         try {
             List<Event> events = groupService.getGroupEvents(groupIds);