return time entries for every asked userLocalId

urlaubsverwaltung · May 3, 2023 · 3509f64 · 3509f64
1 parent 190813f
commit 3509f64
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/src/main/java/de/focusshift/zeiterfassung/timeentry/TimeEntryServiceImpl.java b/src/main/java/de/focusshift/zeiterfassung/timeentry/TimeEntryServiceImpl.java
@@ -115,14 +115,17 @@ public Map<UserLocalId, List<TimeEntry>> getEntriesByUserLocalIds(LocalDate from
 
         final Map<UserId, UserLocalId> userLocalIdById = users.stream().collect(toMap(User::id, User::localId));
 
-        final List<TimeEntryEntity> result = timeEntryRepository
-            .findAllByOwnerIsInAndStartGreaterThanEqualAndStartLessThan(userIdValues, fromInstant, toInstant);
-
-        return result
+        final Map<UserLocalId, List<TimeEntry>> result = timeEntryRepository
+            .findAllByOwnerIsInAndStartGreaterThanEqualAndStartLessThan(userIdValues, fromInstant, toInstant)
             .stream()
             .map(TimeEntryServiceImpl::toTimeEntry)
-            // TODO add empty list entry for users without time entries
             .collect(groupingBy(timeEntry -> userLocalIdById.get(timeEntry.userId())));
+
+        for (UserLocalId userLocalId : userLocalIds) {
+            result.computeIfAbsent(userLocalId, (unused) -> List.of());
+        }
+
+        return result;
     }
 
     @Override

diff --git a/src/test/java/de/focusshift/zeiterfassung/timeentry/TimeEntryServiceImplTest.java b/src/test/java/de/focusshift/zeiterfassung/timeentry/TimeEntryServiceImplTest.java
@@ -847,6 +847,27 @@ void ensureGetEntriesByUserLocalIds() {
         });
     }
 
+    @Test
+    void ensureGetEntriesByUserLocalIdsReturnsValuesForEveryAskedUserLocalId() {
+
+        final UserLocalId batmanLocalId = new UserLocalId(1L);
+
+        when(userManagementService.findAllUsersByLocalIds(List.of(batmanLocalId))).thenReturn(List.of());
+
+        final LocalDate from = LocalDate.of(2023, 1, 1);
+        final LocalDate toExclusive = LocalDate.of(2023, 2, 1);
+
+        when(timeEntryRepository.findAllByOwnerIsInAndStartGreaterThanEqualAndStartLessThan(List.of(), from.atStartOfDay(UTC).toInstant(), toExclusive.atStartOfDay(UTC).toInstant()))
+            .thenReturn(List.of());
+
+        final Map<UserLocalId, List<TimeEntry>> actual = sut.getEntriesByUserLocalIds(from, toExclusive, List.of(batmanLocalId));
+
+        assertThat(actual).hasSize(1);
+        assertThat(actual).hasEntrySatisfying(batmanLocalId, timeEntries -> {
+            assertThat(timeEntries).isEmpty();
+        });
+    }
+
     @Test
     void ensureGetEntriesSortedByStart_NewestFirst() {