Merge pull request #59 from RADAR-base/release-0.3.1

Release 0.3.1
RADAR-base · May 16, 2023 · 7d4f3ad · 7d4f3ad
2 parents 660790e + 872a725
commit 7d4f3ad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ description = "RADAR Push API Gateway to handle secured data flow to backend."
 
 allprojects {
     group = "org.radarbase"
-    version = "0.3.0"
+    version = "0.3.1"
 
     repositories {
         mavenCentral()

diff --git a/src/main/kotlin/org/radarbase/gateway/Config.kt b/src/main/kotlin/org/radarbase/gateway/Config.kt
@@ -80,7 +80,7 @@ data class GarminConfig(
         if (enabled) {
             check(GarminUserRepository::class.java.isAssignableFrom(userRepository)) {
                 "$userRepositoryClass is not valid. Please specify a class that is a subclass of" +
-                        " `org.radarbase.push.integration.garmin.user.GarminUserRepository`"
+                    " `org.radarbase.push.integration.garmin.user.GarminUserRepository`"
             }
         }
     }
@@ -91,7 +91,9 @@ data class BackfillConfig(
     val redis: RedisConfig = RedisConfig(),
     val maxThreads: Int = 4,
     val defaultEndDate: Instant = Instant.MAX,
-    val userBackfill: List<UserBackfillConfig> = emptyList()
+    val userBackfill: List<UserBackfillConfig> = emptyList(),
+    val requestsPerUserPerIteration: Int = 40,
+    val iterationIntervalMinutes: Long = 5,
 )
 
 data class RedisConfig(

diff --git a/...n/kotlin/org/radarbase/push/integration/garmin/converter/SleepScoreGarminAvroConverter.kt b/...n/kotlin/org/radarbase/push/integration/garmin/converter/SleepScoreGarminAvroConverter.kt
@@ -18,7 +18,7 @@ class SleepScoreGarminAvroConverter(
 
     private fun getRecord(node: JsonNode): SpecificRecord {
         return GarminSleepScoreSample.newBuilder().apply {
-            summaryId = summaryId
+            summaryId = node["summaryId"]?.asText()
             time = node["startTimeInSeconds"].asDouble()
             startTimeOffset = node["startTimeOffsetInSeconds"]?.asInt()
             timeReceived = Instant.now().toEpochMilli() / 1000.0

diff --git a/src/main/kotlin/org/radarbase/push/integration/garmin/service/BackfillService.kt b/src/main/kotlin/org/radarbase/push/integration/garmin/service/BackfillService.kt
@@ -47,7 +47,7 @@ class BackfillService(
     )
 
     private val requestsPerUserPerIteration: Int
-        get() = 40
+        get() = config.pushIntegration.garmin.backfill.requestsPerUserPerIteration
 
     private val futures: MutableList<Future<*>> = mutableListOf()
 
@@ -64,7 +64,12 @@ class BackfillService(
     private fun start() {
         logger.info("Application Initialisation completed. Starting Backfill service...")
 
-        executorService.scheduleAtFixedRate(::iterateUsers, 1, 5, TimeUnit.MINUTES)
+        executorService.scheduleAtFixedRate(
+            ::iterateUsers,
+            1,
+            config.pushIntegration.garmin.backfill.iterationIntervalMinutes,
+            TimeUnit.MINUTES
+        )
     }
 
     private fun stop() {
@@ -124,6 +129,5 @@ class BackfillService(
 
     companion object {
         private val logger = LoggerFactory.getLogger(BackfillService::class.java)
-        private const val WAIT_TIME_MS = 10_000L
     }
 }