Skip to content

Commit 5b07c3d

Browse files
committed
Merge branch 'develop' into feature/PTBAS-738_syncDialogAnpassungen
# Conflicts: # src/main/java/de/doubleslash/keeptime/controller/HeimatController.java
2 parents d2eaa49 + 9270aec commit 5b07c3d

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

src/main/java/de/doubleslash/keeptime/controller/HeimatController.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,18 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
203203
long heimatTimeSeconds = times.stream()
204204
.reduce(0L, (subtotal, element) -> subtotal + element.durationInMinutes() * 60L,
205205
Long::sum);
206-
final HeimatTask heimatTask = heimatTasks.stream()
207-
.filter(t -> t.id() == times.get(0).taskId())
208-
.findAny()
209-
.orElseThrow();
210-
final Mapping mapping = new Mapping(id, true, false, StyledMessage.of(new StyledMessage.TextSegment(
211-
"Not mapped in KeepTime\n\n" + heimatTask.name() + "\n" + heimatTask.taskHolderName())), "", times,
206+
207+
final Optional<HeimatTask> optionalHeimatTask = heimatTasks.stream().filter(t -> t.id() == id).findAny();
208+
String taskName = "Cannot resolve Heimat Task Id: " + id + " to name\nPlease check in Heimat";
209+
if (optionalHeimatTask.isPresent()) {
210+
final HeimatTask heimatTask = optionalHeimatTask.get();
211+
taskName = heimatTask.name() + "\n" + heimatTask.taskHolderName();
212+
}
213+
214+
final Mapping mapping = new Mapping(id, true, false,
215+
StyledMessage.of(new StyledMessage.TextSegment("Not mapped in KeepTime\n\n" + taskName)), "",
216+
times,
217+
212218
new ArrayList<>(0), heimatNotes, "", heimatTimeSeconds, 0);
213219
list.add(mapping);
214220
});

0 commit comments

Comments
 (0)