Skip to content

Fix intraday heart rate date range #196

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

Closed
mpgxvii wants to merge 3 commits into from
+11 −3
Closed

Fix intraday heart rate date range #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc12f11
conservative: filter observation outside of date range
pvannierop Mar 25, 2026
468e915
Fix intraday heart rate date range
mpgxvii Mar 25, 2026
c412767
Fix time format
mpgxvii Mar 25, 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
6 changes: 6 additions & 0 deletions ...ava/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,18 @@ protected Stream<TopicData> processRecords(

// Used as the date to convert the local times in the dataset to absolute times.
ZonedDateTime startDate = request.getDateRange().start();
Instant rangeStart = startDate.toInstant();
Instant rangeEnd = request.getDateRange().end().toInstant();

return iterableToStream(dataset)
.map(tryOrNull(activity -> {
Instant time = startDate.with(LocalTime.parse(activity.get("time").asText()))
.toInstant();

if (time.isBefore(rangeStart) || !time.isBefore(rangeEnd)) {
return null;
}

FitbitIntradayHeartRate heartRate = new FitbitIntradayHeartRate(
time.toEpochMilli() / 1000d,
timeReceived,
Expand Down
8 changes: 5 additions & 3 deletions ...e/src/main/java/org/radarbase/connect/rest/fitbit/route/FitbitIntradayHeartRateRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.radarbase.connect.rest.fitbit.route;

import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
import static java.time.temporal.ChronoUnit.DAYS;
import static java.time.temporal.ChronoUnit.SECONDS;

import io.confluent.connect.avro.AvroData;
Expand Down Expand Up @@ -46,8 +46,10 @@ protected Stream<FitbitRestRequest> createRequests(User user) {
return startDateGenerator(getOffset(user).plus(ONE_SECOND).truncatedTo(SECONDS))
.map(dateRange -> newRequest(user, dateRange,
user.getExternalUserId(), DATE_FORMAT.format(dateRange.start()),
ISO_LOCAL_TIME.format(dateRange.start()),
ISO_LOCAL_TIME.format(dateRange.end().truncatedTo(SECONDS))));
// Always request full day boundaries
TIME_FORMAT.format(dateRange.start().truncatedTo(DAYS).truncatedTo(SECONDS)),
TIME_FORMAT.format(dateRange.start().truncatedTo(DAYS).plusDays(1).minusNanos(1)
.truncatedTo(SECONDS))));
}

@Override
Expand Down