Consolidate body weight repositories and other providers, cleanup

Author: rolandgeider

integration_test/1_dashboard.dart

@@ -5,8 +5,6 @@ import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/models/workouts/session.dart';
 import 'package:wger/providers/body_weight_repository.dart';
-import 'package:wger/providers/body_weight_riverpod.dart';
-import 'package:wger/providers/body_weight_state.dart';
 import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/routines.dart';
@@ -17,6 +15,7 @@ import 'package:wger/theme/theme.dart';
 import '../test/exercises/contribute_exercise_test.mocks.dart';
 import '../test/measurements/measurement_categories_screen_test.mocks.dart';
 import '../test/routine/weight_unit_form_widget_test.mocks.dart';
+import '../test/weight/weight_provider_test.mocks.dart';
 import '../test/weight/weight_screen_test.mocks.dart' as weight;
 import '../test_data/body_weight.dart';
 import '../test_data/exercises.dart';
@@ -51,10 +50,10 @@ Widget createDashboardScreen({String locale = 'en'}) {
   ).thenAnswer((realInvocation) => getNutritionalPlanScreenshot());
   when(mockNutritionProvider.items).thenReturn([getNutritionalPlanScreenshot()]);
 
-  // Prepare a BodyWeightState (Riverpod) with screenshot entries
-  final repo = BodyWeightRepository();
-  final bwState = BodyWeightState(repo);
-  bwState.state = getScreenshotWeightEntries();
+  final mockBodyWeightRepository = MockBodyWeightRepository();
+  when(
+    mockBodyWeightRepository.watchAllDrift(),
+  ).thenAnswer((_) => Stream.value(getWeightEntries()));
 
   final mockMeasurementProvider = MockMeasurementProvider();
   when(mockMeasurementProvider.categories).thenReturn(getMeasurementCategories());
