Skip to content

Fix data progression for resting heart rate download #211

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

Open
pvannierop wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix data progression for resting heart rate download #211

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
31 changes: 12 additions & 19 deletions ...ce/src/main/java/org/radarbase/connect/rest/fitbit/route/FitbitRestingHeartRateRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,18 @@

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

import static java.time.ZoneOffset.UTC;
import static java.time.temporal.ChronoUnit.DAYS;

import io.confluent.connect.avro.AvroData;

import java.time.Duration;
import java.time.ZonedDateTime;
import java.util.stream.Stream;

import org.radarbase.connect.rest.fitbit.converter.FitbitRestingHeartRateAvroConverter;
import org.radarbase.connect.rest.fitbit.request.FitbitRequestGenerator;
import org.radarbase.connect.rest.fitbit.request.FitbitRestRequest;
import org.radarbase.connect.rest.fitbit.user.User;
import org.radarbase.connect.rest.fitbit.user.UserRepository;
import org.radarbase.connect.rest.fitbit.util.DateRange;

import java.time.Duration;
import java.util.stream.Stream;

import static java.time.ZoneOffset.UTC;
import static java.time.temporal.ChronoUnit.DAYS;

public class FitbitRestingHeartRateRoute extends FitbitPollingRoute {
private static final Duration RESTING_HEART_RATE_POLL_INTERVAL = Duration.ofDays(1);
Expand All @@ -46,16 +43,12 @@ public FitbitRestingHeartRateRoute(

@Override
protected Stream<FitbitRestRequest> createRequests(User user) {
// Important: resting heart rate is queried at the resolution of a single
// day, so the offset for the next request will be set to the next day.
ZonedDateTime startDate = this.getOffset(user).plus(ONE_DAY)
.atZone(UTC)
.truncatedTo(DAYS);
// Note: the date range of startDate to now() is not correct, but will ensure that in case of empty
// results, the HISTORICAL_TIME_DAYS retry inactivation in requestEmpty() of FitbitPollingRoute.java
// will never be used.
return Stream.of(newRequest(user, new DateRange(startDate, ZonedDateTime.now(UTC)),
user.getExternalUserId(), DATE_FORMAT.format(startDate)));
return startDateGenerator(
getOffset(user).plus(ONE_DAY).atZone(UTC).truncatedTo(DAYS).toInstant()
).map(
dateRange -> newRequest(user, dateRange,
user.getExternalUserId(), DATE_FORMAT.format(dateRange.start()))
);
}

@Override
Expand Down
Loading