Make offset seconds

mpgxvii · mpgxvii · commit f8a3113f97a7 · 2023-11-06T15:38:10.000Z
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyActivityConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyActivityConverter.kt
@@ -23,7 +23,7 @@ class OuraDailyActivityConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toDailyActivity(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyReadinessConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyReadinessConverter.kt
@@ -23,7 +23,7 @@ class OuraDailyReadinessConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toDailyReadiness(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailySleepConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailySleepConverter.kt
@@ -23,7 +23,7 @@ class OuraDailySleepConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toDailySleep(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailySpo2Converter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailySpo2Converter.kt
@@ -28,7 +28,7 @@ class OuraDailySpo2Converter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toDailySpo2(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDataConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDataConverter.kt
@@ -5,6 +5,8 @@ import okhttp3.Headers
 import org.radarbase.oura.request.OuraRequestGenerator.Companion.JSON_READER
 import org.radarbase.oura.request.RestRequest
 import org.radarbase.oura.user.User
+import java.time.Instant
+
 /**
  * Abstract class to help convert Fitbit data to Avro Data.
  */
@@ -36,4 +38,8 @@ interface OuraDataConverter : RecordConverter {
             }
             .toList()
     }
+
+    fun Instant.toEpoch(): Long {
+        return this.toEpochMilli() / 1000
+    }
 }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraHeartRateConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraHeartRateConverter.kt
@@ -24,7 +24,7 @@ class OuraHeartRateConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toHeartRate(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraRestModePeriodConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraRestModePeriodConverter.kt
@@ -23,7 +23,7 @@ class OuraRestModePeriodConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toRestModePeriod(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraRestModeTagConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraRestModeTagConverter.kt
@@ -32,7 +32,7 @@ class OuraRestModeTagConverter(
                                 TopicData(
                                     key = user.observationKey,
                                     topic = topic,
-                                    offset = startInstant.toEpochMilli(),
+                                    offset = startInstant.toEpoch(),
                                     value = data.toTag(startInstant, it.textValue()),
                                 )
                             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionConverter.kt
@@ -25,7 +25,7 @@ class OuraSessionConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toSession(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepConverter.kt
@@ -24,7 +24,7 @@ class OuraSleepConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toSleep(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepTimeRecommendationConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepTimeRecommendationConverter.kt
@@ -30,7 +30,7 @@ class OuraSleepTimeRecommendationConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toSleepTime(startInstant),
                 )
             }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraTagConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraTagConverter.kt
@@ -30,7 +30,7 @@ class OuraTagConverter(
                             TopicData(
                                 key = user.observationKey,
                                 topic = topic,
-                                offset = startInstant.toEpochMilli(),
+                                offset = startInstant.toEpoch(),
                                 value = data.toTag(startInstant, it.textValue()),
                             )
                         }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraWorkoutConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraWorkoutConverter.kt
@@ -25,7 +25,7 @@ class OuraWorkoutConverter(
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
-                    offset = startInstant.toEpochMilli(),
+                    offset = startInstant.toEpoch(),
                     value = it.toWorkout(startInstant),
                 )
             }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class OuraDailyActivityConverter(`
`23`	`23`	`TopicData(`
`24`	`24`	`key = user.observationKey,`
`25`	`25`	`topic = topic,`
`26`		`- offset = startInstant.toEpochMilli(),`
	`26`	`+ offset = startInstant.toEpoch(),`
`27`	`27`	`value = it.toDailyActivity(startInstant),`
`28`	`28`	`)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class OuraDailyReadinessConverter(`
`23`	`23`	`TopicData(`
`24`	`24`	`key = user.observationKey,`
`25`	`25`	`topic = topic,`
`26`		`- offset = startInstant.toEpochMilli(),`
	`26`	`+ offset = startInstant.toEpoch(),`
`27`	`27`	`value = it.toDailyReadiness(startInstant),`
`28`	`28`	`)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class OuraDailySleepConverter(`
`23`	`23`	`TopicData(`
`24`	`24`	`key = user.observationKey,`
`25`	`25`	`topic = topic,`
`26`		`- offset = startInstant.toEpochMilli(),`
	`26`	`+ offset = startInstant.toEpoch(),`
`27`	`27`	`value = it.toDailySleep(startInstant),`
`28`	`28`	`)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class OuraDailySpo2Converter(`
`28`	`28`	`TopicData(`
`29`	`29`	`key = user.observationKey,`
`30`	`30`	`topic = topic,`
`31`		`- offset = startInstant.toEpochMilli(),`
	`31`	`+ offset = startInstant.toEpoch(),`
`32`	`32`	`value = it.toDailySpo2(startInstant),`
`33`	`33`	`)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ import okhttp3.Headers`
`5`	`5`	`import org.radarbase.oura.request.OuraRequestGenerator.Companion.JSON_READER`
`6`	`6`	`import org.radarbase.oura.request.RestRequest`
`7`	`7`	`import org.radarbase.oura.user.User`
	`8`	`+import java.time.Instant`
	`9`	`+`
`8`	`10`	`/**`
`9`	`11`	`* Abstract class to help convert Fitbit data to Avro Data.`
`10`	`12`	`*/`
`@@ -36,4 +38,8 @@ interface OuraDataConverter : RecordConverter {`
`36`	`38`	`}`
`37`	`39`	`.toList()`
`38`	`40`	`}`
	`41`	`+`
	`42`	`+ fun Instant.toEpoch(): Long {`
	`43`	`+ return this.toEpochMilli() / 1000`
	`44`	`+ }`
`39`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class OuraHeartRateConverter(`
`24`	`24`	`TopicData(`
`25`	`25`	`key = user.observationKey,`
`26`	`26`	`topic = topic,`
`27`		`- offset = startInstant.toEpochMilli(),`
	`27`	`+ offset = startInstant.toEpoch(),`
`28`	`28`	`value = it.toHeartRate(startInstant),`
`29`	`29`	`)`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class OuraRestModePeriodConverter(`
`23`	`23`	`TopicData(`
`24`	`24`	`key = user.observationKey,`
`25`	`25`	`topic = topic,`
`26`		`- offset = startInstant.toEpochMilli(),`
	`26`	`+ offset = startInstant.toEpoch(),`
`27`	`27`	`value = it.toRestModePeriod(startInstant),`
`28`	`28`	`)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class OuraRestModeTagConverter(`
`32`	`32`	`TopicData(`
`33`	`33`	`key = user.observationKey,`
`34`	`34`	`topic = topic,`
`35`		`- offset = startInstant.toEpochMilli(),`
	`35`	`+ offset = startInstant.toEpoch(),`
`36`	`36`	`value = data.toTag(startInstant, it.textValue()),`
`37`	`37`	`)`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class OuraSessionConverter(`
`25`	`25`	`TopicData(`
`26`	`26`	`key = user.observationKey,`
`27`	`27`	`topic = topic,`
`28`		`- offset = startInstant.toEpochMilli(),`
	`28`	`+ offset = startInstant.toEpoch(),`
`29`	`29`	`value = it.toSession(startInstant),`
`30`	`30`	`)`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class OuraSleepConverter(`
`24`	`24`	`TopicData(`
`25`	`25`	`key = user.observationKey,`
`26`	`26`	`topic = topic,`
`27`		`- offset = startInstant.toEpochMilli(),`
	`27`	`+ offset = startInstant.toEpoch(),`
`28`	`28`	`value = it.toSleep(startInstant),`
`29`	`29`	`)`
`30`	`30`	`}`