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

remove double validation + improve userlimit update

Browse Source
This commit is contained in:
Christoph
2020-04-12 14:19:04 +02:00
parent 80bc59dba7
commit 6dc708989b
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/mops/gruppen2/domain/service/GroupService.java
View File

@ -207,7 +207,6 @@ public class GroupService {
*/ */
public void updateTitle(User user, Group group, String title) { public void updateTitle(User user, Group group, String title) {
ValidationService.throwIfNoAdmin(group, user); ValidationService.throwIfNoAdmin(group, user);
ValidationService.validateTitle(title.trim());
if (title.trim().equals(group.getTitle())) { if (title.trim().equals(group.getTitle())) {
return; return;
@ -226,7 +225,6 @@ public class GroupService {
*/ */
public void updateDescription(User user, Group group, String description) { public void updateDescription(User user, Group group, String description) {
ValidationService.throwIfNoAdmin(group, user); ValidationService.throwIfNoAdmin(group, user);
ValidationService.validateDescription(description.trim());
if (description.trim().equals(group.getDescription())) { if (description.trim().equals(group.getDescription())) {
return; return;
@ -263,13 +261,18 @@ public class GroupService {
*/ */
public void updateUserLimit(User user, Group group, long userLimit) { public void updateUserLimit(User user, Group group, long userLimit) {
ValidationService.throwIfNoAdmin(group, user); ValidationService.throwIfNoAdmin(group, user);
ValidationService.validateUserLimit(userLimit, group);
if (userLimit == group.getUserLimit()) { if (userLimit == group.getUserLimit()) {
return; return;
} }
Event event = new UpdateUserLimitEvent(group, user, userLimit); Event event;
if (userLimit < group.getMembers().size()) {
event = new UpdateUserLimitEvent(group, user, group.getMembers().size());
} else {
event = new UpdateUserLimitEvent(group, user, userLimit);
}
event.apply(group); event.apply(group);
eventStoreService.saveEvent(event); eventStoreService.saveEvent(event);

27
src/main/java/mops/gruppen2/domain/service/ValidationService.java
View File

@ -111,33 +111,6 @@ public final class ValidationService {
// ##################################### VALIDATE FIELDS ##################################### // ##################################### VALIDATE FIELDS #####################################
//TODO: max title length?
public static void validateTitle(String title) {
if (title == null || title.trim().isEmpty()) {
log.error("Der Titel {} ist fehlerhaft!", title);
throw new BadParameterException("Der Titel darf nicht leer sein!");
}
}
//TODO: max description length?
public static void validateDescription(String description) {
if (description == null || description.trim().isEmpty()) {
log.error("Die Beschreibung {} ist fehlerhaft!", description);
throw new BadParameterException("Die Beschreibung darf nicht leer sein!");
}
}
public static void validateUserLimit(long userLimit, Group group) {
if (userLimit < 1) {
throw new BadParameterException("Das Userlimit muss größer als 1 sein!");
}
if (userLimit < group.getMembers().size()) {
throw new BadParameterException("Das Userlimit kann nicht unter der momentanen Mitgliederanzahl sein!");
}
}
public static void validateCreateForm(KeycloakAuthenticationToken token, CreateForm form) { public static void validateCreateForm(KeycloakAuthenticationToken token, CreateForm form) {
if (!token.getAccount().getRoles().contains("orga") if (!token.getAccount().getRoles().contains("orga")
&& form.getType() == GroupType.LECTURE) { && form.getType() == GroupType.LECTURE) {