-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make shouldWorkingHours implementation aware of multiple users
fixes #905
- Loading branch information
Showing
2 changed files
with
70 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
package de.focusshift.zeiterfassung.report; | ||
|
||
import de.focusshift.zeiterfassung.absence.Absence; | ||
import de.focusshift.zeiterfassung.absence.AbsenceColor; | ||
import de.focusshift.zeiterfassung.absence.AbsenceTypeCategory; | ||
import de.focusshift.zeiterfassung.tenancy.user.EMailAddress; | ||
import de.focusshift.zeiterfassung.timeentry.ShouldWorkingHours; | ||
import de.focusshift.zeiterfassung.user.UserId; | ||
import de.focusshift.zeiterfassung.user.UserIdComposite; | ||
import de.focusshift.zeiterfassung.usermanagement.User; | ||
|
@@ -17,6 +21,9 @@ | |
import java.util.Map; | ||
import java.util.Set; | ||
|
||
import static de.focusshift.zeiterfassung.absence.AbsenceColor.RED; | ||
import static de.focusshift.zeiterfassung.absence.AbsenceTypeCategory.HOLIDAY; | ||
import static de.focusshift.zeiterfassung.absence.DayLength.FULL; | ||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
class ReportDayTest { | ||
|
@@ -40,6 +47,47 @@ void ensureToRemoveBreaks() { | |
assertThat(reportDay.workDuration().duration()).isEqualTo(Duration.ZERO); | ||
} | ||
|
||
@Test | ||
void shouldWorkingHoursReturnsZeroForFullyAbsentUser() { | ||
|
||
final UserId batmanId = new UserId("uuid"); | ||
final UserLocalId batmanLocalId = new UserLocalId(1337L); | ||
final UserIdComposite batmanIdComposite = new UserIdComposite(batmanId, batmanLocalId); | ||
final User batman = new User(batmanIdComposite, "Bruce", "Wayne", new EMailAddress("[email protected]"), Set.of()); | ||
|
||
final ZonedDateTime from = dateTime(2021, 1, 4, 1, 0); | ||
final ZonedDateTime to = dateTime(2021, 1, 4, 2, 0); | ||
Absence absence = new Absence(batmanId, from, to, FULL, locale -> "foo", RED, HOLIDAY); | ||
|
||
final ReportDay reportDay = new ReportDay(LocalDate.of(2021, 1, 4), Map.of(batmanIdComposite, PlannedWorkingHours.EIGHT), Map.of(batmanIdComposite, List.of()), Map.of(batmanIdComposite, List.of(new ReportDayAbsence(batman, absence)))); | ||
|
||
assertThat(reportDay.shouldWorkingHours()).isEqualTo(new ShouldWorkingHours(Duration.ZERO)); | ||
} | ||
|
||
@Test | ||
void shouldWorkingHoursReturnsShouldHoursForOneAbsentUserAndOneWorkingUser() { | ||
|
||
final UserId batmanId = new UserId("uuid1"); | ||
final UserLocalId batmanLocalId = new UserLocalId(1337L); | ||
final UserIdComposite batmanIdComposite = new UserIdComposite(batmanId, batmanLocalId); | ||
final User batman = new User(batmanIdComposite, "Bruce", "Wayne", new EMailAddress("[email protected]"), Set.of()); | ||
|
||
final ZonedDateTime from = dateTime(2021, 1, 4, 1, 0); | ||
final ZonedDateTime to = dateTime(2021, 1, 4, 2, 0); | ||
Absence absence = new Absence(batmanId, from, to, FULL, locale -> "foo", RED, HOLIDAY); | ||
|
||
final UserId robinId = new UserId("uuid2"); | ||
final UserLocalId robinLocalId = new UserLocalId(1337L); | ||
final UserIdComposite robinIdComposite = new UserIdComposite(robinId, robinLocalId); | ||
|
||
Map<UserIdComposite, List<ReportDayEntry>> entriesByUser = Map.of(batmanIdComposite, List.of(), robinIdComposite, List.of()); | ||
Map<UserIdComposite, List<ReportDayAbsence>> absencesByUser = Map.of(batmanIdComposite, List.of(new ReportDayAbsence(batman, absence)), robinIdComposite, List.of()); | ||
Map<UserIdComposite, PlannedWorkingHours> plannedWorkingHoursByUser = Map.of(batmanIdComposite, PlannedWorkingHours.EIGHT, robinIdComposite, new PlannedWorkingHours(Duration.ofHours(4L))); | ||
final ReportDay reportDay = new ReportDay(LocalDate.of(2021, 1, 4), plannedWorkingHoursByUser, entriesByUser, absencesByUser); | ||
|
||
assertThat(reportDay.shouldWorkingHours()).isEqualTo(new ShouldWorkingHours(Duration.ofHours(4L))); | ||
} | ||
|
||
private static ZonedDateTime dateTime(int year, int month, int dayOfMonth, int hour, int minute) { | ||
return ZonedDateTime.of(LocalDateTime.of(year, month, dayOfMonth, hour, minute), ZONE_ID_BERLIN); | ||
} | ||
|