updated ktlint error and resolved key errors

Author: Hsankesara

buildSrc/src/main/kotlin/Versions.kt

@@ -24,7 +24,7 @@ object Versions {
     const val okhttp = "4.12.0"
 
     const val firebaseAdmin = "9.4.0"
-    const val radarSchemas = "0.8.11"
+    const val radarSchemas = "0.8.12"
     const val ktor = "2.3.10"
 
     const val junit = "5.10.2"

oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyCardiovascularAgeConverter.kt

@@ -5,7 +5,9 @@ import org.radarbase.oura.user.User
 import org.radarcns.connector.oura.OuraDailyCardiovascularAge
 import org.slf4j.LoggerFactory
 import java.time.Instant
-import java.time.OffsetDateTime
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 
 class OuraDailyCardiovascularAgeConverter(
     private val topic: String = "connect_oura_daily_cardiovascular_age",
@@ -18,8 +20,11 @@ class OuraDailyCardiovascularAgeConverter(
             ?: return emptySequence()
         return array.asSequence()
             .mapCatching {
-                val startTime = OffsetDateTime.parse(it["timestamp"].textValue())
-                val startInstant = startTime.toInstant()
+                val localDate = LocalDate.parse(
+                    it["day"].textValue(),
+                    DateTimeFormatter.ISO_LOCAL_DATE,
+                )
+                val startInstant = localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()
                 TopicData(
                     key = user.observationKey,
                     topic = topic,

oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyResilienceConverter.kt

@@ -7,6 +7,9 @@ import org.radarcns.connector.oura.OuraResilienceLevel
 import org.slf4j.LoggerFactory
 import java.time.Instant
 import java.time.OffsetDateTime
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 
 class OuraDailyResilienceConverter(
     private val topic: String = "connect_oura_daily_resilience",
@@ -19,8 +22,11 @@ class OuraDailyResilienceConverter(
             ?: return emptySequence()
         return array.asSequence()
             .mapCatching {
-                val startTime = OffsetDateTime.parse(it["timestamp"].textValue())
-                val startInstant = startTime.toInstant()
+                val localDate = LocalDate.parse(
+                    it["day"].textValue(),
+                    DateTimeFormatter.ISO_LOCAL_DATE,
+                )
+                val startInstant = localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
@@ -40,9 +46,11 @@ class OuraDailyResilienceConverter(
             id = data.get("id")?.textValue()
             day = data.get("day")?.textValue()
             contributorSleepRecovery = data.get("contributors")?.get("sleep_recovery")?.floatValue()
-            contributorDaytimeRecovery = data.get("contributors")?.get("daytime_recovery")?.floatValue()
+            contributorDaytimeRecovery = data.get("contributors")
+                ?.get("daytime_recovery")?.floatValue()
             contributorStress = data.get("contributors")?.get("stress")?.floatValue()
-            level = data.get("level")?.textValue()?.classifyResilienceLevel() ?: OuraResilienceLevel.UNKNOWN
+            level = data.get("level")?.textValue()?.classifyResilienceLevel()
+                ?: OuraResilienceLevel.UNKNOWN
         }.build()
     }
 

oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyStressConverter.kt

@@ -7,6 +7,9 @@ import org.radarcns.connector.oura.OuraDaySummaryType
 import org.slf4j.LoggerFactory
 import java.time.Instant
 import java.time.OffsetDateTime
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 
 class OuraDailyStressConverter(
     private val topic: String = "connect_oura_daily_stress",
@@ -19,8 +22,11 @@ class OuraDailyStressConverter(
             ?: return emptySequence()
         return array.asSequence()
             .mapCatching {
-                val startTime = OffsetDateTime.parse(it["timestamp"].textValue())
-                val startInstant = startTime.toInstant()
+                val localDate = LocalDate.parse(
+                    it["day"].textValue(),
+                    DateTimeFormatter.ISO_LOCAL_DATE,
+                )
+                val startInstant = localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()
                 TopicData(
                     key = user.observationKey,
                     topic = topic,
@@ -57,4 +63,4 @@ class OuraDailyStressConverter(
     companion object {
         val logger = LoggerFactory.getLogger(OuraDailyStressConverter::class.java)
     }
-}
+}

oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraVO2MaxConverter.kt

@@ -40,12 +40,12 @@ class OuraVO2MaxConverter(
             day = data.get("day")?.textValue()
             vo2Max = data.get("vo2_max")?.floatValue()
             timestamp = data.get("timestamp")?.textValue()?.let {
-                OffsetDateTime.parse(it).toInstant().toEpochMilli()
+                OffsetDateTime.parse(it).toInstant().toEpochMilli() / 1000.0
             }
         }.build()
     }
 
     companion object {
         val logger = LoggerFactory.getLogger(OuraDailyStressConverter::class.java)
     }
-}
+}

oura-library/src/main/kotlin/org/radarbase/oura/route/OuraVO2MaxRoute.kt

@@ -12,4 +12,4 @@ class OuraVO2MaxRoute(
     override fun toString(): String = "oura_vo2_max"
 
     override var converters = listOf(OuraVO2MaxConverter())
-}
+}