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

handle exam with no name

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

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

@ -671,7 +671,9 @@ public class ResourceService {
.stream()
.filter(exam -> exam != null
&& (exam.getStatus() == ExamStatus.RUNNING || exam.getStatus() == ExamStatus.FINISHED))
.map(exam -> new Tuple<>(exam.getModelId(), exam.name))
.map(exam -> new Tuple<>(
exam.getModelId(),
StringUtils.isBlank(exam.name) ? exam.externalId : exam.name))
.sorted(RESOURCE_COMPARATOR)
.collect(Collectors.toList());
}
@ -684,9 +686,10 @@ public class ResourceService {
.call()
.getOr(Collections.emptyList())
.stream()
.filter(entityName -> StringUtils.isNotBlank(entityName.name)
&& StringUtils.isNotBlank(entityName.modelId))
.map(entityName -> new Tuple<>(entityName.modelId, entityName.name))
.filter(entityName -> StringUtils.isNotBlank(entityName.modelId))
.map(entityName -> new Tuple<>(
entityName.modelId,
StringUtils.isBlank(entityName.name) ? entityName.modelId : entityName.name))
.sorted(RESOURCE_COMPARATOR)
.collect(Collectors.toList());
}
@ -699,10 +702,10 @@ public class ResourceService {
.call()
.getOr(Collections.emptyList())
.stream()
.filter(k -> StringUtils.isNotBlank(k.name) && StringUtils.isNotBlank(k.modelId))
.filter(k -> StringUtils.isNotBlank(k.modelId))
.collect(Collectors.toMap(
k -> Long.valueOf(k.modelId),
k -> k.name));
k -> StringUtils.isBlank(k.name) ? k.modelId : k.name));
}
public List<Tuple<String>> getViewResources() {