Add InviteLinkDTO + add dto folder

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

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

@@ -3,7 +3,6 @@ package mops.gruppen2.controller;
 import mops.gruppen2.config.Gruppen2Config;
 import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
-
 import mops.gruppen2.domain.User;
 import mops.gruppen2.security.Account;
 import mops.gruppen2.service.*;
@@ -12,8 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.server.ResponseStatusException;
 
 import javax.annotation.security.RolesAllowed;
@@ -86,11 +87,7 @@ public class Gruppen2Controller {
                                @RequestParam(value = "visibility", required = false) Boolean visibility) {
 
         Account account = keyCloakService.createAccountFromPrincipal(token);
-        if (visibility == null) {
-            visibility = true;
-        }else{
-            visibility = false;
-        }
+        visibility = visibility == null;
         controllerService.createGroup(account, title, beschreibung, visibility);
 
         return "redirect:/gruppen2/";

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

@@ -1,4 +1,4 @@
-package mops.gruppen2.domain;
+package mops.gruppen2.domain.dto;
 
 import lombok.Data;
 import org.springframework.data.annotation.Id;

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

@@ -0,0 +1,13 @@
+package mops.gruppen2.domain.dto;
+
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
+
+@Table("invite")
+@Data
+public class InviteLinkDTO {
+    @Id
+    private Long group_id;
+    private String invite_link;
+}

src/main/java/mops/gruppen2/repository/EventRepository.java

@@ -1,6 +1,6 @@
 package mops.gruppen2.repository;
 
-import mops.gruppen2.domain.EventDTO;
+import mops.gruppen2.domain.dto.EventDTO;
 import org.springframework.data.jdbc.repository.query.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;

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

@@ -7,7 +7,10 @@ import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.domain.event.*;
 import mops.gruppen2.security.Account;
 import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 @Service
 public class ControllerService {
@@ -29,9 +32,9 @@ public class ControllerService {
      */
     public void createGroup(Account account, String title, String description, Boolean visibility) {
         Visibility visibility1;
-        if (visibility){
+        if (visibility) {
             visibility1 = Visibility.PUBLIC;
-        }else{
+        } else {
             visibility1 = Visibility.PRIVATE;
         }
         List<Event> eventList = new ArrayList<>();

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

@@ -1,8 +1,8 @@
 package mops.gruppen2.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import mops.gruppen2.domain.EventDTO;
 import mops.gruppen2.domain.Visibility;
+import mops.gruppen2.domain.dto.EventDTO;
 import mops.gruppen2.domain.event.CreateGroupEvent;
 import mops.gruppen2.domain.event.Event;
 import mops.gruppen2.repository.EventRepository;

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

@@ -1,8 +1,8 @@
 package mops.gruppen2.service;
 
-import mops.gruppen2.domain.EventDTO;
 import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
+import mops.gruppen2.domain.dto.EventDTO;
 import mops.gruppen2.domain.event.Event;
 import mops.gruppen2.repository.EventRepository;
 import org.springframework.stereotype.Service;

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

@@ -2,7 +2,6 @@ package mops.gruppen2.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import mops.gruppen2.domain.EventDTO;
 import mops.gruppen2.domain.event.Event;
 import mops.gruppen2.repository.EventRepository;
 import org.slf4j.Logger;

src/test/java/mops/gruppen2/service/EventServiceTest.java

@@ -1,8 +1,8 @@
 package mops.gruppen2.service;
 
-import mops.gruppen2.domain.EventDTO;
 import mops.gruppen2.domain.GroupType;
 import mops.gruppen2.domain.Visibility;
+import mops.gruppen2.domain.dto.EventDTO;
 import mops.gruppen2.domain.event.AddUserEvent;
 import mops.gruppen2.domain.event.CreateGroupEvent;
 import mops.gruppen2.repository.EventRepository;
@@ -14,7 +14,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;