Skip to content

Commit 5ac0636

Browse files
committed
dspace-api: fix daily and weekly frequency calculation
1 parent c637949 commit 5ac0636

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

dspace-api/src/main/java/org/dspace/eperson/FrequencyType.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212

1313
import java.time.DayOfWeek;
1414
import java.time.Instant;
15-
import java.time.LocalDateTime;
1615
import java.time.LocalTime;
1716
import java.time.YearMonth;
1817
import java.time.ZoneOffset;
1918
import java.time.ZonedDateTime;
20-
import java.time.temporal.ChronoUnit;
2119
import java.util.Arrays;
2220

2321
import org.apache.commons.codec.binary.StringUtils;
@@ -48,13 +46,13 @@ public static String findLastFrequency(String frequency) {
4846
// startDate is beginning of day yesterday
4947
Instant startOfYesterday = ZonedDateTime.now(ZoneOffset.UTC)
5048
.minus(1, ChronoUnit.DAYS)
51-
.with(LocalDateTime.MIN)
49+
.with(LocalTime.MIN)
5250
.toInstant();
5351
startDate = startOfYesterday.toString();
5452
// endDate is end of day yesterday
5553
Instant endOfYesterday = ZonedDateTime.now(ZoneOffset.UTC)
5654
.minus(1, ChronoUnit.DAYS)
57-
.with(LocalDateTime.MAX)
55+
.with(LocalTime.MAX)
5856
.toInstant();
5957
endDate = endOfYesterday.toString();
6058
break;
@@ -80,14 +78,14 @@ public static String findLastFrequency(String frequency) {
8078
Instant startOfLastWeek = ZonedDateTime.now(ZoneOffset.UTC)
8179
.minus(1, ChronoUnit.WEEKS)
8280
.with(previousOrSame(DayOfWeek.SUNDAY))
83-
.with(LocalDateTime.MIN)
81+
.with(LocalTime.MIN)
8482
.toInstant();
8583
startDate = startOfLastWeek.toString();
8684
// End date is end of last week (Saturday, end of day)
8785
Instant endOfLastWeek = ZonedDateTime.now(ZoneOffset.UTC)
8886
.minus(1, ChronoUnit.WEEKS)
8987
.with(nextOrSame(DayOfWeek.SATURDAY))
90-
.with(LocalDateTime.MAX)
88+
.with(LocalTime.MAX)
9189
.toInstant();
9290
endDate = endOfLastWeek.toString();
9391
break;

0 commit comments

Comments
 (0)