From b24f6d273f5c43daa8d88b2eadeeba0cda0cbfc8 Mon Sep 17 00:00:00 2001 From: XXNitram Date: Thu, 19 Mar 2020 17:24:10 +0100 Subject: [PATCH] Fix merge with master --- .../controller/Gruppen2Controller.java | 41 ++++++------------- .../gruppen2/service/ControllerService.java | 25 ++--------- src/main/resources/templates/createOrga.html | 11 +++-- .../resources/templates/createStudent.html | 2 +- 4 files changed, 24 insertions(+), 55 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 9416047..6946481 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -16,7 +16,6 @@ import mops.gruppen2.service.GroupService; import mops.gruppen2.service.InviteLinkRepositoryService; import mops.gruppen2.service.KeyCloakService; import mops.gruppen2.service.UserService; -import org.apache.tomcat.util.http.fileupload.impl.SizeLimitExceededException; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -28,7 +27,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.context.annotation.SessionScope; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.security.RolesAllowed; import java.io.CharConversionException; import java.io.IOException; @@ -84,11 +82,12 @@ public class Gruppen2Controller { @RolesAllowed({"ROLE_orga", "ROLE_actuator)"}) @PostMapping("/createOrga") public String pCreateOrga(KeycloakAuthenticationToken token, - @RequestParam("title") String title, - @RequestParam("beschreibung") String beschreibung, - @RequestParam(value = "visibility", required = false) Boolean visibility, - @RequestParam(value = "lecture", required = false) Boolean lecture, - @RequestParam(value = "file", required = false) MultipartFile file) throws IOException, EventException { + @RequestParam("title") String title, + @RequestParam("description") String description, + @RequestParam(value = "visibility", required = false) Boolean visibility, + @RequestParam(value = "lecture", required = false) Boolean lecture, + @RequestParam("userMaximum") Long userMaximum, + @RequestParam(value = "file", required = false) MultipartFile file) throws IOException, EventException { Account account = keyCloakService.createAccountFromPrincipal(token); List userList = new ArrayList<>(); @@ -102,7 +101,7 @@ public class Gruppen2Controller { visibility = visibility == null; lecture = lecture == null; - controllerService.createOrga(account, title, beschreibung, visibility, lecture, userList); + controllerService.createOrga(account, title, description, visibility, lecture, userMaximum, userList); return "redirect:/gruppen2/"; } @@ -117,13 +116,14 @@ public class Gruppen2Controller { @RolesAllowed({"ROLE_studentin"}) @PostMapping("/createStudent") public String pCreateStudent(KeycloakAuthenticationToken token, - @RequestParam("title") String title, - @RequestParam("beschreibung") String beschreibung, - @RequestParam(value = "visibility", required = false) Boolean visibility) throws EventException { + @RequestParam("title") String title, + @RequestParam("description") String description, + @RequestParam(value = "visibility", required = false) Boolean visibility, + @RequestParam("userMaximum") Long userMaximum) throws EventException { Account account = keyCloakService.createAccountFromPrincipal(token); visibility = visibility == null; - controllerService.createGroup(account, title, beschreibung, visibility); + controllerService.createGroup(account, title, description, visibility, userMaximum); return "redirect:/gruppen2/"; } @@ -138,8 +138,6 @@ public class Gruppen2Controller { userList = CsvService.read(file.getInputStream()); } catch (UnrecognizedPropertyException | CharConversionException ex) { throw new WrongFileException(file.getOriginalFilename()); - } catch (IllegalStateException ex) { - throw new WrongFileException(file.getOriginalFilename()); } } controllerService.addUserList(userList, groupId); @@ -159,21 +157,6 @@ public class Gruppen2Controller { return "search"; } - @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"}) - @PostMapping("/createGroup") - public String pCreateGroup(KeycloakAuthenticationToken token, - @RequestParam("title") String title, - @RequestParam("description") String description, - @RequestParam(value = "visibility", required = false) Boolean visibility, - @RequestParam("userMaximum") Long userMaximum) throws EventException { - - Account account = keyCloakService.createAccountFromPrincipal(token); - visibility = visibility == null; - controllerService.createGroup(account, title, description, visibility, userMaximum); - - return "redirect:/gruppen2/"; - } - @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) @GetMapping("/details/{id}") public String showGroupDetails(KeycloakAuthenticationToken token, Model model, @PathVariable("id") Long groupId) throws EventException { diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index b069319..d46e708 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -66,7 +66,7 @@ public class ControllerService { updateRole(account.getName(), groupId); } - public void createOrga(Account account, String title, String description, Boolean visibility, Boolean lecture, List users) throws EventException { + public void createOrga(Account account, String title, String description, Boolean visibility, Boolean lecture, Long maximmum, List users) throws EventException { Visibility visibility1; Long groupId = eventService.checkGroup(); @@ -82,7 +82,8 @@ public class ControllerService { } else { groupType = GroupType.LECTURE; } - CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), null, groupType, visibility1); + + CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), null, groupType, visibility1, maximmum); eventService.saveEvent(createGroupEvent); addUser(account, groupId); @@ -163,26 +164,6 @@ public class ControllerService { eventService.saveEvent(deleteGroupEvent); } - public void createLecture(Account account, String title, String description, Boolean visibility, List users) throws EventException { - Visibility visibility1; - Long groupId = eventService.checkGroup(); - - if (visibility) { - visibility1 = Visibility.PUBLIC; - } else { - visibility1 = Visibility.PRIVATE; - } - - CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), null, GroupType.LECTURE, visibility1, 1000L); //this has to be changed also Usermaximum - eventService.saveEvent(createGroupEvent); - - addUser(account, groupId); - updateTitle(account, groupId, title); - updateDescription(account, groupId, description); - updateRole(account.getName(), groupId); - addUserList(users, groupId); - } - public boolean passIfLastAdmin(Account account, Long groupId){ Group group = userService.getGroupById(groupId); if (group.getMembers().size() <= 1){ diff --git a/src/main/resources/templates/createOrga.html b/src/main/resources/templates/createOrga.html index a65a224..35b06a9 100644 --- a/src/main/resources/templates/createOrga.html +++ b/src/main/resources/templates/createOrga.html @@ -47,9 +47,14 @@ type="text">
- - + + +
+
+ +

Gruppenerstellung

-
+