Add separate Oura config for getting routes

mpgxvii · mpgxvii · commit b5548ef29fb6 · 2025-09-17T16:33:49.000+01:00
diff --git a/kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/OuraRestSourceConnectorConfig.java b/kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/OuraRestSourceConnectorConfig.java
@@ -45,6 +45,9 @@
 import org.apache.kafka.connect.errors.ConnectException;
 import org.radarbase.connect.rest.oura.user.OuraUserRepository;
 import org.radarbase.connect.rest.oura.user.OuraServiceUserRepository;
+import org.radarbase.oura.route.OuraConfig;
+import org.radarbase.oura.route.OuraRouteType;
+import java.util.EnumSet;
 
 public class OuraRestSourceConnectorConfig extends AbstractConfig {
   public static final Pattern COLON_PATTERN = Pattern.compile(":");
@@ -527,4 +530,25 @@ public URL getOuraUserRepositoryTokenUrl() {
   public boolean getOuraRestModePeriodEnabled() { return getBoolean(OURA_REST_MODE_PERIOD_ENABLED_CONFIG); }
   public boolean getOuraSleepTimeRecommendationEnabled() { return getBoolean(OURA_SLEEP_TIME_RECOMMENDATION_ENABLED_CONFIG); }
 
+  /**
+   * Convert this connector configuration into an Oura library configuration.
+   */
+  public OuraConfig toOuraConfig() {
+    EnumSet<OuraRouteType> enabled = EnumSet.noneOf(OuraRouteType.class);
+    if (getOuraDailyActivityEnabled()) enabled.add(OuraRouteType.DAILY_ACTIVITY);
+    if (getOuraDailyReadinessEnabled()) enabled.add(OuraRouteType.DAILY_READINESS);
+    if (getOuraDailySleepEnabled()) enabled.add(OuraRouteType.DAILY_SLEEP);
+    if (getOuraDailyOxygenSaturationEnabled()) enabled.add(OuraRouteType.DAILY_OXYGEN_SATURATION);
+    if (getOuraHeartRateEnabled()) enabled.add(OuraRouteType.HEART_RATE);
+    if (getOuraPersonalInfoEnabled()) enabled.add(OuraRouteType.PERSONAL_INFO);
+    if (getOuraSessionEnabled()) enabled.add(OuraRouteType.SESSION);
+    if (getOuraSleepEnabled()) enabled.add(OuraRouteType.SLEEP);
+    if (getOuraTagEnabled()) enabled.add(OuraRouteType.TAG);
+    if (getOuraWorkoutEnabled()) enabled.add(OuraRouteType.WORKOUT);
+    if (getOuraRingConfigurationEnabled()) enabled.add(OuraRouteType.RING_CONFIGURATION);
+    if (getOuraRestModePeriodEnabled()) enabled.add(OuraRouteType.REST_MODE_PERIOD);
+    if (getOuraSleepTimeRecommendationEnabled()) enabled.add(OuraRouteType.SLEEP_TIME_RECOMMENDATION);
+    return new OuraConfig(enabled);
+  }
+
 }
diff --git a/kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/OuraSourceTask.java b/kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/OuraSourceTask.java
@@ -49,6 +49,7 @@
 import org.radarbase.oura.route.OuraRouteFlags;
 import org.radarbase.oura.route.OuraRouteFactory;
 import org.radarbase.oura.route.Route;
+import org.radarbase.oura.route.OuraConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.radarbase.oura.user.User;
@@ -75,23 +76,8 @@ public void initialize(OuraRestSourceConnectorConfig config, OffsetStorageReader
     this.baseClient = new OkHttpClient();
 
     this.userRepository = ouraConfig.getUserRepository();
-    OuraRouteFlags flags = new OuraRouteFlags(
-        ouraConfig.getOuraDailyActivityEnabled(),
-        ouraConfig.getOuraDailyReadinessEnabled(),
-        ouraConfig.getOuraDailySleepEnabled(),
-        ouraConfig.getOuraDailyOxygenSaturationEnabled(),
-        ouraConfig.getOuraHeartRateEnabled(),
-        ouraConfig.getOuraPersonalInfoEnabled(),
-        ouraConfig.getOuraSessionEnabled(),
-        ouraConfig.getOuraSleepEnabled(),
-        ouraConfig.getOuraTagEnabled(),
-        ouraConfig.getOuraWorkoutEnabled(),
-        ouraConfig.getOuraRingConfigurationEnabled(),
-        ouraConfig.getOuraRestModePeriodEnabled(),
-        ouraConfig.getOuraSleepTimeRecommendationEnabled()
-    );
     this.offsetManager = new KafkaOffsetManager(offsetStorageReader);
-    this.ouraRequestGenerator = new OuraRequestGenerator(this.userRepository, this.offsetManager, flags);
+    this.ouraRequestGenerator = new OuraRequestGenerator(this.userRepository, this.offsetManager, ouraConfig.toOuraConfig());
     this.routes = this.ouraRequestGenerator.getRoutes();
     this.offsetManager.initialize(getPartitions());
   }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/request/OuraRequestGenerator.kt b/oura-library/src/main/kotlin/org/radarbase/oura/request/OuraRequestGenerator.kt
@@ -6,8 +6,8 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import okhttp3.Response
 import okhttp3.ResponseBody
 import org.radarbase.oura.converter.TopicData
+import org.radarbase.oura.route.OuraConfig
 import org.radarbase.oura.route.OuraRouteFactory
-import org.radarbase.oura.route.OuraRouteFlags
 import org.radarbase.oura.route.Route
 import org.radarbase.oura.user.User
 import org.radarbase.oura.user.UserRepository
@@ -22,8 +22,8 @@ class OuraRequestGenerator
 constructor(
     private val userRepository: UserRepository,
     private val ouraOffsetManager: OuraOffsetManager,
-    private val flags: OuraRouteFlags,
-    public val routes: List<Route> = OuraRouteFactory.getRoutes(userRepository, flags),
+    private val config: OuraConfig,
+    public val routes: List<Route> = OuraRouteFactory.getRoutes(userRepository, config),
     private val defaultQueryRange: Duration = Duration.ofDays(15),
 ) : RequestGenerator {
     private val routeNextRequest: MutableMap<String, Instant> = mutableMapOf()
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraConfig.kt b/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraConfig.kt
@@ -0,0 +1,11 @@
+package org.radarbase.oura.route
+
+data class OuraConfig @JvmOverloads constructor(
+    // New extensible configuration
+    val enabledRoutes: Set<OuraRouteType> = defaultEnabledRoutes(),
+) {
+    companion object {
+        @JvmStatic
+        fun defaultEnabledRoutes(): Set<OuraRouteType> = enumValues<OuraRouteType>().toSet()
+    }
+}
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraRouteFactory.kt b/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraRouteFactory.kt
@@ -6,48 +6,53 @@ object OuraRouteFactory {
 
     @JvmStatic
     fun getRoutes(userRepository: UserRepository): List<Route> =
-        getRoutes(userRepository, OuraRouteFlags())
+        getRoutes(userRepository, OuraConfig())
 
     @JvmStatic
-    fun getRoutes(userRepository: UserRepository, flags: OuraRouteFlags): List<Route> {
+    fun getRoutes(userRepository: UserRepository, config: OuraConfig): List<Route> {
         val routes = mutableListOf<Route>()
-        if (flags.dailyActivityEnabled) {
+
+        // Helper to add based on enum presence
+        fun isEnabled(type: OuraRouteType): Boolean =
+            type in config.enabledRoutes
+
+        if (isEnabled(OuraRouteType.DAILY_ACTIVITY)) {
             routes.add(OuraDailyActivityRoute(userRepository))
         }
-        if (flags.dailyReadinessEnabled) {
+        if (isEnabled(OuraRouteType.DAILY_READINESS)) {
             routes.add(OuraDailyReadinessRoute(userRepository))
         }
-        if (flags.dailySleepEnabled) {
+        if (isEnabled(OuraRouteType.DAILY_SLEEP)) {
             routes.add(OuraDailySleepRoute(userRepository))
         }
-        if (flags.dailyOxygenSaturationEnabled) {
+        if (isEnabled(OuraRouteType.DAILY_OXYGEN_SATURATION)) {
             routes.add(OuraDailyOxygenSaturationRoute(userRepository))
         }
-        if (flags.heartRateEnabled) {
+        if (isEnabled(OuraRouteType.HEART_RATE)) {
             routes.add(OuraHeartRateRoute(userRepository))
         }
-        if (flags.personalInfoEnabled) {
+        if (isEnabled(OuraRouteType.PERSONAL_INFO)) {
             routes.add(OuraPersonalInfoRoute(userRepository))
         }
-        if (flags.sessionEnabled) {
+        if (isEnabled(OuraRouteType.SESSION)) {
             routes.add(OuraSessionRoute(userRepository))
         }
-        if (flags.sleepEnabled) {
+        if (isEnabled(OuraRouteType.SLEEP)) {
             routes.add(OuraSleepRoute(userRepository))
         }
-        if (flags.tagEnabled) {
+        if (isEnabled(OuraRouteType.TAG)) {
             routes.add(OuraTagRoute(userRepository))
         }
-        if (flags.workoutEnabled) {
+        if (isEnabled(OuraRouteType.WORKOUT)) {
             routes.add(OuraWorkoutRoute(userRepository))
         }
-        if (flags.ringConfigurationEnabled) {
+        if (isEnabled(OuraRouteType.RING_CONFIGURATION)) {
             routes.add(OuraRingConfigurationRoute(userRepository))
         }
-        if (flags.restModePeriodEnabled) {
+        if (isEnabled(OuraRouteType.REST_MODE_PERIOD)) {
             routes.add(OuraRestModePeriodRoute(userRepository))
         }
-        if (flags.sleepTimeRecommendationEnabled) {
+        if (isEnabled(OuraRouteType.SLEEP_TIME_RECOMMENDATION)) {
             routes.add(OuraSleepTimeRecommendationRoute(userRepository))
         }
         return routes
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraRouteType.kt b/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraRouteType.kt
@@ -0,0 +1,17 @@
+package org.radarbase.oura.route
+
+enum class OuraRouteType {
+    DAILY_ACTIVITY,
+    DAILY_READINESS,
+    DAILY_SLEEP,
+    DAILY_OXYGEN_SATURATION,
+    HEART_RATE,
+    PERSONAL_INFO,
+    SESSION,
+    SLEEP,
+    TAG,
+    WORKOUT,
+    RING_CONFIGURATION,
+    REST_MODE_PERIOD,
+    SLEEP_TIME_RECOMMENDATION,
+}

Original file line number	Diff line number	Diff line change
`@@ -6,48 +6,53 @@ object OuraRouteFactory {`
`6`	`6`
`7`	`7`	`@JvmStatic`
`8`	`8`	`fun getRoutes(userRepository: UserRepository): List<Route> =`
`9`		`- getRoutes(userRepository, OuraRouteFlags())`
	`9`	`+ getRoutes(userRepository, OuraConfig())`
`10`	`10`
`11`	`11`	`@JvmStatic`
`12`		`- fun getRoutes(userRepository: UserRepository, flags: OuraRouteFlags): List<Route> {`
	`12`	`+ fun getRoutes(userRepository: UserRepository, config: OuraConfig): List<Route> {`
`13`	`13`	`val routes = mutableListOf<Route>()`
`14`		`- if (flags.dailyActivityEnabled) {`
	`14`	`+`
	`15`	`+ // Helper to add based on enum presence`
	`16`	`+ fun isEnabled(type: OuraRouteType): Boolean =`
	`17`	`+ type in config.enabledRoutes`
	`18`	`+`
	`19`	`+ if (isEnabled(OuraRouteType.DAILY_ACTIVITY)) {`
`15`	`20`	`routes.add(OuraDailyActivityRoute(userRepository))`
`16`	`21`	`}`
`17`		`- if (flags.dailyReadinessEnabled) {`
	`22`	`+ if (isEnabled(OuraRouteType.DAILY_READINESS)) {`
`18`	`23`	`routes.add(OuraDailyReadinessRoute(userRepository))`
`19`	`24`	`}`
`20`		`- if (flags.dailySleepEnabled) {`
	`25`	`+ if (isEnabled(OuraRouteType.DAILY_SLEEP)) {`
`21`	`26`	`routes.add(OuraDailySleepRoute(userRepository))`
`22`	`27`	`}`
`23`		`- if (flags.dailyOxygenSaturationEnabled) {`
	`28`	`+ if (isEnabled(OuraRouteType.DAILY_OXYGEN_SATURATION)) {`
`24`	`29`	`routes.add(OuraDailyOxygenSaturationRoute(userRepository))`
`25`	`30`	`}`
`26`		`- if (flags.heartRateEnabled) {`
	`31`	`+ if (isEnabled(OuraRouteType.HEART_RATE)) {`
`27`	`32`	`routes.add(OuraHeartRateRoute(userRepository))`
`28`	`33`	`}`
`29`		`- if (flags.personalInfoEnabled) {`
	`34`	`+ if (isEnabled(OuraRouteType.PERSONAL_INFO)) {`
`30`	`35`	`routes.add(OuraPersonalInfoRoute(userRepository))`
`31`	`36`	`}`
`32`		`- if (flags.sessionEnabled) {`
	`37`	`+ if (isEnabled(OuraRouteType.SESSION)) {`
`33`	`38`	`routes.add(OuraSessionRoute(userRepository))`
`34`	`39`	`}`
`35`		`- if (flags.sleepEnabled) {`
	`40`	`+ if (isEnabled(OuraRouteType.SLEEP)) {`
`36`	`41`	`routes.add(OuraSleepRoute(userRepository))`
`37`	`42`	`}`
`38`		`- if (flags.tagEnabled) {`
	`43`	`+ if (isEnabled(OuraRouteType.TAG)) {`
`39`	`44`	`routes.add(OuraTagRoute(userRepository))`
`40`	`45`	`}`
`41`		`- if (flags.workoutEnabled) {`
	`46`	`+ if (isEnabled(OuraRouteType.WORKOUT)) {`
`42`	`47`	`routes.add(OuraWorkoutRoute(userRepository))`
`43`	`48`	`}`
`44`		`- if (flags.ringConfigurationEnabled) {`
	`49`	`+ if (isEnabled(OuraRouteType.RING_CONFIGURATION)) {`
`45`	`50`	`routes.add(OuraRingConfigurationRoute(userRepository))`
`46`	`51`	`}`
`47`		`- if (flags.restModePeriodEnabled) {`
	`52`	`+ if (isEnabled(OuraRouteType.REST_MODE_PERIOD)) {`
`48`	`53`	`routes.add(OuraRestModePeriodRoute(userRepository))`
`49`	`54`	`}`
`50`		`- if (flags.sleepTimeRecommendationEnabled) {`
	`55`	`+ if (isEnabled(OuraRouteType.SLEEP_TIME_RECOMMENDATION)) {`
`51`	`56`	`routes.add(OuraSleepTimeRecommendationRoute(userRepository))`
`52`	`57`	`}`
`53`	`58`	`return routes`