@@ -64,8 +63,7 @@ Widget createDashboardScreen({String locale = 'en'}) {
 
   return riverpod.ProviderScope(
     overrides: [
-      // Override the family provider to return our prepared BodyWeightState
-      bodyWeightStateProvider.overrideWith((ref, auth) => bwState),
+      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
     ],
     child: MultiProvider(
       providers: [

integration_test/5_nutritional_plan.dart

@@ -1,17 +1,18 @@
 import 'package:drift/native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/database/ingredients/ingredients_database.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/body_weight_repository.dart';
-import 'package:wger/providers/body_weight_riverpod.dart';
-import 'package:wger/providers/body_weight_state.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/theme/theme.dart';
 
 import '../test/user/provider_test.mocks.dart';
+import '../test/weight/weight_provider_test.mocks.dart';
+import '../test_data/body_weight.dart';
 import '../test_data/nutritional_plans.dart';
 
 Widget createNutritionalPlanScreen({locale = 'en'}) {
@@ -26,14 +27,14 @@ Widget createNutritionalPlanScreen({locale = 'en'}) {
     database: IngredientDatabase.inMemory(NativeDatabase.memory()),
   );
 
-  // Riverpod: prepare BodyWeightState with no entries for this test (or mock via mockBaseProvider)
-  final repo = BodyWeightRepository();
-  final bwState = BodyWeightState(repo);
+  final mockBodyWeightRepository = MockBodyWeightRepository();
+  when(
+    mockBodyWeightRepository.watchAllDrift(),
+  ).thenAnswer((_) => Stream.value(getWeightEntries()));
 
   return riverpod.ProviderScope(
     overrides: [
-      // Override the family provider to return our prepared BodyWeightState
-      bodyWeightStateProvider.overrideWith((ref, auth) => bwState),
+      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
     ],
     child: MultiProvider(
       providers: [

integration_test/6_weight.dart

@@ -4,8 +4,6 @@ import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/body_weight_repository.dart';
-import 'package:wger/providers/body_weight_riverpod.dart';
-import 'package:wger/providers/body_weight_state.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/user.dart';
 import 'package:wger/screens/form_screen.dart';
@@ -18,10 +16,10 @@ import '../test_data/nutritional_plans.dart';
 import '../test_data/profile.dart';
 
 Widget createWeightScreen({locale = 'en'}) {
-  // Build a Riverpod override so tests use the new BodyWeightState
-  final repo = BodyWeightRepository();
-  final bwState = BodyWeightState(repo);
-  bwState.state = getScreenshotWeightEntries();
+  final mockBodyWeightRepository = MockBodyWeightRepository();
+  when(
+    mockBodyWeightRepository.watchAllDrift(),
+  ).thenAnswer((_) => Stream.value(getWeightEntries()));
 
   final mockUserProvider = MockUserProvider();
   when(mockUserProvider.profile).thenReturn(tProfile1);
@@ -32,8 +30,7 @@ Widget createWeightScreen({locale = 'en'}) {
 
   return riverpod.ProviderScope(
     overrides: [
-      // Override the family provider to return our prepared BodyWeightState
-      bodyWeightStateProvider.overrideWith((ref, auth) => bwState),
+      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
     ],
     child: MultiProvider(
       providers: [

lib/providers/body_weight_powersync.dart

@@ -1,48 +1,41 @@
 // Helper to read body weight entries from PowerSync local database and convert to WeightEntry
 
-import 'package:drift/drift.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:wger/models/body_weight/weight_entry.dart';
 
-import '../database/powersync/database.dart';
-import 'body_weight_riverpod.dart';
+import 'body_weight_repository.dart';
 
 part 'body_weight_powersync.g.dart';
 
-final _log = Logger('body_weight_powersync');
-
 @riverpod
 final class WeightEntryNotifier extends _$WeightEntryNotifier {
+  final _log = Logger('WeightEntryNotifier');
+  late final BodyWeightRepository _repo;
+
   @override
-  Stream<List<WeightEntry>> build() {
-    final database = ref.watch(driftPowerSyncDatabase);
-    final repo = ref.watch(bodyWeightRepositoryProvider);
-    return repo.watchAllDrift(database);
+  // BodyWeightState build() {
+  Stream<List<WeightEntry>> build([BodyWeightRepository? repository]) {
+    _repo = repository ?? ref.read(bodyWeightRepositoryProvider);
+
+    // final state = BodyWeightState();
+    // repo.watchAllDrift(database).listen((entries) {
+    //   state.setItems(entries);
+    // });
+    // return state;
+
+    return _repo.watchAllDrift();
   }
 
   Future<void> deleteEntry(String id) async {
-    final db = ref.read(driftPowerSyncDatabase);
-    final repo = ref.read(bodyWeightRepositoryProvider);
-    await repo.deleteLocalDrift(db, id);
+    await _repo.deleteLocalDrift(id);
   }
 
   Future<void> updateEntry(WeightEntry entry) async {
-    final db = ref.read(driftPowerSyncDatabase);
-    final repo = ref.read(bodyWeightRepositoryProvider);
-    await repo.updateLocalDrift(db, entry);
+    await _repo.updateLocalDrift(entry);
   }
 
   Future<void> addEntry(WeightEntry entry) async {
-    final db = ref.read(driftPowerSyncDatabase);
-    _log.info('Adding new weight entry on local drift: ${entry.date} - ${entry.weight}');
-    await db
-        .into(db.weightEntryTable)
-        .insertReturning(
-          WeightEntryTableCompanion.insert(
-            date: Value(entry.date),
-            weight: entry.weight as double,
-          ),
-        );
+    await _repo.addLocalDrift(entry);
   }
 }

lib/providers/body_weight_powersync.g.dart

@@ -3,36 +3,55 @@
  */
 
 import 'package:drift/drift.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:wger/models/body_weight/weight_entry.dart';
 
 import '../database/powersync/database.dart';
 
+final bodyWeightRepositoryProvider = Provider<BodyWeightRepository>((ref) {
+  final db = ref.read(driftPowerSyncDatabase);
+  return BodyWeightRepository(db);
+});
+
 class BodyWeightRepository {
   final _logger = Logger('BodyWeightRepository');
+  final DriftPowersyncDatabase _db;
 
-  BodyWeightRepository();
+  BodyWeightRepository(this._db);
 
-  Stream<List<WeightEntry>> watchAllDrift(DriftPowersyncDatabase db) {
+  Stream<List<WeightEntry>> watchAllDrift() {
     _logger.finer('Watching all local weight entries');
-    final query = db.select(db.weightEntryTable)
+    final query = _db.select(_db.weightEntryTable)
       ..orderBy([(t) => OrderingTerm(expression: t.date, mode: OrderingMode.desc)]);
     return query.watch();
   }
 
-  Future<void> deleteLocalDrift(DriftPowersyncDatabase db, String id) async {
+  Future<void> deleteLocalDrift(String id) async {
     _logger.finer('Deleting local weight entry $id');
-    await (db.delete(db.weightEntryTable)..where((t) => t.id.equals(id))).go();
+    await (_db.delete(_db.weightEntryTable)..where((t) => t.id.equals(id))).go();
   }
 
-  Future<void> updateLocalDrift(DriftPowersyncDatabase db, WeightEntry entry) async {
+  Future<void> updateLocalDrift(WeightEntry entry) async {
     _logger.finer('Updating local weight entry ${entry.id}');
-    final stmt = db.update(db.weightEntryTable)..where((t) => t.id.equals(entry.id!));
+    final stmt = _db.update(_db.weightEntryTable)..where((t) => t.id.equals(entry.id!));
     await stmt.write(
       WeightEntryTableCompanion(
         date: Value(entry.date),
         weight: Value(entry.weight as double),
       ),
     );
   }
+
+  Future<void> addLocalDrift(WeightEntry entry) async {
+    _logger.finer('Adding local weight entry ${entry.date}');
+    await _db
+        .into(_db.weightEntryTable)
+        .insert(
+          WeightEntryTableCompanion.insert(
+            date: Value(entry.date),
+            weight: entry.weight as double,
+          ),
+        );
+  }
 }

lib/providers/body_weight_repository.dart

@@ -1,13 +1,14 @@
 import 'package:logging/logging.dart';
 import 'package:state_notifier/state_notifier.dart';
 import 'package:wger/models/body_weight/weight_entry.dart';
-import 'package:wger/providers/body_weight_repository.dart';
 
+/*
+ * TODO: decide if we want to use the state or just handle a list of entries
+ */
 class BodyWeightState extends StateNotifier<List<WeightEntry>> {
   final _logger = Logger('BodyWeightState');
-  final BodyWeightRepository repository;
 
-  BodyWeightState(this.repository) : super([]);
+  BodyWeightState([super.initial = const []]);
 
   List<WeightEntry> get items => [...state];
 
@@ -30,4 +31,8 @@ class BodyWeightState extends StateNotifier<List<WeightEntry>> {
   }
 
   void clear() => state = [];
+
+  void setItems(List<WeightEntry> entries) {
+    state = List<WeightEntry>.from(entries);
+  }
 }