christoph/lecture-professional-software-development
1
Fork 0
Code Activity

changed package structure

Browse Source
This commit is contained in:
Christoph
2020-04-12 11:54:25 +02:00
parent 1e2a0b4cfb
commit 2065f53209
26 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mops/gruppen2/service/APIService.java → src/main/java/mops/gruppen2/domain/service/APIService.java
View File

@ -1,8 +1,8 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.api.GroupRequestWrapper;
import mops.gruppen2.web.api.GroupRequestWrapper;
import org.springframework.stereotype.Service;
import java.util.List;

2
src/main/java/mops/gruppen2/service/ControllerService.java → src/main/java/mops/gruppen2/domain/service/ControllerService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.GroupType;

2
src/main/java/mops/gruppen2/service/CsvService.java → src/main/java/mops/gruppen2/domain/service/CsvService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.dataformat.csv.CsvMapper;

6
src/main/java/mops/gruppen2/service/EventStoreService.java → src/main/java/mops/gruppen2/domain/service/EventStoreService.java
View File

@ -1,14 +1,14 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.event.AddUserEvent;
import mops.gruppen2.domain.event.CreateGroupEvent;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.domain.exception.BadPayloadException;
import mops.gruppen2.repository.EventRepository;
import mops.gruppen2.persistance.EventRepository;
import mops.gruppen2.persistance.dto.EventDTO;
import org.springframework.stereotype.Service;
import java.util.ArrayList;

2
src/main/java/mops/gruppen2/service/GroupService.java → src/main/java/mops/gruppen2/domain/service/GroupService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.Group;

2
src/main/java/mops/gruppen2/service/IdService.java → src/main/java/mops/gruppen2/domain/service/IdService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;

6
src/main/java/mops/gruppen2/service/InviteService.java → src/main/java/mops/gruppen2/domain/service/InviteService.java
View File

@ -1,11 +1,11 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.dto.InviteLinkDTO;
import mops.gruppen2.domain.exception.InvalidInviteException;
import mops.gruppen2.domain.exception.NoInviteExistException;
import mops.gruppen2.repository.InviteRepository;
import mops.gruppen2.persistance.InviteRepository;
import mops.gruppen2.persistance.dto.InviteLinkDTO;
import org.springframework.stereotype.Service;
import java.util.UUID;

2
src/main/java/mops/gruppen2/service/JsonService.java → src/main/java/mops/gruppen2/domain/service/JsonService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

2
src/main/java/mops/gruppen2/service/ProjectionService.java → src/main/java/mops/gruppen2/domain/service/ProjectionService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.Group;

2
src/main/java/mops/gruppen2/service/SearchService.java → src/main/java/mops/gruppen2/domain/service/SearchService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.Group;

2
src/main/java/mops/gruppen2/service/ValidationService.java → src/main/java/mops/gruppen2/domain/service/ValidationService.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.Group;

4
src/main/java/mops/gruppen2/repository/EventRepository.java → src/main/java/mops/gruppen2/persistance/EventRepository.java
View File

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

4
src/main/java/mops/gruppen2/repository/InviteRepository.java → src/main/java/mops/gruppen2/persistance/InviteRepository.java
View File

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

2
src/main/java/mops/gruppen2/domain/dto/EventDTO.java → src/main/java/mops/gruppen2/persistance/dto/EventDTO.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.domain.dto;
package mops.gruppen2.persistance.dto;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/mops/gruppen2/domain/dto/InviteLinkDTO.java → src/main/java/mops/gruppen2/persistance/dto/InviteLinkDTO.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.domain.dto;
package mops.gruppen2.persistance.dto;
import lombok.AllArgsConstructor;
import lombok.Getter;

12
src/main/java/mops/gruppen2/controller/APIController.java → src/main/java/mops/gruppen2/web/APIController.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.controller;
package mops.gruppen2.web;
import io.swagger.annotations.ApiOperation;
@ -7,11 +7,11 @@ import lombok.extern.log4j.Log4j2;
import mops.gruppen2.aspect.annotation.TraceMethodCalls;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.api.GroupRequestWrapper;
import mops.gruppen2.service.APIService;
import mops.gruppen2.service.EventStoreService;
import mops.gruppen2.service.IdService;
import mops.gruppen2.service.ProjectionService;
import mops.gruppen2.domain.service.APIService;
import mops.gruppen2.domain.service.EventStoreService;
import mops.gruppen2.domain.service.IdService;
import mops.gruppen2.domain.service.ProjectionService;
import mops.gruppen2.web.api.GroupRequestWrapper;
import org.springframework.security.access.annotation.Secured;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

