From 7e52935b777f9fec88ebb26bb555826d16b59318 Mon Sep 17 00:00:00 2001 From: XXNitram Date: Wed, 18 Mar 2020 15:05:09 +0100 Subject: [PATCH 1/7] Add check for empty csv file and set required parameter to false Co-Authored-By: Lukas Ettel --- .../java/mops/gruppen2/controller/Gruppen2Controller.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index a6bdcca..9ae3d51 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -79,10 +79,13 @@ 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", required = false) MultipartFile file) throws IOException { Account account = keyCloakService.createAccountFromPrincipal(token); - List userList = CsvService.read(file.getInputStream()); + List userList = new ArrayList<>(); + if(!file.isEmpty()) { + userList = CsvService.read(file.getInputStream()); + } visibility = visibility == null; controllerService.createLecture(account, title, beschreibung, visibility, userList); From 90124a7c15247444d0a7b73ff934d4f87e0ae8f3 Mon Sep 17 00:00:00 2001 From: XXNitram Date: Wed, 18 Mar 2020 16:40:40 +0100 Subject: [PATCH 2/7] Fix file input alignment --- src/main/resources/templates/createLecture.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/createLecture.html b/src/main/resources/templates/createLecture.html index e6fb1e5..73c3cc8 100644 --- a/src/main/resources/templates/createLecture.html +++ b/src/main/resources/templates/createLecture.html @@ -49,7 +49,7 @@
-
+
From 4450a091de049cc057cfe1f5eec47d09f11f9321 Mon Sep 17 00:00:00 2001 From: XXNitram Date: Wed, 18 Mar 2020 16:42:06 +0100 Subject: [PATCH 3/7] Add addUsersFromCsv in editMembers Overview Co-Authored-By: Lukas Ettel Co-Authored-By: tomvahl --- .../controller/Gruppen2Controller.java | 17 +++++++++++++++-- .../gruppen2/service/ControllerService.java | 8 +++++--- src/main/resources/templates/editMembers.html | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index d7ec39d..3623712 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -83,7 +83,7 @@ public class Gruppen2Controller { @RequestParam(value = "title") String title, @RequestParam(value = "beschreibung") String beschreibung, @RequestParam(value = "visibility", required = false) Boolean visibility, - @RequestParam(value = "file", required = false) MultipartFile file) throws IOException { + @RequestParam(value = "file", required = false) MultipartFile file) throws IOException, EventException { Account account = keyCloakService.createAccountFromPrincipal(token); List userList = new ArrayList<>(); @@ -96,6 +96,18 @@ public class Gruppen2Controller { return "redirect:/gruppen2/"; } + @RolesAllowed({"ROLE_orga", "ROLE_actuator)"}) + @PostMapping("/details/members/addUsersFromCsv") + public String addUsersFromCsv(@RequestParam (value = "group_id") Long id, + @RequestParam(value = "file", required = false) MultipartFile file) throws IOException { + List userList = new ArrayList<>(); + if(!file.isEmpty()) { + userList = CsvService.read(file.getInputStream()); + } + controllerService.addUserList(userList, id); + return "redirect:/gruppen2/"; + } + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) @GetMapping("/createGroup") public String createGroup(KeycloakAuthenticationToken token, Model model) { @@ -193,10 +205,11 @@ 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 { + public String editMembers(Model model, KeycloakAuthenticationToken token, @RequestParam (value = "group_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("account", account); model.addAttribute("members", group.getMembers()); model.addAttribute("group", group); return "editMembers"; diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index f1fe45a..1152832 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -1,6 +1,7 @@ package mops.gruppen2.service; import mops.gruppen2.domain.*; +import mops.gruppen2.domain.Exceptions.EventException; import mops.gruppen2.domain.event.*; import mops.gruppen2.security.Account; import org.springframework.stereotype.Service; @@ -13,7 +14,7 @@ public class ControllerService { private final UserService userService; private final InviteLinkRepositoryService inviteLinkRepositoryService; - public ControllerService(EventService eventService, UserService userService) { + public ControllerService(EventService eventService, UserService userService, InviteLinkRepositoryService inviteLinkRepositoryService) { this.eventService = eventService; this.userService = userService; this.inviteLinkRepositoryService = inviteLinkRepositoryService; @@ -92,7 +93,7 @@ public class ControllerService { eventService.saveEvent(deleteUserEvent); } - 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(); @@ -104,11 +105,12 @@ public class ControllerService { CreateGroupEvent createGroupEvent = new CreateGroupEvent(group_id, account.getName(), null, GroupType.LECTURE, visibility1); eventService.saveEvent(createGroupEvent); + User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); addUser(account, group_id); updateTitle(account, group_id, title); updateDescription(account, group_id, description); - updateRole(account, group_id); + updateRole(user, group_id); addUserList(users, group_id); } diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html index 9988370..f71895e 100644 --- a/src/main/resources/templates/editMembers.html +++ b/src/main/resources/templates/editMembers.html @@ -21,6 +21,9 @@
  • Suche
    • +
  • + Veranstaltung +
    • @@ -29,6 +32,22 @@
    + +
    +
    +
    +
    +
    + + +
    +
    +
    + +
    +
    +
    +
    From 1fbfd4978161a9d7bf9eed34f4e14c7aa6f9cb44 Mon Sep 17 00:00:00 2001 From: Lukas Ettel <34522828+LukasEttel@users.noreply.github.com> Date: Wed, 18 Mar 2020 16:55:07 +0100 Subject: [PATCH 4/7] show file thats choosen to load up Co-Authored-By: xxnitram Co-Authored-By: andibuls Co-Authored-By: tomvahl --- src/main/resources/templates/createLecture.html | 11 +++++++++++ src/main/resources/templates/editMembers.html | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/main/resources/templates/createLecture.html b/src/main/resources/templates/createLecture.html index 73c3cc8..4325d66 100644 --- a/src/main/resources/templates/createLecture.html +++ b/src/main/resources/templates/createLecture.html @@ -7,6 +7,10 @@ Gruppenerstellung + + + + @@ -65,6 +69,13 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html index f71895e..0b07f9e 100644 --- a/src/main/resources/templates/editMembers.html +++ b/src/main/resources/templates/editMembers.html @@ -6,6 +6,10 @@ Gruppendetails + + + + @@ -74,4 +78,11 @@ + From c631f243a1305d5dc4cbc0012f58d595f88bb73e Mon Sep 17 00:00:00 2001 From: XXNitram Date: Wed, 18 Mar 2020 18:00:47 +0100 Subject: [PATCH 5/7] Refactor indentation in html files --- .../resources/templates/detailsMember.html | 45 +++++++++---------- .../resources/templates/detailsNoMember.html | 24 +++++----- src/main/resources/templates/editMembers.html | 2 +- src/main/resources/templates/index.html | 1 - 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index a45d005..1298e46 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -30,36 +30,35 @@
    -
    -

    -

    - Private Gruppe - Öffentliche Gruppe - Veranstaltung -

    -
    -
    -

    -
    -
    - +

    +

    + Private Gruppe + Öffentliche Gruppe + Veranstaltung +

    +
    +
    +

    +
    +
    +

    Mitglieder

    - +

    diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html index afd346c..0b3a032 100644 --- a/src/main/resources/templates/detailsNoMember.html +++ b/src/main/resources/templates/detailsNoMember.html @@ -32,22 +32,22 @@
    -

    -

    - Private Gruppe - Öffentliche Gruppe - Veranstaltung -

    +

    +

    + Private Gruppe + Öffentliche Gruppe + Veranstaltung +

    -
    -
    -
    - - -
    +
    +
    +
    + +
    +
    diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html index 90511b3..5c67b93 100644 --- a/src/main/resources/templates/editMembers.html +++ b/src/main/resources/templates/editMembers.html @@ -35,7 +35,7 @@
    -
    +
    diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 5d51236..da57d1c 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -43,7 +43,6 @@
    -

    From 40d1c898e880f73baa0d87ecd9848ba2d0b7850a Mon Sep 17 00:00:00 2001 From: XXNitram Date: Wed, 18 Mar 2020 18:02:11 +0100 Subject: [PATCH 6/7] Refactor ControllerService --- .../mops/gruppen2/service/ControllerService.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index 67ec2d1..b7f03f2 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -23,20 +23,11 @@ public class ControllerService { this.inviteLinkRepositoryService = inviteLinkRepositoryService; } - /** - * Erzeugt eine neue Gruppe, fügt den User, der die Gruppe erstellt hat, hinzu und setzt seine Rolle als Admin fest. - * Zudem wird der Gruppentitel und die Gruppenbeschreibung erzeugt, welche vorher der Methode übergeben wurden. - * Aus diesen Event Objekten wird eine Liste erzeugt, welche daraufhin mithilfe des EventServices gesichert wird. - * - * @param account Keycloak-Account - * @param title Gruppentitel - * @param description Gruppenbeschreibung - */ public void createGroup(Account account, String title, String description, Boolean visibility) throws EventException { Visibility visibility1; Long group_id = eventService.checkGroup(); - if(visibility) { + if (visibility) { visibility1 = Visibility.PUBLIC; } else { visibility1 = Visibility.PRIVATE; @@ -88,7 +79,7 @@ public class ControllerService { if(member.getUser_id().equals(user_id)) user = member; } assert user != null; - if(group.getRoles().get(user.getUser_id()) == Role.ADMIN) { + if (group.getRoles().get(user.getUser_id()) == Role.ADMIN) { updateRoleEvent = new UpdateRoleEvent(group_id, user.getUser_id(), Role.MEMBER); } else { updateRoleEvent = new UpdateRoleEvent(group_id, user.getUser_id(), Role.ADMIN); @@ -130,6 +121,5 @@ public class ControllerService { updateDescription(account, group_id, description); updateRole(account.getName(), group_id); addUserList(users, group_id); - } } From a1ee6a18cd6aa52f204e231dca321f19ec5fe2a1 Mon Sep 17 00:00:00 2001 From: XXNitram Date: Wed, 18 Mar 2020 18:03:02 +0100 Subject: [PATCH 7/7] Refactor Gruppen2Controller and change redirect in addUsersFromCsv method --- .../controller/Gruppen2Controller.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 5a56218..0b200d6 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -5,36 +5,27 @@ import mops.gruppen2.domain.Exceptions.EventException; import mops.gruppen2.domain.Group; import mops.gruppen2.domain.Role; import mops.gruppen2.domain.User; -import mops.gruppen2.domain.Visibility; -import mops.gruppen2.domain.event.CreateGroupEvent; -import mops.gruppen2.domain.event.UpdateRoleEvent; import mops.gruppen2.security.Account; import mops.gruppen2.service.*; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import org.springframework.web.client.RestTemplate; import org.springframework.web.context.annotation.SessionScope; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; - import javax.annotation.security.RolesAllowed; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Map; @Controller @SessionScope @RequestMapping("/gruppen2") public class Gruppen2Controller { - @Autowired Gruppen2Config gruppen2Config; - private final KeyCloakService keyCloakService; private final EventService eventService; private final GroupService groupService; @@ -86,7 +77,7 @@ public class Gruppen2Controller { Account account = keyCloakService.createAccountFromPrincipal(token); List userList = new ArrayList<>(); - if(!file.isEmpty()) { + if (!file.isEmpty()) { userList = CsvService.read(file.getInputStream()); } visibility = visibility == null; @@ -97,14 +88,14 @@ public class Gruppen2Controller { @RolesAllowed({"ROLE_orga", "ROLE_actuator)"}) @PostMapping("/details/members/addUsersFromCsv") - public String addUsersFromCsv(@RequestParam (value = "group_id") Long id, + public String addUsersFromCsv(@RequestParam (value = "group_id") Long group_id, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException { List userList = new ArrayList<>(); - if(!file.isEmpty()) { + if (!file.isEmpty()) { userList = CsvService.read(file.getInputStream()); } - controllerService.addUserList(userList, id); - return "redirect:/gruppen2/"; + controllerService.addUserList(userList, group_id); + return "redirect:/gruppen2/details/members/" + group_id; } @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})