VIT-6659: Consolidate LocalActivity models

tryVital · Jun 14, 2024 · ad1bebb · ad1bebb
1 parent 4ee53b4
commit ad1bebb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/...hConnect/src/main/java/io/tryvital/vitalhealthconnect/model/processedresource/Activity.kt b/...hConnect/src/main/java/io/tryvital/vitalhealthconnect/model/processedresource/Activity.kt
diff --git a/...main/java/io/tryvital/vitalhealthconnect/model/processedresource/ProcessedResourceData.kt b/...main/java/io/tryvital/vitalhealthconnect/model/processedresource/ProcessedResourceData.kt
@@ -2,6 +2,7 @@ package io.tryvital.vitalhealthconnect.model.processedresource
 
 import io.tryvital.client.services.data.LocalBody
 import io.tryvital.client.services.data.IngestibleTimeseriesResource
+import io.tryvital.client.services.data.LocalActivity
 import io.tryvital.client.services.data.LocalBloodPressureSample
 import io.tryvital.client.services.data.LocalProfile
 import io.tryvital.client.services.data.LocalQuantitySample
@@ -103,7 +104,7 @@ sealed class SummaryData {
     }
 
     data class Activities(
-        val activities: List<Activity>
+        val activities: List<LocalActivity>
     ) : SummaryData() {
         override fun merge(other: SummaryData): SummaryData {
             check(other is Activities)

diff --git a/VitalHealthConnect/src/main/java/io/tryvital/vitalhealthconnect/records/RecordProcessor.kt b/VitalHealthConnect/src/main/java/io/tryvital/vitalhealthconnect/records/RecordProcessor.kt
@@ -22,14 +22,14 @@ import androidx.health.connect.client.records.StepsRecord
 import androidx.health.connect.client.records.Vo2MaxRecord
 import androidx.health.connect.client.records.WeightRecord
 import io.tryvital.client.services.data.IngestibleTimeseriesResource
+import io.tryvital.client.services.data.LocalActivity
 import io.tryvital.client.services.data.LocalBloodPressureSample
 import io.tryvital.client.services.data.LocalQuantitySample
 import io.tryvital.client.services.data.LocalSleep
 import io.tryvital.client.services.data.LocalWorkout
 import io.tryvital.client.services.data.SampleType
 import io.tryvital.client.utils.VitalLogger
 import io.tryvital.vitalhealthconnect.SupportedSleepApps
-import io.tryvital.vitalhealthconnect.model.processedresource.Activity
 import io.tryvital.vitalhealthconnect.model.processedresource.SummaryData
 import io.tryvital.vitalhealthconnect.model.processedresource.TimeSeriesData
 import io.tryvital.vitalhealthconnect.model.quantitySample
@@ -485,7 +485,7 @@ internal class HealthConnectRecordProcessor(
             // TODO: On-device computed hourly totals
 
             val activities = daySummariesByDate.map { (date, summary) ->
-                Activity(
+                LocalActivity(
                     daySummary = summary,
                     activeEnergyBurned = merge(activeEnergyBurnedByDate, emptyMap(), date, options),
                     basalEnergyBurned = merge(basalMetabolicRateByDate, emptyMap(), date, options),

diff --git a/VitalHealthConnect/src/main/java/io/tryvital/vitalhealthconnect/workers/uploadResources.kt b/VitalHealthConnect/src/main/java/io/tryvital/vitalhealthconnect/workers/uploadResources.kt
@@ -21,7 +21,7 @@ internal suspend fun uploadResources(
         is ProcessedResourceData.Summary -> when (data.summaryData) {
             is SummaryData.Activities -> uploader.uploadActivities(
                 userId, start, end, timeZoneId,
-                data.summaryData.activities.map { it.toActivityPayload() },
+                data.summaryData.activities,
                 stage,
             )
             is SummaryData.Body -> uploader.uploadBody(