Skip to content

Consider tenant timezone when determining "today" for overdue ILLDEV-52 #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
skomorokh wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Consider tenant timezone when determining "today" for overdue ILLDEV-52 #930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .../grails-app/services/org/olf/rs/timers/TimerCheckForOverdueSupplierRequestsService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package org.olf.rs.timers;

import org.dmfs.rfc5545.DateTime;
import java.time.temporal.ChronoUnit;
import java.time.ZonedDateTime;
import java.time.ZoneId;
import org.olf.rs.OkapiSettingsService;
import org.olf.rs.PatronRequest;
import org.olf.rs.ReshareApplicationEventHandlerService;
import org.olf.rs.statemodel.Status;
Expand All @@ -26,12 +29,15 @@ where pr.parsedDueDateRS < :today and
s.canTriggerOverdueRequest = true)
""";

OkapiSettingsService okapiSettingsService;
ReshareApplicationEventHandlerService reshareApplicationEventHandlerService;

@Override
public void performTask(String tenant, String config) {
// Only interested in the date segment and that it is in UTC
Date today = new Date((new DateTime(TimeZone.getTimeZone(TIME_ZONE_UTC), System.currentTimeMillis())).startOfDay().getTimestamp());
// We need to take the tenant timezone into account when calculating the beginning of the day
Map localeSettings = okapiSettingsService.getLocaleSettings();
ZoneId zoneId = ZoneId.of(localeSettings?.timezone ?: "UTC");
Date today = Date.from(ZonedDateTime.now(zoneId).truncatedTo(ChronoUnit.DAYS).withLaterOffsetAtOverlap().toInstant());

// Now find all the incoming requests
List<PatronRequest> requests = PatronRequest.findAll(OVERDUE_REQUESTS_QUERY, [ today : today ]);
Expand Down
Loading