Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] fix shift by weeks

This commit is contained in:
Robert von Burg 2021-05-26 16:02:02 +02:00
parent e99e9ad12c
commit db8592db41
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
View File

@ -201,7 +201,7 @@ public class PeriodHelper {
double daysInPeriod = daysIn(periodDuration);
// see if we need end shift by weeks
if (period.getDays() % 7 == 0 && daysInPeriod % 7 == 0) {
if (period.getDays() != 0 && period.getDays() % 7 == 0 && daysInPeriod % 7 == 0) {
int numberOfWeeks = period.getDays() / 7;
// calculate the number of weeks to shift
@ -213,7 +213,9 @@ public class PeriodHelper {
if (shiftWeeks < numberOfWeeks)
return date;
return date.plusWeeks(shiftWeeks);
ZonedDateTime result = date.plusWeeks(shiftWeeks);
if (!result.isBefore(end))
return date.plusWeeks(shiftWeeks - 1);
}
// see if we are shifting simply by single days
@ -243,10 +245,10 @@ public class PeriodHelper {
"Expected period to be zero at this point and only duration to be set: " + periodDuration);
// shifting by e.g. PT8H
long hoursInPeriod = duration.toHours();
long hoursInBetween = TimeUnit.DAYS.toHours((long) daysInBetween);
long shifts = hoursInBetween / hoursInPeriod;
long shiftHours = shifts * hoursInPeriod;
double hoursInPeriod = duration.getSeconds() / 60.0 / 60.0;
double hoursInBetween = TimeUnit.DAYS.toHours((long) daysInBetween);
long shifts = (long) (hoursInBetween / hoursInPeriod);
long shiftHours = (long) (shifts * hoursInPeriod);
if (shiftHours < 24)
return date;

4
li.strolch.utils/src/test/java/li/strolch/utils/time/PeriodHelperTest.java
View File

@ -364,7 +364,7 @@ public class PeriodHelperTest {
ZonedDateTime shifted = shiftByMultipleOfPeriod(date1, date2, PeriodDuration.parse("P7D"));
assertEquals(date1.getDayOfWeek(), shifted.getDayOfWeek());
ZonedDateTime expected = LocalDate.of(2021, 4, 28).atStartOfDay(ZoneId.systemDefault());
ZonedDateTime expected = LocalDate.of(2021, 4, 21).atStartOfDay(ZoneId.systemDefault());
assertEquals(shifted.toString(), expected, shifted);
}
@ -520,7 +520,7 @@ public class PeriodHelperTest {
ZonedDateTime shifted = shiftByMultipleOfPeriod(d1, d2, PeriodDuration.parse("P1W"));
assertEquals(d1.getDayOfWeek(), shifted.getDayOfWeek());
ZonedDateTime expected = LocalDate.of(2021, 4, 27).atStartOfDay(ZoneId.systemDefault());
ZonedDateTime expected = LocalDate.of(2021, 4, 20).atStartOfDay(ZoneId.systemDefault());
assertEquals(shifted.toString(), expected, shifted);
}