1

Refactor after merge with master

Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
This commit is contained in:
XXNitram
2020-03-25 16:07:31 +01:00
parent 2c70deeb7b
commit dbfa260c4d
3 changed files with 30 additions and 34 deletions

View File

@ -10,6 +10,7 @@ import mops.gruppen2.security.Account;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.swing.text.StyledEditorKit;
import javax.validation.ValidationException;
import java.io.CharConversionException;
import java.io.File;
@ -46,7 +47,7 @@ public class ValidationService {
}
public void checkGroup(String title) {
if(title == null) throw new GroupNotFoundException("@details");
if (title == null) throw new GroupNotFoundException("@details");
}
public boolean checkIfUserInGroup(Group group, User user) {
@ -64,7 +65,7 @@ public class ValidationService {
}
public void checkIfUserInGroupJoin(Group group, User user) {
if(!group.getMembers().contains(user)){
if (group.getMembers().contains(user)) {
throw new UserAlreadyExistsException("@details");
}
}
@ -114,4 +115,24 @@ public class ValidationService {
}
return userList;
}
/**
* Überprüft ob alle Felder richtig gesetzt sind.
* @param description
* @param title
* @param userMaximum
*/
public void checkFields(String description, String title, Long userMaximum, Boolean maxInfiniteUsers) {
if (description == null) {
throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
}
if (title == null) {
throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
}
if (userMaximum == null && maxInfiniteUsers == null) {
throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
}
}
}