zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed exam name error

Browse source
This commit is contained in:
anhefti 2022-05-25 09:16:25 +02:00
parent ceb2a53c83
commit 377167132f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java
View file

@ -684,6 +684,8 @@ public class ResourceService {
.call() .call()
.getOr(Collections.emptyList()) .getOr(Collections.emptyList())
.stream() .stream()
.filter(entityName -> StringUtils.isNotBlank(entityName.name)
&& StringUtils.isNotBlank(entityName.modelId))
.map(entityName -> new Tuple<>(entityName.modelId, entityName.name)) .map(entityName -> new Tuple<>(entityName.modelId, entityName.name))
.sorted(RESOURCE_COMPARATOR) .sorted(RESOURCE_COMPARATOR)
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -697,7 +699,7 @@ public class ResourceService {
.call() .call()
.getOr(Collections.emptyList()) .getOr(Collections.emptyList())
.stream() .stream()
.filter(k -> StringUtils.isNotBlank(k.modelId)) .filter(k -> StringUtils.isNotBlank(k.name) && StringUtils.isNotBlank(k.modelId))
.collect(Collectors.toMap( .collect(Collectors.toMap(
k -> Long.valueOf(k.modelId), k -> Long.valueOf(k.modelId),
k -> k.name)); k -> k.name));