christoph/lecture-professional-software-development
1
Fork 0
Code Activity

add userMaximum

Browse Source 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
This commit is contained in:
killerber4t
2020-03-19 15:25:05 +01:00
parent abae802e0c
commit 1a5dc2571a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -170,6 +170,7 @@ public class Gruppen2Controller {
if (group.getMembers().contains(user)) { if (group.getMembers().contains(user)) {
return "error"; //hier soll eigentlich auf die bereits beigetretene Gruppe weitergeleitet werden return "error"; //hier soll eigentlich auf die bereits beigetretene Gruppe weitergeleitet werden
} }
if (group.getUserMaximum() < group.getMembers().size()) return "error";
controllerService.addUser(account, groupId); controllerService.addUser(account, groupId);
return "redirect:/gruppen2/"; return "redirect:/gruppen2/";
} }
@ -179,7 +180,7 @@ public class Gruppen2Controller {
public String showGroupDetailsNoMember(KeycloakAuthenticationToken token, Model model, @RequestParam("id") Long groupId) throws EventException { public String showGroupDetailsNoMember(KeycloakAuthenticationToken token, Model model, @RequestParam("id") Long groupId) throws EventException {
model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
Group group = userService.getGroupById(groupId); Group group = userService.getGroupById(groupId);
if (group != null) { if (group != null && group.getUserMaximum() > group.getMembers().size()) {
model.addAttribute("group", group); model.addAttribute("group", group);
return "detailsNoMember"; return "detailsNoMember";
} }

1
src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
View File

@ -31,5 +31,6 @@ public class CreateGroupEvent extends Event {
group.setParent(this.groupParent); group.setParent(this.groupParent);
group.setType(this.groupType); group.setType(this.groupType);
group.setVisibility(this.groupVisibility); group.setVisibility(this.groupVisibility);
group.setUserMaximum(this.groupUserMaximum);
} }
} }