From ace248ac7769699879513776f010a0c8d9401137 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 14 Jul 2021 14:46:33 +0200 Subject: [PATCH 1/2] Don't store zero steps / calories / heart rates --- .../fitbit/converter/FitbitIntradayCaloriesAvroConverter.java | 1 + .../fitbit/converter/FitbitIntradayHeartRateAvroConverter.java | 1 + .../rest/fitbit/converter/FitbitIntradayStepsAvroConverter.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java index 93fb8847..ffd4d7f2 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java @@ -45,6 +45,7 @@ protected Stream processRecords( ZonedDateTime startDate = request.getDateRange().end(); return iterableToStream(dataset) + .filter(activity -> activity.get("value") != null && activity.get("value").asDouble() != 0) .map( tryOrNull( activity -> { diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java index 89bc4cf1..28de6efe 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java @@ -66,6 +66,7 @@ protected Stream processRecords( ZonedDateTime startDate = request.getDateRange().start(); return iterableToStream(dataset) + .filter(activity -> activity.get("value") != null && activity.get("value").asInt() != 0) .map(tryOrNull(activity -> { Instant time = startDate.with(LocalTime.parse(activity.get("time").asText())) .toInstant(); diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayStepsAvroConverter.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayStepsAvroConverter.java index 2381afa4..1751acca 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayStepsAvroConverter.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayStepsAvroConverter.java @@ -67,8 +67,8 @@ protected Stream processRecords( ZonedDateTime startDate = request.getDateRange().end(); return iterableToStream(dataset) + .filter(activity -> activity.get("value") != null && activity.get("value").asInt() != 0) .map(tryOrNull(activity -> { - Instant time = startDate .with(LocalTime.parse(activity.get("time").asText())) .toInstant(); From 795b02228ec122dbcc67056bc4a51f6e9db12a4a Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Wed, 14 Jul 2021 15:52:52 +0200 Subject: [PATCH 2/2] Revert conditions that are never met --- .../fitbit/converter/FitbitIntradayCaloriesAvroConverter.java | 1 - .../fitbit/converter/FitbitIntradayHeartRateAvroConverter.java | 1 - 2 files changed, 2 deletions(-) diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java index ffd4d7f2..93fb8847 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayCaloriesAvroConverter.java @@ -45,7 +45,6 @@ protected Stream processRecords( ZonedDateTime startDate = request.getDateRange().end(); return iterableToStream(dataset) - .filter(activity -> activity.get("value") != null && activity.get("value").asDouble() != 0) .map( tryOrNull( activity -> { diff --git a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java index 28de6efe..89bc4cf1 100644 --- a/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java +++ b/kafka-connect-fitbit-source/src/main/java/org/radarbase/connect/rest/fitbit/converter/FitbitIntradayHeartRateAvroConverter.java @@ -66,7 +66,6 @@ protected Stream processRecords( ZonedDateTime startDate = request.getDateRange().start(); return iterableToStream(dataset) - .filter(activity -> activity.get("value") != null && activity.get("value").asInt() != 0) .map(tryOrNull(activity -> { Instant time = startDate.with(LocalTime.parse(activity.get("time").asText())) .toInstant();