Skip to content
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

Update routes to limit range to 30 days #118

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Update routes to limit range to 30 days #118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1da16
fix: hrv, breathing rate, and skin temp routes to limit to 30 days
mpgxvii Mar 5, 2024
8e2949d
Update route range interval and add docs
mpgxvii Mar 5, 2024
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
21 changes: 11 additions & 10 deletions ...ource/src/main/java/org/radarbase/connect/rest/fitbit/route/FitbitBreathingRateRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,15 @@
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.ZonedDateTime;
import java.util.stream.Stream;

import static java.time.ZoneOffset.UTC;
import static java.time.temporal.ChronoUnit.SECONDS;
import java.time.Duration;

public class FitbitBreathingRateRoute extends FitbitPollingRoute {
private final FitbitBreathingRateAvroConverter converter;
protected static final Duration REQUEST_INTERVAL = Duration.ofDays(30);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rename this to THIRTY_DAYS and put it in the top level class, then it can be returned in downstream classes getDateRangeInterval() function. That way you don't have to define it more than once and make the code more readable.


public FitbitBreathingRateRoute(FitbitRequestGenerator generator,
UserRepository userRepository, AvroData avroData) {
Expand All @@ -46,16 +45,18 @@ protected String getUrlFormat(String baseUrl) {
}

protected Stream<FitbitRestRequest> createRequests(User user) {
ZonedDateTime startDate = this.getOffset(user).plus(ONE_SECOND)
.atZone(UTC)
.truncatedTo(SECONDS);
ZonedDateTime now = ZonedDateTime.now(UTC);
return Stream.of(newRequest(user, new DateRange(startDate, now),
user.getExternalUserId(), DATE_FORMAT.format(startDate), DATE_FORMAT.format(now)));
return startDateGenerator(getOffset(user).plus(ONE_SECOND).truncatedTo(SECONDS))
.map(dateRange -> newRequest(user, dateRange,
user.getExternalUserId(), DATE_FORMAT.format(dateRange.start())));
}

@Override
Duration getDateRangeInterval() {
return REQUEST_INTERVAL;
}

@Override
public FitbitBreathingRateAvroConverter converter() {
return converter;
}
}
}
23 changes: 12 additions & 11 deletions ...java/org/radarbase/connect/rest/fitbit/route/FitbitIntradayHeartRateVariabilityRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,21 @@
package org.radarbase.connect.rest.fitbit.route;

import io.confluent.connect.avro.AvroData;
import org.radarbase.connect.rest.fitbit.converter.FitbitIntradayHeartRateAvroConverter;
import org.radarbase.connect.rest.fitbit.converter.FitbitIntradayHeartRateVariabilityAvroConverter;
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.ZonedDateTime;
import java.util.stream.Stream;

import static java.time.ZoneOffset.UTC;
import static java.time.temporal.ChronoUnit.SECONDS;
import java.time.Duration;


public class FitbitIntradayHeartRateVariabilityRoute extends FitbitPollingRoute {
private final FitbitIntradayHeartRateVariabilityAvroConverter converter;
protected static final Duration REQUEST_INTERVAL = Duration.ofDays(30);

public FitbitIntradayHeartRateVariabilityRoute(FitbitRequestGenerator generator,
UserRepository userRepository, AvroData avroData) {
Expand All @@ -47,16 +46,18 @@ protected String getUrlFormat(String baseUrl) {
}

protected Stream<FitbitRestRequest> createRequests(User user) {
ZonedDateTime startDate = this.getOffset(user).plus(ONE_SECOND)
.atZone(UTC)
.truncatedTo(SECONDS);
ZonedDateTime now = ZonedDateTime.now(UTC);
return Stream.of(newRequest(user, new DateRange(startDate, now),
user.getExternalUserId(), DATE_FORMAT.format(startDate), DATE_FORMAT.format(now)));
return startDateGenerator(getOffset(user).plus(ONE_SECOND).truncatedTo(SECONDS))
.map(dateRange -> newRequest(user, dateRange,
user.getExternalUserId(), DATE_FORMAT.format(dateRange.start())));
}

@Override
Duration getDateRangeInterval() {
return REQUEST_INTERVAL;
}

@Override
public FitbitIntradayHeartRateVariabilityAvroConverter converter() {
return converter;
}
}
}
14 changes: 9 additions & 5 deletions ...tbit-source/src/main/java/org/radarbase/connect/rest/fitbit/route/FitbitPollingRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ private TemporalAmount getEndDateThreshold() {
}

/**
* Generate one date per day, using UTC time zone. The first date will have the time from the
* Generate one date per day (or specified rangeInterval), using UTC time zone. The first date will have the time from the
* given startDate. Following time stamps will start at 00:00. This will not up to the date of
* {@link #getLookbackTime()} (exclusive).
*/
Expand All @@ -345,12 +345,12 @@ Stream<DateRange> startDateGenerator(Instant startDate) {
return Stream.empty();
}
} else {
long numElements = DAYS.between(startDate, lookBack);
Duration rangeInterval = getDateRangeInterval();

Stream<DateRange> elements = Stream
.iterate(dateTime, t -> t.plus(ONE_DAY).truncatedTo(DAYS))
.limit(numElements)
.map(s -> new DateRange(s, s.plus(ONE_DAY).truncatedTo(DAYS).minus(ONE_NANO)));
.iterate(dateTime, t -> t.plus(rangeInterval).truncatedTo(DAYS))
.takeWhile(u -> u.isBefore(lookBackDateStart))
.map(s -> new DateRange(s, s.plus(rangeInterval).truncatedTo(DAYS).minus(ONE_NANO)));

// we're polling at exactly 00:00, should not poll the last date
if (lookBackDateStart.equals(lookBackDate)) {
Expand All @@ -362,4 +362,8 @@ Stream<DateRange> startDateGenerator(Instant startDate) {
}
}
}

Duration getDateRangeInterval() {
return ONE_DAY;
}
}
21 changes: 11 additions & 10 deletions ...rce/src/main/java/org/radarbase/connect/rest/fitbit/route/FitbitSkinTemperatureRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,15 @@
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.ZonedDateTime;
import java.util.stream.Stream;

import static java.time.ZoneOffset.UTC;
import static java.time.temporal.ChronoUnit.SECONDS;
import java.time.Duration;

public class FitbitSkinTemperatureRoute extends FitbitPollingRoute {
private final FitbitSkinTemperatureAvroConverter converter;
protected static final Duration REQUEST_INTERVAL = Duration.ofDays(30);

public FitbitSkinTemperatureRoute(FitbitRequestGenerator generator,
UserRepository userRepository, AvroData avroData) {
Expand All @@ -46,16 +45,18 @@ protected String getUrlFormat(String baseUrl) {
}

protected Stream<FitbitRestRequest> createRequests(User user) {
ZonedDateTime startDate = this.getOffset(user).plus(ONE_SECOND)
.atZone(UTC)
.truncatedTo(SECONDS);
ZonedDateTime now = ZonedDateTime.now(UTC);
return Stream.of(newRequest(user, new DateRange(startDate, now),
user.getExternalUserId(), DATE_FORMAT.format(startDate), DATE_FORMAT.format(now)));
return startDateGenerator(getOffset(user).plus(ONE_SECOND).truncatedTo(SECONDS))
.map(dateRange -> newRequest(user, dateRange,
user.getExternalUserId(), DATE_FORMAT.format(dateRange.start())));
}

@Override
Duration getDateRangeInterval() {
return REQUEST_INTERVAL;
}

@Override
public FitbitSkinTemperatureAvroConverter converter() {
return converter;
}
}
}
Loading