Merge pull request #1251 from pankaj-basnet/feat/healthsync

feat(measurements): measurement charts and metric type selection #1247

Author: rolandgeider

lib/database/converters/measurement_metric_type_converter.dart

@@ -0,0 +1,31 @@
+/*
+ * This file is part of wger Workout Manager <https://github.com/wger-project>.
+ * Copyright (c) 2020 - 2026 wger Team
+ *
+ * wger Workout Manager is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:drift/drift.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
+
+/// Maps a [MetricType] to and from the SQLite string format.
+class MeasurementMetricTypeConverter extends TypeConverter<MetricType, String> {
+  const MeasurementMetricTypeConverter();
+
+  @override
+  MetricType fromSql(String fromDb) => MetricType.fromWire(fromDb);
+
+  @override
+  String toSql(MetricType value) => value.wireValue;
+}

lib/database/powersync/database.dart

@@ -25,6 +25,7 @@ import 'package:wger/core/language.dart';
 import 'package:wger/core/license.dart';
 import 'package:wger/database/converters/date_only_text_converter.dart';
 import 'package:wger/database/converters/exercise_image_style_converter.dart';
+import 'package:wger/database/converters/measurement_metric_type_converter.dart';
 import 'package:wger/database/converters/time_of_day_converter.dart';
 import 'package:wger/database/converters/utc_datetime_converter.dart';
 import 'package:wger/database/converters/workout_impression_converter.dart';

lib/database/powersync/database.g.dart

@@ -18,6 +18,7 @@
 
 import 'package:drift/drift.dart';
 import 'package:powersync/powersync.dart' as ps;
+import 'package:wger/database/converters/measurement_metric_type_converter.dart';
 import 'package:wger/database/converters/utc_datetime_converter.dart';
 import 'package:wger/features/measurements/models/measurement_category.dart';
 import 'package:wger/features/measurements/models/measurement_entry.dart';
@@ -31,18 +32,13 @@ class MeasurementCategoryTable extends Table {
 
   TextColumn get name => text()();
   TextColumn get unit => text()();
-
-  /// `null` for plain user-created ("custom") categories.
-  TextColumn get metricType => text().named('metric_type').nullable()();
+  TextColumn get metricType =>
+      text().named('metric_type').map(const MeasurementMetricTypeConverter())();
 }
 
 const PowersyncMeasurementCategoryTable = ps.Table(
   'measurements_category',
-  [
-    ps.Column.text('name'),
-    ps.Column.text('unit'),
-    ps.Column.text('metric_type'),
-  ],
+  [ps.Column.text('name'), ps.Column.text('unit'), ps.Column.text('metric_type')],
 );
 
 @UseRowClass(MeasurementEntry)

lib/database/powersync/tables/measurements.dart

@@ -17,13 +17,13 @@
  */
 
 import 'package:health/health.dart';
+import 'package:wger/features/measurements/models/measurement_category.dart';
 
 /// A body metric that can be imported from Apple Health / Health Connect into a
 /// measurement category.
 ///
-/// [metricType] mirrors the server's planned `metric_type` enum and is stored
-/// on the created category; it drives the mapping back to a category on the
-/// next import.
+/// [metricType] is stored on the created category; it drives the mapping back
+/// to a category on the next import.
 class HealthMetric {
   const HealthMetric({
     required this.metricType,
@@ -35,15 +35,15 @@ class HealthMetric {
     this.disabledReason,
   });
 
-  /// Value of the server `metric_type` enum, e.g. `body_fat`.
-  final String metricType;
+  /// Metric type stored on the category, e.g. [MetricType.bodyFat].
+  final MetricType metricType;
 
   /// Health platform type this metric reads.
   final HealthDataType dataType;
 
   /// Stable, non-localized category name. Used to find-or-create the category,
-  /// and as the fallback match after a sync round-trip nulls [metricType]
-  /// (the server does not persist it yet).
+  /// and as the fallback match for a category the user already created by hand
+  /// (which carries [MetricType.custom], not this metric's type).
   final String canonicalName;
 
   /// Unit the value is stored in on the category.
@@ -79,23 +79,23 @@ double _identity(double raw) => raw;
 /// its [HealthMetric.disabledReason].
 const List<HealthMetric> healthMetrics = [
   HealthMetric(
-    metricType: 'body_fat',
+    metricType: MetricType.bodyFat,
     dataType: HealthDataType.BODY_FAT_PERCENTAGE,
     canonicalName: 'Body fat',
     unit: '%',
     toCategoryValue: _bodyFatToPercent,
     enabled: true,
   ),
   HealthMetric(
-    metricType: 'height',
+    metricType: MetricType.height,
     dataType: HealthDataType.HEIGHT,
     canonicalName: 'Height',
     unit: 'cm',
     toCategoryValue: _heightToCm,
     enabled: true,
   ),
   HealthMetric(
-    metricType: 'body_weight',
+    metricType: MetricType.bodyWeight,
     dataType: HealthDataType.WEIGHT,
     canonicalName: 'Weight',
     unit: 'kg',
@@ -105,23 +105,23 @@ const List<HealthMetric> healthMetrics = [
         'weight/measurements merge (metric_type=body_weight).',
   ),
   HealthMetric(
-    metricType: 'blood_pressure',
+    metricType: MetricType.bloodPressure,
     dataType: HealthDataType.BLOOD_PRESSURE_SYSTOLIC,
     canonicalName: 'Blood pressure',
     unit: 'mmHg',
     toCategoryValue: _identity,
     disabledReason: 'Needs measurement grouping to pair systolic/diastolic.',
   ),
   HealthMetric(
-    metricType: 'heart_rate',
+    metricType: MetricType.heartRate,
     dataType: HealthDataType.HEART_RATE,
     canonicalName: 'Heart rate',
     unit: 'bpm',
     toCategoryValue: _identity,
     disabledReason: 'High-frequency; needs a per-day aggregation strategy.',
   ),
   HealthMetric(
-    metricType: 'steps',
+    metricType: MetricType.steps,
     dataType: HealthDataType.STEPS,
     canonicalName: 'Steps',
     unit: 'count',

lib/features/health/models/health_metric.dart

@@ -35,8 +35,9 @@ class HealthRepository {
   final Health _health;
   final _logger = Logger('HealthRepository');
 
-  /// Identifies which platform a reading came from.
-  String get sourceName => Platform.isIOS ? 'apple_health' : 'health_connect';
+  /// The measurement `source` value for readings from this platform: `apple`
+  /// for Apple Health, `google` for Health Connect.
+  String get sourceName => Platform.isIOS ? 'apple' : 'google';
 
   /// Whether a health platform is usable on this device.
   Future<bool> isAvailable() async {

lib/features/health/providers/health_repository.dart

@@ -1,6 +1,6 @@
 /*
  * This file is part of wger Workout Manager <https://github.com/wger-project>.
- * Copyright (c) 2026 wger Team
+ * Copyright (c) 2026 - 2026 wger Team
  *
  * wger Workout Manager is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -188,8 +188,8 @@ class HealthSyncNotifier extends _$HealthSyncNotifier {
   }
 
   /// Finds the category for [metric] (by `metric_type`, falling back to the
-  /// canonical name once the server has nulled `metric_type` on a round-trip)
-  /// or creates it. The created category is appended to [categories] so a later
+  /// canonical name to reuse a matching category the user created by hand) or
+  /// creates it. The created category is appended to [categories] so a later
   /// metric in the same run reuses it.
   Future<MeasurementCategory> _findOrCreateCategory(
     HealthMetric metric,