Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Health] Add UUID field to HealthDataPoint #1019

Merged
merged 22 commits into from
Aug 29, 2024
Merged

[Health] Add UUID field to HealthDataPoint #1019

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c582918
Remove Google Fit and imports from Android code
SlimShadyIAm Aug 6, 2024
2590ffe
Formatting
SlimShadyIAm Aug 6, 2024
58159bf
Merge branch 'master' into feature/remove-google-fit
SlimShadyIAm Aug 6, 2024
401fa75
Remove Google Fit column from readme
SlimShadyIAm Aug 6, 2024
aa4c763
Remove support for Google Fit types not supported by Health Connect
SlimShadyIAm Aug 6, 2024
2acaaf6
Remove more Google Fit workout types
SlimShadyIAm Aug 6, 2024
58a6ae7
Remove references to Google Fit, remove `useHealthConnectIfAvailable`
SlimShadyIAm Aug 7, 2024
f8bbc42
Remove `disconect` method channel
SlimShadyIAm Aug 7, 2024
99eae33
Remove `flowRate` from `writeBloodOxygen` as it is not supported in H…
SlimShadyIAm Aug 7, 2024
99ae5dd
Remove more unsupported workout types
SlimShadyIAm Aug 7, 2024
d604507
Add missing import
SlimShadyIAm Aug 8, 2024
458d323
Remove Google Fit as dependency
SlimShadyIAm Aug 8, 2024
c732a9e
Add notice in README
SlimShadyIAm Aug 8, 2024
0e248a6
Improve logging for HC permission callback
SlimShadyIAm Aug 8, 2024
0f5fb5a
Update some documentation
SlimShadyIAm Aug 8, 2024
3979573
Android: Fix `requestAuthorization` not returning a result on success
SlimShadyIAm Aug 8, 2024
d663b25
Remove additional workout types that are not supported
SlimShadyIAm Aug 8, 2024
1bb375c
Remove another workout type
SlimShadyIAm Aug 8, 2024
94aceae
Add missing unimplemented method
SlimShadyIAm Aug 8, 2024
12a069b
Add `uuid` field to `HealthDataPoint` and include it in datapoints
SlimShadyIAm Aug 8, 2024
177ef5e
Merge branch 'master' into feature/heath-data-point-uuid
SlimShadyIAm Aug 22, 2024
bae3107
Update README.md
bardram Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 49 additions & 3 deletions packages/health/android/src/main/kotlin/cachet/plugins/health/HealthPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.health.connect.client.records.MealType.MEAL_TYPE_DINNER
import androidx.health.connect.client.records.MealType.MEAL_TYPE_LUNCH
import androidx.health.connect.client.records.MealType.MEAL_TYPE_SNACK
import androidx.health.connect.client.records.MealType.MEAL_TYPE_UNKNOWN
import androidx.health.connect.client.records.metadata.Metadata
import androidx.health.connect.client.request.AggregateGroupByDurationRequest
import androidx.health.connect.client.request.AggregateRequest
import androidx.health.connect.client.request.ReadRecordsRequest
Expand Down Expand Up @@ -743,6 +744,7 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
healthConnectData.add(
// mapOf(
mapOf<String, Any?>(
"uuid" to record.metadata.id,
"workoutActivityType" to
(workoutTypeMap
.filterValues {
Expand Down Expand Up @@ -815,8 +817,7 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
convertRecordStage(
recStage,
dataType,
rec.metadata.dataOrigin
.packageName
rec.metadata
)
)
}
Expand Down Expand Up @@ -847,10 +848,13 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
private fun convertRecordStage(
stage: SleepSessionRecord.Stage,
dataType: String,
sourceName: String
metadata: Metadata
): List<Map<String, Any>> {
var sourceName = metadata.dataOrigin
.packageName
return listOf(
mapOf<String, Any>(
"uuid" to metadata.id,
"stage" to stage.stage,
"value" to
ChronoUnit.MINUTES.between(
Expand Down Expand Up @@ -946,6 +950,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is WeightRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.weight
.inKilograms,
Expand All @@ -965,6 +971,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is HeightRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.height
.inMeters,
Expand All @@ -984,6 +992,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is BodyFatRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.percentage
.value,
Expand All @@ -1003,6 +1013,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is StepsRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to record.count,
"date_from" to
record.startTime
Expand All @@ -1020,6 +1032,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is ActiveCaloriesBurnedRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.energy
.inKilocalories,
Expand All @@ -1039,6 +1053,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is HeartRateRecord ->
return record.samples.map {
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to it.beatsPerMinute,
"date_from" to
it.time.toEpochMilli(),
Expand All @@ -1053,6 +1069,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is HeartRateVariabilityRmssdRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.heartRateVariabilityMillis,
"date_from" to
Expand All @@ -1071,6 +1089,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is BodyTemperatureRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.temperature
.inCelsius,
Expand All @@ -1090,6 +1110,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is BodyWaterMassRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.mass
.inKilograms,
Expand All @@ -1109,6 +1131,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is BloodPressureRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
if (dataType ==
BLOOD_PRESSURE_DIASTOLIC
Expand All @@ -1134,6 +1158,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is OxygenSaturationRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.percentage
.value,
Expand All @@ -1153,6 +1179,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is BloodGlucoseRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.level
.inMilligramsPerDeciliter,
Expand All @@ -1172,6 +1200,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is DistanceRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.distance
.inMeters,
Expand All @@ -1191,6 +1221,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is HydrationRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.volume
.inLiters,
Expand All @@ -1210,6 +1242,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is TotalCaloriesBurnedRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.energy
.inKilocalories,
Expand All @@ -1229,6 +1263,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is BasalMetabolicRateRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.basalMetabolicRate
.inKilocaloriesPerDay,
Expand All @@ -1248,6 +1284,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is SleepSessionRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"date_from" to
record.startTime
.toEpochMilli(),
Expand All @@ -1270,6 +1308,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is RestingHeartRateRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to
record.beatsPerMinute,
"date_from" to
Expand All @@ -1288,6 +1328,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is FloorsClimbedRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to record.floors,
"date_from" to
record.startTime
Expand All @@ -1305,6 +1347,8 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is RespiratoryRateRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to
metadata.id,
"value" to record.rate,
"date_from" to
record.time
Expand All @@ -1322,6 +1366,7 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is NutritionRecord ->
return listOf(
mapOf<String, Any?>(
"uuid" to metadata.id,
"calories" to record.energy?.inKilocalories,
"protein" to record.protein?.inGrams,
"carbs" to record.totalCarbohydrate?.inGrams,
Expand Down Expand Up @@ -1385,6 +1430,7 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
is MenstruationFlowRecord ->
return listOf(
mapOf<String, Any>(
"uuid" to metadata.id,
"value" to record.flow,
"date_from" to record.time.toEpochMilli(),
"date_to" to record.time.toEpochMilli(),
Expand Down
2 changes: 2 additions & 0 deletions packages/health/lib/health.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion packages/health/lib/src/health_data_point.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ enum HealthPlatformType { appleHealth, googleHealthConnect }
/// as value.
@JsonSerializable(fieldRename: FieldRename.snake, includeIfNull: false)
class HealthDataPoint {
/// UUID of the data point.
String uuid;

/// The quantity value of the data point
HealthValue value;

Expand Down Expand Up @@ -51,6 +54,7 @@ class HealthDataPoint {
Map<String, dynamic>? metadata;

HealthDataPoint({
required this.uuid,
required this.value,
required this.type,
required this.unit,
Expand Down Expand Up @@ -129,6 +133,7 @@ class HealthDataPoint {
? null
: Map<String, dynamic>.from(dataPoint['metadata'] as Map);
final unit = dataTypeToUnit[dataType] ?? HealthDataUnit.UNKNOWN_UNIT;
final String? uuid = dataPoint["uuid"] as String?;

// Set WorkoutSummary, if available.
WorkoutSummary? workoutSummary;
Expand All @@ -140,6 +145,7 @@ class HealthDataPoint {
}

return HealthDataPoint(
uuid: uuid ?? "",
value: value,
type: dataType,
unit: unit,
Expand All @@ -157,6 +163,7 @@ class HealthDataPoint {

@override
String toString() => """$runtimeType -
uuid: $uuid,
value: ${value.toString()},
unit: ${unit.name},
dateFrom: $dateFrom,
Expand All @@ -173,6 +180,7 @@ class HealthDataPoint {
@override
bool operator ==(Object other) =>
other is HealthDataPoint &&
uuid == other.uuid &&
value == other.value &&
unit == other.unit &&
dateFrom == other.dateFrom &&
Expand All @@ -186,6 +194,6 @@ class HealthDataPoint {
metadata == other.metadata;

@override
int get hashCode => Object.hash(value, unit, dateFrom, dateTo, type,
int get hashCode => Object.hash(uuid, value, unit, dateFrom, dateTo, type,
sourcePlatform, sourceDeviceId, sourceId, sourceName, metadata);
}
1 change: 1 addition & 0 deletions packages/health/lib/src/health_plugin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ class Health {
(weights[i].value as NumericHealthValue).numericValue.toDouble() /
(h * h);
final x = HealthDataPoint(
uuid: '',
value: NumericHealthValue(numericValue: bmiValue),
type: dataType,
unit: unit,
Expand Down
Loading