Skip to content

Commit 96ecef5

Browse files
committed
#178: show project of heimat for not mapped keeptime project
1 parent 3461ce2 commit 96ecef5

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,13 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
146146
long heimatTimeSeconds = times.stream()
147147
.reduce(0L, (subtotal, element) -> subtotal + element.durationInMinutes() * 60L,
148148
Long::sum);
149-
final Mapping mapping = new Mapping(id, false, "Not mapped in KeepTime", times, new ArrayList<>(0),
150-
heimatNotes, "", heimatTimeSeconds, 0);
149+
final HeimatTask heimatTask = heimatTasks.stream()
150+
.filter(t -> t.id() == times.get(0).taskId())
151+
.findAny()
152+
.get();
153+
final Mapping mapping = new Mapping(id, false,
154+
"Not mapped in KeepTime\n\n" + heimatTask.name() + "\n" + heimatTask.projectName(), times,
155+
new ArrayList<>(0), heimatNotes, "", heimatTimeSeconds, 0);
151156
list.add(mapping);
152157
});
153158
return list;

src/test/java/de/doubleslash/keeptime/controller/HeimatControllerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ void shouldShowHeimatTimeWhenProjectIsNotMappedInKeeptime() {
178178
// ASSERT
179179
assertAll(() -> assertFalse(mapping.canBeSynced()),
180180
() -> assertThat(mapping.syncMessage(), Matchers.containsString("Not mapped in KeepTime")),
181+
() -> assertThat(mapping.syncMessage(), Matchers.containsString(project1To1Mapping.getExternalTaskName())),
181182
() -> assertThat(mapping.keeptimeSeconds(), Matchers.is(0L)),
182183
() -> assertThat(mapping.keeptimeNotes(), Matchers.is("")),
183184
() -> assertThat(mapping.projects().size(), Matchers.is(0)),

0 commit comments

Comments
 (0)