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

add UserMaximum function

Browse Source
This commit is contained in:
tomvahl
2020-03-19 14:28:15 +01:00
parent 8291b5c41e
commit a2ae464bf0
8 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,12 +131,13 @@ public class Gruppen2Controller {
@PostMapping("/createGroup")
public String pCreateGroup(KeycloakAuthenticationToken token,
@RequestParam("title") String title,
@RequestParam("beschreibung") String beschreibung,
@RequestParam(value = "visibility", required = false) Boolean visibility) throws EventException {
@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/";
}

1
src/main/java/mops/gruppen2/domain/Group.java
View File

@ -20,6 +20,7 @@ public class Group {
private Long id;
private String title;
private String description;
private Long userMaximum;
private GroupType type;
private Visibility visibility;
private Long parent;

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

@ -15,12 +15,14 @@ public class CreateGroupEvent extends Event {
private Visibility groupVisibility;
private Long groupParent;
private GroupType groupType;
private Long groupUserMaximum;
public CreateGroupEvent(Long groupId, String userId, Long parent, GroupType type, Visibility visibility) {
public CreateGroupEvent(Long groupId, String userId, Long parent, GroupType type, Visibility visibility, Long userMaximum) {
super(groupId, userId);
this.groupParent = parent;
this.groupType = type;
this.groupVisibility = visibility;
this.groupUserMaximum = userMaximum;
}
@Override

6
src/main/java/mops/gruppen2/service/ControllerService.java
View File

@ -43,7 +43,7 @@ public class ControllerService {
* @param title Gruppentitel
* @param description Gruppenbeschreibung
*/
public void createGroup(Account account, String title, String description, Boolean visibility) throws EventException {
public void createGroup(Account account, String title, String description, Boolean visibility, Long userMaximum) throws EventException {
Visibility visibility1;
Long groupId = eventService.checkGroup();
@ -54,7 +54,7 @@ public class ControllerService {
createInviteLink(groupId);
}
CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), null, GroupType.SIMPLE, visibility1);
CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), null, GroupType.SIMPLE, visibility1, userMaximum);
eventService.saveEvent(createGroupEvent);
addUser(account, groupId);
@ -144,7 +144,7 @@ public class ControllerService {
visibility1 = Visibility.PRIVATE;
}
CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), null, GroupType.LECTURE, visibility1);
CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), null, GroupType.LECTURE, visibility1, null);
eventService.saveEvent(createGroupEvent);
addUser(account, groupId);

11
src/main/resources/templates/create.html
View File

@ -42,9 +42,14 @@
type="text">
</div>
<div class="form-group">
<label for="beschreibung">Beschreibung</label>
<textarea class="form-control" id="beschreibung" required
rows="3" th:name="beschreibung"></textarea>
<label for="description">Beschreibung</label>
<textarea class="form-control" id="description" required
rows="3" th:name="description"></textarea>
</div>
<div class="form-group mt-3">
<label for="userMaximum">Teilnehmeranzahl</label>
<input class="form-control" id="userMaximum" required th:name="userMaximum"
type="number" min="1">
</div>
<div class="custom-control custom-checkbox">
<input class="custom-control-input" id="visibility" th:name="visibility"

3
src/test/java/mops/gruppen2/builder/EventBuilder.java
View File

@ -56,7 +56,8 @@ public class EventBuilder {
faker.random().hex(),
null,
GroupType.SIMPLE,
Visibility.PRIVATE
Visibility.PRIVATE,
null
);
}

2
src/test/java/mops/gruppen2/service/EventServiceTest.java
View File

@ -56,7 +56,7 @@ class EventServiceTest {
@Test
void getDTOOffentlichTest() {
CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "test", null, GroupType.LECTURE, Visibility.PUBLIC);
CreateGroupEvent createGroupEvent = new CreateGroupEvent(eventService.checkGroup(), "test", null, GroupType.LECTURE, Visibility.PUBLIC, null);
EventDTO eventDTO = eventService.getDTO(createGroupEvent);
assertTrue(eventDTO.isVisibility());
}

2
src/test/java/mops/gruppen2/service/GroupServiceTest.java
View File

@ -29,7 +29,7 @@ class GroupServiceTest {
@Test
void rightClassForSuccessfulGroup() throws Exception {
List<Event> eventList = new ArrayList<>();
eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE));
eventList.add(new CreateGroupEvent(1L, "Prof", null, GroupType.LECTURE, Visibility.PRIVATE,null));
eventList.add(new AddUserEvent(1L, "Ulli", "Ulli", "Honnis", "FC@B.de"));
List<Group> groups = groupService.projectEventList(eventList);