From eeded221b472332a41e2e63245cbb3ce39d84553 Mon Sep 17 00:00:00 2001 From: kasch309 Date: Fri, 13 Mar 2020 14:28:16 +0100 Subject: [PATCH] Add method to find group by id Add method to connect details.html to the controller --- .../java/mops/gruppen2/controller/Gruppen2Controller.java | 7 +++++++ src/main/java/mops/gruppen2/service/UserService.java | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 96ec538..271f02c 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -83,4 +83,11 @@ public class Gruppen2Controller { return "redirect:/gruppen2/"; } + @GetMapping("/details") + public String showGroupDetails(KeycloakAuthenticationToken token, Model model, @RequestParam (value="group_id") Long group_id) throws EventException { + model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); + model.addAttribute("group", userService.getGroupById(group_id)); + return "details"; + } + } diff --git a/src/main/java/mops/gruppen2/service/UserService.java b/src/main/java/mops/gruppen2/service/UserService.java index bfe8b37..7fe6122 100644 --- a/src/main/java/mops/gruppen2/service/UserService.java +++ b/src/main/java/mops/gruppen2/service/UserService.java @@ -6,6 +6,7 @@ import mops.gruppen2.domain.event.Event; import mops.gruppen2.repository.EventRepository; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -26,4 +27,11 @@ public class UserService { List events = groupService.getGroupEvents(group_ids); return groupService.projectEventList(events); } + + public Group getGroupById(Long group_id) throws EventException { + List group_ids = new ArrayList<>(); + group_ids.add(group_id); + List events = groupService.getGroupEvents(group_ids); + return groupService.projectEventList(events).get(0); + } }