From 522d1369ec8085c3816736490ca3d74218bb41be Mon Sep 17 00:00:00 2001 From: tomvahl Date: Wed, 18 Mar 2020 15:09:14 +0100 Subject: [PATCH 01/10] fix search remove your Group from search Co-Authored-By: andibuls --- .../gruppen2/controller/Gruppen2Controller.java | 3 ++- .../java/mops/gruppen2/service/GroupService.java | 15 +++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index a6bdcca..842870d 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -99,9 +99,10 @@ public class Gruppen2Controller { @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"}) @GetMapping("/findGroup") public String findGroup(KeycloakAuthenticationToken token, Model model, @RequestParam(value = "suchbegriff", required = false) String suchbegriff) throws EventException { + Account account = keyCloakService.createAccountFromPrincipal(token); List groupse = new ArrayList<>(); if (suchbegriff != null) { - groupse = groupService.findGroupWith(suchbegriff); + groupse = groupService.findGroupWith(suchbegriff,account); } model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); model.addAttribute("gruppen", groupse); diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index e6adcb3..48bbaab 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -6,6 +6,7 @@ import mops.gruppen2.domain.Group; import mops.gruppen2.domain.Visibility; import mops.gruppen2.domain.event.Event; import mops.gruppen2.repository.EventRepository; +import mops.gruppen2.security.Account; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -77,9 +78,15 @@ public class GroupService { * @return * @throws EventException */ - - public List getAllGroupWithVisibilityPublic() throws EventException { + // Namensänderung fixen und die Forschleife auslagern + public List getAllGroupWithVisibilityPublic(String user_id) throws EventException { List group_ids = eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE); + List group_ids_user = eventRepository.findGroup_idsWhereUser_id(user_id); + for (Long group_id: group_ids_user) { + if(group_ids.contains(group_id)){ + group_ids.remove(group_id); + } + } List eventDTOS = eventRepository.findAllEventsOfGroups(group_ids); List events = eventService.translateEventDTOs(eventDTOS); List groups = projectEventList(events); @@ -94,9 +101,9 @@ public class GroupService { * @return * @throws EventException */ - public List findGroupWith(String search) throws EventException { + public List findGroupWith(String search, Account account) throws EventException { List groups = new ArrayList<>(); - for (Group group: getAllGroupWithVisibilityPublic()) { + for (Group group: getAllGroupWithVisibilityPublic(account.getName())) { if (group.getTitle().contains(search)|| group.getDescription().contains(search)){ groups.add(group); } From 2b1d6507e6de5fa6f2c7257c0d1da1c58c0e39f7 Mon Sep 17 00:00:00 2001 From: tomvahl Date: Wed, 18 Mar 2020 15:17:48 +0100 Subject: [PATCH 02/10] fix-search Co-Authored-By: andibuls --- .../mops/gruppen2/service/GroupService.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index 48bbaab..ede0171 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -72,22 +72,23 @@ public class GroupService { return groups.get(group_id); } - /** - * sucht alle Zeilen in der DB wo die Visibility gleich true ist und wandelt diese in - * eine Liste von Gruppen - * @return - * @throws EventException - */ - // Namensänderung fixen und die Forschleife auslagern - public List getAllGroupWithVisibilityPublic(String user_id) throws EventException { - List group_ids = eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE); - List group_ids_user = eventRepository.findGroup_idsWhereUser_id(user_id); - for (Long group_id: group_ids_user) { + private List removeUserGroups(List group_ids, List user_groups){ + for (Long group_id: user_groups) { if(group_ids.contains(group_id)){ group_ids.remove(group_id); } } - List eventDTOS = eventRepository.findAllEventsOfGroups(group_ids); + return group_ids; + } + + /** + * sucht alle Zeilen in der DB wo die Visibility true ist und entfernt alle Gruppen des Users. + * Erstellt eine Liste aus Gruppen. + * @return + * @throws EventException + */ + public List getAllGroupWithVisibilityPublic(String user_id) throws EventException { + List eventDTOS = eventRepository.findAllEventsOfGroups(removeUserGroups(eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE), eventRepository.findGroup_idsWhereUser_id(user_id))); List events = eventService.translateEventDTOs(eventDTOS); List groups = projectEventList(events); return groups; From 9aa7122779a4cdb42a07dcdde80985d2d48568a7 Mon Sep 17 00:00:00 2001 From: kasch309 Date: Wed, 18 Mar 2020 15:23:26 +0100 Subject: [PATCH 03/10] Improve styling on several templates --- .../resources/templates/detailsMember.html | 30 +++++++++++-------- src/main/resources/templates/editMembers.html | 13 ++++---- src/main/resources/templates/index.html | 24 +++++---------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 6753811..63ae972 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -30,31 +30,35 @@
-

+

+

Private Gruppe Öffentliche Gruppe Veranstaltung -

-

-
-
-
- -
-
+

+
+
+

+
+
+
+
+ +
-
-

Mitglieder

+
+

Mitglieder

- +
-

+
+
    diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html index 9988370..c6ee888 100644 --- a/src/main/resources/templates/editMembers.html +++ b/src/main/resources/templates/editMembers.html @@ -28,13 +28,13 @@
    -
    +
    - - + + @@ -45,12 +45,15 @@ Admin
    MitgliedRolleOptionenRolleOptionen
    - - + +
    +
    diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index d9ba848..e7ba682 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -30,8 +30,16 @@

    Meine Gruppen

    +

    + Mitglied in + + Gruppe. + Gruppen. +

    +
    +

    @@ -41,22 +49,6 @@
    -
    -
    -
    -

    user_id

    -

    - username - usersurname -

    -

    usermail

    -

    - In Gruppen: - -

    -
    -
    -
    From 22172b54064ca319cc47b3f7e1ac90cd9ae400ef Mon Sep 17 00:00:00 2001 From: AndiBuls Date: Wed, 18 Mar 2020 15:25:37 +0100 Subject: [PATCH 04/10] cleanup of the search function --- src/main/java/mops/gruppen2/service/GroupService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index ede0171..acba484 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -72,11 +72,9 @@ public class GroupService { return groups.get(group_id); } - private List removeUserGroups(List group_ids, List user_groups){ + private List removeUserGroups(List group_ids, List user_groups) { for (Long group_id: user_groups) { - if(group_ids.contains(group_id)){ - group_ids.remove(group_id); - } + group_ids.remove(group_id); } return group_ids; } @@ -88,7 +86,8 @@ public class GroupService { * @throws EventException */ public List getAllGroupWithVisibilityPublic(String user_id) throws EventException { - List eventDTOS = eventRepository.findAllEventsOfGroups(removeUserGroups(eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE), eventRepository.findGroup_idsWhereUser_id(user_id))); + List group_ids = removeUserGroups(eventRepository.findGroup_idsWhereVisibility(Boolean.TRUE), eventRepository.findGroup_idsWhereUser_id(user_id)); + List eventDTOS = eventRepository.findAllEventsOfGroups(group_ids); List events = eventService.translateEventDTOs(eventDTOS); List groups = projectEventList(events); return groups; From e0db7584ac0bc84ae99c1e670575028e9c13bf67 Mon Sep 17 00:00:00 2001 From: kasch309 Date: Wed, 18 Mar 2020 16:00:11 +0100 Subject: [PATCH 05/10] Improve styling on several templates --- src/main/resources/templates/detailsMember.html | 11 ++++++++--- src/main/resources/templates/detailsNoMember.html | 14 ++++++++------ src/main/resources/templates/index.html | 6 ++++-- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 63ae972..16badfa 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -31,7 +31,6 @@

    -

    Private Gruppe Öffentliche Gruppe @@ -43,9 +42,15 @@


    -
    - + + + + +
    +
    diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html index 44f1dfd..740f1bf 100644 --- a/src/main/resources/templates/detailsNoMember.html +++ b/src/main/resources/templates/detailsNoMember.html @@ -29,13 +29,15 @@
    -

    -

    - Private Gruppe +

    +

    + Private Gruppe Öffentliche Gruppe - Veranstaltung -

    -

    + Veranstaltung +

    +
    +

    +
    diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index e7ba682..f9fab43 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -40,10 +40,12 @@
    -

    +

    -

    +
    +

    +

    From 62397a24ef17062da7f39e320c9ef92dab8c9b15 Mon Sep 17 00:00:00 2001 From: tomvahl Date: Wed, 18 Mar 2020 16:03:34 +0100 Subject: [PATCH 06/10] update search Co-Authored-By: andibuls --- src/main/java/mops/gruppen2/service/GroupService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index acba484..ec3c4e6 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -104,7 +104,7 @@ public class GroupService { public List findGroupWith(String search, Account account) throws EventException { List groups = new ArrayList<>(); for (Group group: getAllGroupWithVisibilityPublic(account.getName())) { - if (group.getTitle().contains(search)|| group.getDescription().contains(search)){ + if (group.getTitle().toLowerCase().contains(search.toLowerCase()) || group.getDescription().toLowerCase().contains(search.toLowerCase())){ groups.add(group); } } From dac0b28efb530ec4f5604870d01f74db3aa5de88 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Wed, 18 Mar 2020 16:16:27 +0100 Subject: [PATCH 07/10] fix path redirecting --- .../controller/Gruppen2Controller.java | 25 ++++++++++++------- .../gruppen2/service/ControllerService.java | 9 +++++-- .../resources/templates/detailsMember.html | 6 +++-- src/main/resources/templates/editMembers.html | 19 ++++++++++---- src/main/resources/templates/index.html | 2 +- 5 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index f214d1c..c952a02 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -104,8 +104,8 @@ public class Gruppen2Controller { } @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) - @GetMapping("/details") - public String showGroupDetails(KeycloakAuthenticationToken token, Model model, @RequestParam (value="id") Long id) throws EventException, ResponseStatusException { + @GetMapping("/details/{id}") + public String showGroupDetails(KeycloakAuthenticationToken token, Model model, @PathVariable (value="id") Long id) throws EventException, ResponseStatusException { model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); Group group = userService.getGroupById(id); Account account = keyCloakService.createAccountFromPrincipal (token); @@ -154,13 +154,14 @@ public class Gruppen2Controller { } @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) - @GetMapping("/details/members") - public String editMembers(Model model, KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) throws EventException { + @GetMapping("/details/members/{id}") + public String editMembers(Model model, KeycloakAuthenticationToken token, @PathVariable (value="id") Long id) throws EventException { Account account = keyCloakService.createAccountFromPrincipal(token); Group group = userService.getGroupById(id); if(group.getRoles().get(account.getName()) == Role.ADMIN) { model.addAttribute("members", group.getMembers()); model.addAttribute("group", group); + model.addAttribute("admin", Role.ADMIN); return "editMembers"; } else { return "redirect:/details/"; @@ -168,11 +169,17 @@ public class Gruppen2Controller { } @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) - @PostMapping("/changeRole") - public String changeRole(KeycloakAuthenticationToken token, @RequestParam (value = "group_id") Long id, - @RequestParam (value = "user") User user) throws EventException { - controllerService.updateRole(user, id); - return "redirect:/details/members/"; + @PostMapping("/details/members/changeRole") + public String changeRole(KeycloakAuthenticationToken token, @RequestParam (value = "group_id") Long group_id, + @RequestParam (value = "user_id") String user_id) throws EventException { + controllerService.updateRole(user_id, group_id); + return "redirect:/gruppen2/details/members/" + group_id; } + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) + @PostMapping("/details/members/deleteUser") + public String deleteUser(KeycloakAuthenticationToken token,@RequestParam (value = "group_id") Long group_id, + @RequestParam (value = "user_id") String user_id) { + return null; + } } diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index ff42a16..b6880e3 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -43,7 +43,7 @@ public class ControllerService { addUser(account, group_id); updateTitle(account, group_id, title); updateDescription(account, group_id, description); - updateRole(user, group_id); + updateRole(user.getUser_id(), group_id); } public void addUser(Account account, Long group_id){ @@ -61,9 +61,14 @@ public class ControllerService { eventService.saveEvent(updateGroupDescriptionEvent); } - public void updateRole(User user, Long group_id) throws EventException { + public void updateRole(String user_id, Long group_id) throws EventException { UpdateRoleEvent updateRoleEvent; Group group = userService.getGroupById(group_id); + User user = null; + for (User member : group.getMembers()) { + if(member.getUser_id().equals(user_id)) user = member; + } + assert user != null; if(group.getRoles().get(user.getUser_id()) == Role.ADMIN) { updateRoleEvent = new UpdateRoleEvent(group_id, user.getUser_id(), Role.MEMBER); } else { diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 63ae972..00449f6 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -53,8 +53,10 @@

    Mitglieder

    - - + +

    diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html index c6ee888..c97dd0e 100644 --- a/src/main/resources/templates/editMembers.html +++ b/src/main/resources/templates/editMembers.html @@ -38,15 +38,24 @@ - + + - Mitglied - Admin + Mitglied + Admin - - +
    + + + +
    +
    + + + +
    diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index e7ba682..5bee698 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -41,7 +41,7 @@

    - +

    From 42721e06fc23264e371f45ef02e8eff352670335 Mon Sep 17 00:00:00 2001 From: kasch309 Date: Wed, 18 Mar 2020 16:32:27 +0100 Subject: [PATCH 08/10] Improve styling on several templates --- src/main/resources/templates/detailsMember.html | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index dd9b206..dbb5aaa 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -28,8 +28,7 @@
    -
    -
    +

    Private Gruppe @@ -41,18 +40,14 @@


    -
    -
    - - +
    - -
    -
    From 4b88742776adefb93a595fac567bb753c3ed98b4 Mon Sep 17 00:00:00 2001 From: killerber4t Date: Wed, 18 Mar 2020 16:36:54 +0100 Subject: [PATCH 09/10] add deleteUser button and reconfigure the according method --- .../mops/gruppen2/controller/Gruppen2Controller.java | 9 +++++---- .../java/mops/gruppen2/service/ControllerService.java | 8 +++++++- src/main/resources/templates/editMembers.html | 6 +++--- src/main/resources/templates/index.html | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index c952a02..63addb4 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -146,10 +146,10 @@ public class Gruppen2Controller { @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) @PostMapping("/leaveGroup") - public String pLeaveGroup(KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) { + public String pLeaveGroup(KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) throws EventException { Account account = keyCloakService.createAccountFromPrincipal(token); User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); - controllerService.deleteUser(user, id); + controllerService.deleteUser(user.getUser_id(), id); return "redirect:/gruppen2/"; } @@ -179,7 +179,8 @@ public class Gruppen2Controller { @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) @PostMapping("/details/members/deleteUser") public String deleteUser(KeycloakAuthenticationToken token,@RequestParam (value = "group_id") Long group_id, - @RequestParam (value = "user_id") String user_id) { - return null; + @RequestParam (value = "user_id") String user_id) throws EventException { + controllerService.deleteUser(user_id, group_id); + return "redirect:/gruppen2/details/members/" + group_id; } } diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index b6880e3..f64e048 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -77,7 +77,13 @@ public class ControllerService { eventService.saveEvent(updateRoleEvent); } - public void deleteUser(User user, Long group_id){ + public void deleteUser(String user_id, Long group_id) throws EventException { + Group group = userService.getGroupById(group_id); + User user = null; + for (User member : group.getMembers()) { + if(member.getUser_id().equals(user_id)) user = member; + } + assert user != null; DeleteUserEvent deleteUserEvent = new DeleteUserEvent(group_id, user.getUser_id()); eventService.saveEvent(deleteUserEvent); } diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html index c97dd0e..1fbed6c 100644 --- a/src/main/resources/templates/editMembers.html +++ b/src/main/resources/templates/editMembers.html @@ -51,9 +51,9 @@ -
    - - + + +
    diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index c083426..a9404b0 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -21,7 +21,7 @@
  • Suche
    • -
+ --
From d2c1de7c9f0f6ea2a6f890fe34b65b4eb025595a Mon Sep 17 00:00:00 2001 From: killerber4t Date: Wed, 18 Mar 2020 17:01:33 +0100 Subject: [PATCH 10/10] fix for merge --- .../gruppen2/controller/Gruppen2Controller.java | 4 ++-- .../mops/gruppen2/service/ControllerService.java | 15 +++++---------- src/main/resources/templates/index.html | 2 -- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 1dab295..25faa42 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -82,7 +82,7 @@ public class Gruppen2Controller { @RequestParam(value = "title") String title, @RequestParam(value = "beschreibung") String beschreibung, @RequestParam(value = "visibility", required = false) Boolean visibility, - @RequestParam("file") MultipartFile file) throws IOException { + @RequestParam(value = "file") MultipartFile file) throws IOException, EventException { Account account = keyCloakService.createAccountFromPrincipal(token); List userList = CsvService.read(file.getInputStream()); @@ -219,10 +219,10 @@ public class Gruppen2Controller { @RequestParam (value = "user_id") String user_id) throws EventException { controllerService.deleteUser(user_id, group_id); return "redirect:/gruppen2/details/members/" + group_id; + } @GetMapping("*") public String defaultLink() { return "errorRenameLater"; - } } diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index 6cb5e2c..7f84660 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -7,12 +7,6 @@ import mops.gruppen2.domain.event.*; import mops.gruppen2.security.Account; import org.springframework.stereotype.Service; -import mops.gruppen2.domain.event.*; -import mops.gruppen2.security.Account; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.UUID; @@ -25,8 +19,9 @@ public class ControllerService { private final UserService userService; private final InviteLinkRepositoryService inviteLinkRepositoryService; - public ControllerService(EventService eventService, InviteLinkRepositoryService inviteLinkRepositoryService) { + public ControllerService(EventService eventService, UserService userService, InviteLinkRepositoryService inviteLinkRepositoryService) { this.eventService = eventService; + this.userService = userService; this.inviteLinkRepositoryService = inviteLinkRepositoryService; } @@ -117,9 +112,9 @@ public class ControllerService { public void deleteGroupEvent(User user, Long group_id) { DeleteGroupEvent deleteGroupEvent = new DeleteGroupEvent(group_id, user.getUser_id()); eventService.saveEvent(deleteGroupEvent); + } - - public void createLecture(Account account, String title, String description, Boolean visibility, List users) { + public void createLecture(Account account, String title, String description, Boolean visibility, List users) throws EventException { Visibility visibility1; Long group_id = eventService.checkGroup(); @@ -135,7 +130,7 @@ public class ControllerService { addUser(account, group_id); updateTitle(account, group_id, title); updateDescription(account, group_id, description); - updateRole(account, group_id); + updateRole(account.getName(), group_id); addUserList(users, group_id); } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index c55c763..5d51236 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -21,13 +21,11 @@
  • Suche
    • -
  • Veranstaltung
    • -