Load the logs from the DB directly

This makes sure the past logs list is updated immediately

Author: rolandgeider

lib/providers/workout_logs_notifier.dart

@@ -17,13 +17,28 @@
  */
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:wger/models/workouts/log.dart';
 import 'package:wger/providers/workout_logs_repository.dart';
 
+part 'workout_logs_notifier.g.dart';
+
 final workoutLogProvider = Provider<WorkoutLogMutations>((ref) {
   return WorkoutLogMutations(ref.read(workoutLogRepositoryProvider));
 });
 
+/// Streams the past logs for [exerciseId] within [routineId], newest first.
+@riverpod
+Stream<List<Log>> pastExerciseLogs(
+  Ref ref, {
+  required int routineId,
+  required int exerciseId,
+}) {
+  return ref
+      .read(workoutLogRepositoryProvider)
+      .watchLogsByExerciseDrift(routineId: routineId, exerciseId: exerciseId);
+}
+
 class WorkoutLogMutations {
   final WorkoutLogRepository _repo;
 

lib/providers/workout_logs_notifier.g.dart

@@ -20,7 +20,7 @@
  * Repository for body weight network operations.
  */
 
-import 'package:drift/drift.dart' show BooleanExpressionOperators;
+import 'package:drift/drift.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:wger/models/workouts/log.dart';
@@ -33,15 +33,58 @@ final workoutLogRepositoryProvider = Provider<WorkoutLogRepository>((ref) {
   return WorkoutLogRepository(db);
 });
 
-/// Write-side access to the local `workout_log` table. Reading logs happens
-/// through `WorkoutSessionRepository.watchAllDrift`, which joins logs onto
-/// their parent session.
+/// Local access to the `workout_log` table: writes (add/update/delete) plus a
+/// per-exercise read stream. Reading logs grouped under their parent session
+/// happens through `WorkoutSessionRepository.watchAllDrift`.
 class WorkoutLogRepository {
   final _logger = Logger('WorkoutLogRepository');
   final DriftPowersyncDatabase _db;
 
   WorkoutLogRepository(this._db);
 
+  /// Streams the logs for a single exercise within a routine, newest first,
+  /// with their repetition and weight units attached.
+  Stream<List<Log>> watchLogsByExerciseDrift({
+    required int routineId,
+    required int exerciseId,
+  }) {
+    _logger.finer('Watching local logs for routine $routineId, exercise $exerciseId');
+
+    final query =
+        _db.select(_db.workoutLogTable).join([
+            leftOuterJoin(
+              _db.routineRepetitionUnitTable,
+              _db.routineRepetitionUnitTable.id.equalsExp(_db.workoutLogTable.repetitionsUnitId),
+            ),
+            leftOuterJoin(
+              _db.routineWeightUnitTable,
+              _db.routineWeightUnitTable.id.equalsExp(_db.workoutLogTable.weightUnitId),
+            ),
+          ])
+          ..where(
+            _db.workoutLogTable.routineId.equals(routineId) &
+                _db.workoutLogTable.exerciseId.equals(exerciseId),
+          )
+          ..orderBy([
+            OrderingTerm(expression: _db.workoutLogTable.date, mode: OrderingMode.desc),
+          ]);
+
+    return query.watch().map((rows) {
+      return rows.map((row) {
+        final log = row.readTable(_db.workoutLogTable);
+        final repetitionUnit = row.readTableOrNull(_db.routineRepetitionUnitTable);
+        if (repetitionUnit != null) {
+          log.repetitionUnit = repetitionUnit;
+        }
+        final weightUnit = row.readTableOrNull(_db.routineWeightUnitTable);
+        if (weightUnit != null) {
+          log.weightUnit = weightUnit;
+        }
+        return log;
+      }).toList();
+    });
+  }
+
   Future<void> deleteLocalDrift(String id) async {
     _logger.finer('Deleting local workout log entry $id');
     await (_db.delete(_db.workoutLogTable)..where((t) => t.id.equals(id))).go();

lib/providers/workout_logs_repository.dart

@@ -33,6 +33,7 @@ import 'package:wger/providers/plate_weights.dart';
 import 'package:wger/providers/workout_logs_notifier.dart';
 import 'package:wger/screens/settings_plates_screen.dart';
 import 'package:wger/widgets/core/core.dart';
+import 'package:wger/widgets/core/error.dart';
 import 'package:wger/widgets/routines/forms/repetitions.dart';
 import 'package:wger/widgets/routines/forms/rir.dart';
 import 'package:wger/widgets/routines/forms/weight.dart';
@@ -71,6 +72,15 @@ class LogPage extends ConsumerWidget {
     }
     final setConfigData = slotEntryPage.setConfigData!;
 
+    // Past logs come straight from the local DB (not the gym-mode routine
+    // snapshot) so a set logged during this workout shows up right away.
+    final pastLogs = ref.watch(
+      pastExerciseLogsProvider(
+        routineId: gymState.routine.id!,
+        exerciseId: setConfigData.exerciseId,
+      ),
+    );
+
     // Mark done sets
     final decorationStyle = slotEntryPage.logDone
         ? TextDecoration.lineThrough
@@ -125,13 +135,7 @@ class LogPage extends ConsumerWidget {
         if (slotEntryPage.setConfigData!.comment.isNotEmpty)
           Text(slotEntryPage.setConfigData!.comment, textAlign: TextAlign.center),
         const SizedBox(height: 10),
-        Expanded(
-          child: (gymState.routine.filterLogsByExercise(setConfigData.exerciseId).isNotEmpty)
-              ? LogsPastLogsWidget(
-                  pastLogs: gymState.routine.filterLogsByExercise(setConfigData.exerciseId),
-                )
-              : Container(),
-        ),
+        Expanded(child: _buildPastLogs(pastLogs)),
 
         Padding(
           padding: const EdgeInsets.all(10),
@@ -152,6 +156,19 @@ class LogPage extends ConsumerWidget {
       ],
     );
   }
+
+  /// Renders the previous logs for this exercise
+  Widget _buildPastLogs(AsyncValue<List<Log>> pastLogs) {
+    if (pastLogs.hasError) {
+      _logger.warning('Could not load past logs', pastLogs.error, pastLogs.stackTrace);
+      // Scroll-wrap so the indicator fits this slim slot instead of overflowing.
+      return SingleChildScrollView(
+        child: StreamErrorIndicator(pastLogs.error!, stacktrace: pastLogs.stackTrace),
+      );
+    }
+    final logs = pastLogs.value ?? const <Log>[];
+    return logs.isEmpty ? const SizedBox.shrink() : LogsPastLogsWidget(pastLogs: logs);
+  }
 }
 
 class LogsPlatesWidget extends ConsumerWidget {

lib/widgets/routines/gym_mode/log_page.dart

@@ -37,6 +37,7 @@ import 'package:wger/providers/network_provider.dart';
 import 'package:wger/providers/routines_notifier.dart';
 import 'package:wger/providers/routines_repository.dart';
 import 'package:wger/providers/trophy_repository.dart';
+import 'package:wger/providers/workout_logs_repository.dart';
 import 'package:wger/providers/workout_session_repository.dart';
 import 'package:wger/screens/gym_mode.dart';
 import 'package:wger/screens/routine_screen.dart';
@@ -54,7 +55,13 @@ import '../../../test_data/routines.dart';
 import '../../fake_connectivity.dart';
 import 'gym_mode_test.mocks.dart';
 
-@GenerateMocks([WorkoutSessionRepository, ExerciseRepository, RoutinesRepository, TrophyRepository])
+@GenerateMocks([
+  WorkoutSessionRepository,
+  ExerciseRepository,
+  RoutinesRepository,
+  TrophyRepository,
+  WorkoutLogRepository,
+])
 void main() {
   installFakeConnectivity();
 
@@ -66,6 +73,7 @@ void main() {
   final mockSessionRepo = MockWorkoutSessionRepository();
   final mockExerciseRepo = MockExerciseRepository();
   final mockRoutinesRepo = MockRoutinesRepository();
+  final mockLogRepo = MockWorkoutLogRepository();
 
   setUp(() {
     SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
@@ -89,6 +97,18 @@ void main() {
     when(
       mockRoutinesRepo.fetchAndSetRoutineFullServer(any),
     ).thenAnswer((_) async => testRoutine);
+
+    // Past logs on the log page come from this stream (per exercise). Reuse the
+    // test routine's logs so the assertions on previous entries keep working.
+    when(
+      mockLogRepo.watchLogsByExerciseDrift(
+        routineId: anyNamed('routineId'),
+        exerciseId: anyNamed('exerciseId'),
+      ),
+    ).thenAnswer((invocation) {
+      final exerciseId = invocation.namedArguments[#exerciseId] as int;
+      return Stream.value(testRoutine.filterLogsByExercise(exerciseId));
+    });
   });
 
   Widget renderGymMode({
@@ -102,6 +122,7 @@ void main() {
         routinesRepositoryProvider.overrideWithValue(mockRoutinesRepo),
         exerciseRepositoryProvider.overrideWithValue(mockExerciseRepo),
         workoutSessionRepositoryProvider.overrideWithValue(mockSessionRepo),
+        workoutLogRepositoryProvider.overrideWithValue(mockLogRepo),
         ...extraOverrides,
         // The repetition + weight unit catalogues are tiny direct-Drift
         // stream providers, overriding them inline is the established