From 6c4a5988168404cde5b9534d83b50d76abb44411 Mon Sep 17 00:00:00 2001 From: "[Mahgs]" Date: Fri, 20 Mar 2020 16:47:17 +0100 Subject: [PATCH] link supplied to getMapping in details.html --- .../java/mops/gruppen2/controller/Gruppen2Controller.java | 7 +++++++ .../mops/gruppen2/repository/InviteLinkRepository.java | 4 ++-- .../mops/gruppen2/service/InviteLinkRepositoryService.java | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index bc8ef88..3265bad 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -5,6 +5,7 @@ import mops.gruppen2.config.Gruppen2Config; import mops.gruppen2.domain.Group; import mops.gruppen2.domain.Role; import mops.gruppen2.domain.User; +import mops.gruppen2.domain.Visibility; import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.exception.GroupNotFoundException; import mops.gruppen2.domain.exception.WrongFileException; @@ -187,6 +188,12 @@ public class Gruppen2Controller { model.addAttribute("roles", group.getRoles()); model.addAttribute("user", user); model.addAttribute("admin", Role.ADMIN); + + String link = inviteLinkRepositoryService.findlinkByGroupId(group.getId()); + if (group.getVisibility() == Visibility.PRIVATE) { + model.addAttribute("Link", link); + } + return "detailsMember"; } diff --git a/src/main/java/mops/gruppen2/repository/InviteLinkRepository.java b/src/main/java/mops/gruppen2/repository/InviteLinkRepository.java index 4cd5932..8f4f1bb 100644 --- a/src/main/java/mops/gruppen2/repository/InviteLinkRepository.java +++ b/src/main/java/mops/gruppen2/repository/InviteLinkRepository.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository; @Repository public interface InviteLinkRepository extends CrudRepository { - //@Query("SELECT invite_link FROM invite WHERE group_id = :id") - //String findLinkByGroupID(@Param("id") Long GroupID); + @Query("SELECT invite_link FROM invite WHERE group_id = :id") + String findLinkByGroupID(@Param("id") Long GroupID); @Query("SELECT group_id FROM invite WHERE invite_link = :link") Long findGroupIdByLink(@Param("link") String link); diff --git a/src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java b/src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java index e46e521..0cd443e 100644 --- a/src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java +++ b/src/main/java/mops/gruppen2/service/InviteLinkRepositoryService.java @@ -19,8 +19,11 @@ public class InviteLinkRepositoryService { return inviteLinkRepository.findGroupIdByLink(link); } + public String findlinkByGroupId(Long grouId) { + return inviteLinkRepository.findLinkByGroupID(grouId); + } + public void saveInvite(Long groupId, UUID link) { inviteLinkRepository.save(new InviteLinkDTO(null, groupId, link.toString())); } - }