From 430b52b417ac193f0fd72f6fa811873d00d7fcd1 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Thu, 12 Mar 2020 16:48:08 +0100 Subject: [PATCH 1/2] add new Controller to redirect --- .../gruppen2/controller/Gruppen2Controller.java | 2 +- .../mops/gruppen2/controller/MopsController.java | 13 +++++++++++++ .../java/mops/gruppen2/service/UserService.java | 2 ++ src/main/resources/templates/create.html | 1 - 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/main/java/mops/gruppen2/controller/MopsController.java diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index e7b5bf1..96ec538 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -80,7 +80,7 @@ public class Gruppen2Controller { Account account = keyCloakService.createAccountFromPrincipal(token); controllerService.createGroup(account, title, beschreibung); - return "redirect:/gruppen2"; + return "redirect:/gruppen2/"; } } diff --git a/src/main/java/mops/gruppen2/controller/MopsController.java b/src/main/java/mops/gruppen2/controller/MopsController.java new file mode 100644 index 0000000..4989fab --- /dev/null +++ b/src/main/java/mops/gruppen2/controller/MopsController.java @@ -0,0 +1,13 @@ +package mops.gruppen2.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class MopsController { + + @GetMapping("") + public String redirect(){ + return "redirect:/gruppen2/"; + } +} diff --git a/src/main/java/mops/gruppen2/service/UserService.java b/src/main/java/mops/gruppen2/service/UserService.java index afa2c95..bfe8b37 100644 --- a/src/main/java/mops/gruppen2/service/UserService.java +++ b/src/main/java/mops/gruppen2/service/UserService.java @@ -19,6 +19,8 @@ public class UserService { this.groupService = groupService; } + //Test nötig?? + public List getUserGroups(String user_id) throws EventException { List group_ids = eventRepository.findGroup_idsWhereUser_id(user_id); List events = groupService.getGroupEvents(group_ids); diff --git a/src/main/resources/templates/create.html b/src/main/resources/templates/create.html index 5f28fb5..63668bc 100644 --- a/src/main/resources/templates/create.html +++ b/src/main/resources/templates/create.html @@ -36,7 +36,6 @@
From d3ba609e6ae5560064503b901a6332033cc803b5 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Thu, 12 Mar 2020 16:54:42 +0100 Subject: [PATCH 2/2] fix ControllerTest --- .../java/mops/gruppen2/architecture/ControllerTest.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/test/java/mops/gruppen2/architecture/ControllerTest.java b/src/test/java/mops/gruppen2/architecture/ControllerTest.java index 8079fa8..238fa7a 100644 --- a/src/test/java/mops/gruppen2/architecture/ControllerTest.java +++ b/src/test/java/mops/gruppen2/architecture/ControllerTest.java @@ -37,14 +37,6 @@ public class ControllerTest { .that().resideInAPackage("..controller..") .should().haveSimpleNameEndingWith("Controller"); - @ArchTest - public static final ArchRule controllerClassesShouldHaveRequestMappingAnnotation = classes() - .that().resideInAPackage("..controller..") - .and().haveSimpleNameEndingWith("Controller") - .and().areAnnotatedWith(Controller.class) - .or().areAnnotatedWith(RestController.class) - .should().beAnnotatedWith(RequestMapping.class); - @ArchTest public static final ArchRule controllerClassesShouldNotDependOnEachOther = noClasses() .that().haveSimpleNameEndingWith("Controller")