27
src/main/java/mops/gruppen2/controller/GroupCreationController.java → src/main/java/mops/gruppen2/web/GroupCreationController.java
View File

@ -1,14 +1,14 @@
package mops.gruppen2.controller;
package mops.gruppen2.web;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.aspect.annotation.TraceMethodCalls;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.service.CsvService;
import mops.gruppen2.service.GroupService;
import mops.gruppen2.service.IdService;
import mops.gruppen2.service.ProjectionService;
import mops.gruppen2.service.ValidationService;
import mops.gruppen2.domain.service.CsvService;
import mops.gruppen2.domain.service.GroupService;
import mops.gruppen2.domain.service.IdService;
import mops.gruppen2.domain.service.ProjectionService;
import mops.gruppen2.domain.service.ValidationService;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Controller;
@ -20,9 +20,12 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.security.RolesAllowed;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import static mops.gruppen2.service.ControllerService.getGroupType;
import static mops.gruppen2.service.ControllerService.getParent;
import static mops.gruppen2.domain.service.ControllerService.getGroupType;
import static mops.gruppen2.domain.service.ControllerService.getParent;
@SuppressWarnings("SameReturnValue")
@Log4j2
@ -52,11 +55,11 @@ public class GroupCreationController {
@PostMapping("/create")
@CacheEvict(value = "groups", allEntries = true)
public String postCreateOrga(KeycloakAuthenticationToken token,
@RequestParam("title") String title,
@RequestParam("description") String description,
@RequestParam("type") String type,
@NotBlank @RequestParam("title") String title,
@NotBlank @RequestParam("description") String description,
@NotBlank @RequestParam("type") String type,
@Min(1) @Max(100_000) @RequestParam("userlimit") long userLimit,
@RequestParam(value = "parent", defaultValue = "") String parent,
@RequestParam("userlimit") long userLimit,
@RequestParam(value = "file", required = false) MultipartFile file) {
ValidationService.validateGroupType(token, type);

23
src/main/java/mops/gruppen2/controller/GroupDetailsController.java → src/main/java/mops/gruppen2/web/GroupDetailsController.java
View File

@ -1,15 +1,15 @@
package mops.gruppen2.controller;
package mops.gruppen2.web;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.aspect.annotation.TraceMethodCalls;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.User;
import mops.gruppen2.service.CsvService;
import mops.gruppen2.service.GroupService;
import mops.gruppen2.service.IdService;
import mops.gruppen2.service.InviteService;
import mops.gruppen2.service.ProjectionService;
import mops.gruppen2.service.ValidationService;
import mops.gruppen2.domain.service.CsvService;
import mops.gruppen2.domain.service.GroupService;
import mops.gruppen2.domain.service.IdService;
import mops.gruppen2.domain.service.InviteService;
import mops.gruppen2.domain.service.ProjectionService;
import mops.gruppen2.domain.service.ValidationService;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Controller;
@ -23,6 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.security.RolesAllowed;
import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.util.UUID;
@SuppressWarnings("SameReturnValue")
@ -123,8 +126,8 @@ public class GroupDetailsController {
@CacheEvict(value = "groups", allEntries = true)
public String postDetailsMetaUpdate(KeycloakAuthenticationToken token,
@PathVariable("id") String groupId,
@RequestParam("title") String title,
@RequestParam("description") String description) {
@NotBlank @RequestParam("title") String title,
@NotBlank @RequestParam("description") String description) {
User user = new User(token);
Group group = projectionService.projectSingleGroup(UUID.fromString(groupId));
@ -140,7 +143,7 @@ public class GroupDetailsController {
@CacheEvict(value = "groups", allEntries = true)
public String postDetailsMembersUpdateUserLimit(KeycloakAuthenticationToken token,
@PathVariable("id") String groupId,
@RequestParam("userlimit") long userLimit) {
@Min(1) @Max(100_000) @RequestParam("userlimit") long userLimit) {
User user = new User(token);
Group group = projectionService.projectSingleGroup(UUID.fromString(groupId));

4
src/main/java/mops/gruppen2/controller/GruppenfindungController.java → src/main/java/mops/gruppen2/web/GruppenfindungController.java
View File

@ -1,10 +1,10 @@
package mops.gruppen2.controller;
package mops.gruppen2.web;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.aspect.annotation.TraceMethodCall;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.exception.PageNotFoundException;
import mops.gruppen2.service.ProjectionService;
import mops.gruppen2.domain.service.ProjectionService;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;

2
src/main/java/mops/gruppen2/controller/ModelAttributeControllerAdvice.java → src/main/java/mops/gruppen2/web/ModelAttributeControllerAdvice.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.controller;
package mops.gruppen2.web;
import mops.gruppen2.domain.Account;
import mops.gruppen2.domain.GroupType;

10
src/main/java/mops/gruppen2/controller/SearchAndInviteController.java → src/main/java/mops/gruppen2/web/SearchAndInviteController.java
View File

@ -1,14 +1,14 @@
package mops.gruppen2.controller;
package mops.gruppen2.web;
import lombok.extern.log4j.Log4j2;
import mops.gruppen2.aspect.annotation.TraceMethodCalls;
import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.User;
import mops.gruppen2.service.InviteService;
import mops.gruppen2.service.ProjectionService;
import mops.gruppen2.service.SearchService;
import mops.gruppen2.service.ValidationService;
import mops.gruppen2.domain.service.InviteService;
import mops.gruppen2.domain.service.ProjectionService;
import mops.gruppen2.domain.service.SearchService;
import mops.gruppen2.domain.service.ValidationService;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;

2
src/main/java/mops/gruppen2/domain/api/GroupRequestWrapper.java → src/main/java/mops/gruppen2/web/api/GroupRequestWrapper.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.domain.api;
package mops.gruppen2.web.api;
import lombok.AllArgsConstructor;
import lombok.Getter;

8
src/test/java/mops/gruppen2/service/ControllerServiceTest.java → src/test/java/mops/gruppen2/domain/service/ControllerServiceTest.java
View File

@ -1,8 +1,8 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import mops.gruppen2.Gruppen2Application;
import mops.gruppen2.domain.Account;
import mops.gruppen2.repository.EventRepository;
import mops.gruppen2.persistance.EventRepository;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@ -247,7 +247,7 @@ class ControllerServiceTest {
List<Group> groups = projectionService.projectUserGroups(account.getName());
User user = new User(account2.getName(), "", "", "");
Throwable exception = assertThrows(UserNotFoundException.class, () -> groupService.updateRole(user, groups.get(0).getId()));
assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.service.ValidationService)\"", exception.getMessage());
assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.domain.service.ValidationService)\"", exception.getMessage());
}
//TODO: GroupServiceTest
@ -257,7 +257,7 @@ class ControllerServiceTest {
List<Group> groups = projectionService.projectUserGroups(account.getName());
User user = new User(account2.getName(), "", "", "");
Throwable exception = assertThrows(UserNotFoundException.class, () -> groupService.deleteUser(account, user, groups.get(0)));
assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.service.ValidationService)\"", exception.getMessage());
assertEquals("404 NOT_FOUND \"Der User wurde nicht gefunden. (class mops.gruppen2.domain.service.ValidationService)\"", exception.getMessage());
}
void testTitleAndDescription(String title, String description) {

6
src/test/java/mops/gruppen2/service/EventStoreServiceTest.java → src/test/java/mops/gruppen2/domain/service/EventStoreServiceTest.java
View File

@ -1,10 +1,10 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import mops.gruppen2.Gruppen2Application;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository;
import mops.gruppen2.persistance.EventRepository;
import mops.gruppen2.persistance.dto.EventDTO;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

4
src/test/java/mops/gruppen2/service/GroupServiceTest.java → src/test/java/mops/gruppen2/domain/service/GroupServiceTest.java
View File

@ -1,4 +1,4 @@
package mops.gruppen2.service;
package mops.gruppen2.domain.service;
import mops.gruppen2.Gruppen2Application;
import mops.gruppen2.TestBuilder;
@ -6,7 +6,7 @@ import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.User;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.repository.EventRepository;
import mops.gruppen2.persistance.EventRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

6
src/test/java/mops/gruppen2/controller/APIControllerTest.java → src/test/java/mops/gruppen2/web/APIControllerTest.java
View File

@ -1,9 +1,9 @@
package mops.gruppen2.controller;
package mops.gruppen2.web;
import mops.gruppen2.Gruppen2Application;
import mops.gruppen2.domain.exception.GroupNotFoundException;
import mops.gruppen2.repository.EventRepository;
import mops.gruppen2.service.EventStoreService;
import mops.gruppen2.domain.service.EventStoreService;
import mops.gruppen2.persistance.EventRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;