Skip to content

bugfix(#1212) Return empty TimeRange for null start and end times #1213

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

Merged
dgraf-gh merged 4 commits into from
Aug 28, 2026
Merged

bugfix(#1212) Return empty TimeRange for null start and end times #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a509cb
bugfix(#1212) Return empty TimeRange for null start and end times
dgraf-gh Aug 28, 2026
ecbfe7e
bugfix(#1212) Remove unused Timer import from LocationPointStagingSer…
dgraf-gh Aug 28, 2026
b068fab
bugfix(#1212) Handle missing and empty TimeRange during location data…
dgraf-gh Aug 28, 2026
ed60530
bugfix(#1212) Add method to calculate full TimeRange for staging loca…
dgraf-gh Aug 28, 2026
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
24 changes: 16 additions & 8 deletions src/main/java/com/dedicatedcode/reitti/service/importer/PromotionJobHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,22 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
metadataRepository.updateProgress(jobId, 2, 3, "Scheduling cleanup job");

if (promote > 0) {
this.userNotificationService.newLocationData(user, data.device, timeRange);
this.jobSchedulingService.enqueueTask(locationDataCleanupTask,
new LocationDataCleanupTask.TaskData(user, data.getDevice(), timeRange.start(), timeRange.end()).withParentJobId(data.getParentJobId()),
JobSchedulingService.Metadata.builder()
.user(user)
.jobType(JobType.LOCATION_DATA_CLEANUP)
.friendlyName("Location Data Cleanup")
.build());
if (timeRange.equals(TimeRange.empty())) {
log.debug("No timerange found for partitionKey [{}], recalculating", partitionKey);
timeRange = this.stagingService.getWholeTimeRange(partitionKey);
}
if (timeRange.equals(TimeRange.empty())) {
log.warn("Still no timerange found for partitionKey [{}], skipping cleanup", partitionKey);
} else {
this.userNotificationService.newLocationData(user, data.device, timeRange);
this.jobSchedulingService.enqueueTask(locationDataCleanupTask,
new LocationDataCleanupTask.TaskData(user, data.getDevice(), timeRange.start(), timeRange.end()).withParentJobId(data.getParentJobId()),
JobSchedulingService.Metadata.builder()
.user(user)
.jobType(JobType.LOCATION_DATA_CLEANUP)
.friendlyName("Location Data Cleanup")
.build());
}
} else {
log.debug("No points to promote, timerange was [{}]", timeRange);
}
Expand Down
16 changes: 15 additions & 1 deletion src/main/java/com/dedicatedcode/reitti/service/processing/LocationPointStagingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,28 @@ ON CONFLICT (user_id, device_id, timestamp) DO NOTHING
return insertedIds.size();
}

public TimeRange getWholeTimeRange(String partitionKey) {
String sql = "SELECT MIN(timestamp) as start_time, MAX(timestamp) as end_time FROM staging_location_points WHERE partition_key = ?";
return this.jdbcTemplate.queryForObject(sql, (rs, rowNum) -> {
Timestamp start = rs.getTimestamp("start_time");
Timestamp end = rs.getTimestamp("end_time");

if (start == null || end == null) {
return TimeRange.empty();
}

return new TimeRange(start.toInstant(), end.toInstant());
}, partitionKey);
}

public TimeRange getTimeRange(String partitionKey) {
String sql = "SELECT MIN(timestamp) as start_time, MAX(timestamp) as end_time FROM staging_location_points WHERE partition_key = ? AND promoted = FALSE";
return this.jdbcTemplate.queryForObject(sql, (rs, rowNum) -> {
Timestamp start = rs.getTimestamp("start_time");
Timestamp end = rs.getTimestamp("end_time");

if (start == null || end == null) {
return null;
return TimeRange.empty();
}

return new TimeRange(start.toInstant(), end.toInstant());
Expand Down
Loading