Add a small lookup table for exercises

This also consolidates some search functions to use getByIdOrNull

Author: rolandgeider

lib/providers/exercises_notifier.dart

@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'package:collection/collection.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:wger/helpers/consts.dart';
@@ -35,13 +34,18 @@ part 'exercises_notifier.g.dart';
 class ExerciseState {
   final List<Exercise> exercises;
 
-  const ExerciseState(this.exercises);
+  /// Id index so lookups don't scan the full catalogue.
+  final Map<int, Exercise> _byId;
+
+  ExerciseState(List<Exercise> exercises)
+      : exercises = exercises,
+        _byId = {for (final e in exercises) e.id: e};
 
   /// Returns the exercise with the given [id], throws if no match
-  Exercise getById(int id) => exercises.firstWhere((e) => e.id == id);
+  Exercise getById(int id) => _byId[id] ?? (throw StateError('No exercise with id $id'));
 
   /// Returns the exercise with the given [id], or null if no match
-  Exercise? getByIdOrNull(int id) => exercises.firstWhereOrNull((e) => e.id == id);
+  Exercise? getByIdOrNull(int id) => _byId[id];
 
   /// Buckets exercises by their `variationGroup` (skipping those without one)
   Map<String, List<Exercise>> getByVariation() {

lib/providers/routines_notifier.dart

@@ -148,9 +148,7 @@ class RoutinesRiverpod extends _$RoutinesRiverpod {
         for (final log in session.logs) {
           // Fall back gracefully if the referenced exercise hasn't been
           // synced yet (rare but possible on a cold start).
-          final exercise = exerciseState.exercises.firstWhereOrNull(
-            (e) => e.id == log.exerciseId,
-          );
+          final exercise = exerciseState.getByIdOrNull(log.exerciseId);
           if (exercise != null) {
             log.exerciseObj = exercise;
           }
@@ -162,9 +160,7 @@ class RoutinesRiverpod extends _$RoutinesRiverpod {
       for (final slot in day.slots) {
         for (final entry in slot.entries) {
           if (exerciseState != null) {
-            final exercise = exerciseState.exercises.firstWhereOrNull(
-              (e) => e.id == entry.exerciseId,
-            );
+            final exercise = exerciseState.getByIdOrNull(entry.exerciseId);
             if (exercise != null) {
               entry.exerciseObj = exercise;
             }
@@ -185,9 +181,7 @@ class RoutinesRiverpod extends _$RoutinesRiverpod {
         for (final slot in entry.slots) {
           for (final setConfig in slot.setConfigs) {
             if (exerciseState != null) {
-              final exercise = exerciseState.exercises.firstWhereOrNull(
-                (e) => e.id == setConfig.exerciseId,
-              );
+              final exercise = exerciseState.getByIdOrNull(setConfig.exerciseId);
               if (exercise != null) {
                 setConfig.exercise = exercise;
               }

lib/widgets/add_exercise/steps/step_2_variations.dart

@@ -13,7 +13,7 @@ class Step2Variations extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     // Reactive: rebuilds when the exercise catalogue changes. Falls back to
     // an empty state while the stream hasn't emitted yet.
-    final exerciseState = ref.watch(exercisesProvider).value ?? const ExerciseState([]);
+    final exerciseState = ref.watch(exercisesProvider).value ?? ExerciseState(const []);
     final byVariation = exerciseState.getByVariation();
 
     return Form(

lib/widgets/exercises/detail/variations_section.dart

@@ -34,7 +34,7 @@ class VariationsSection extends ConsumerWidget {
       return const SizedBox.shrink();
     }
 
-    final exerciseState = ref.watch(exercisesProvider).value ?? const ExerciseState([]);
+    final exerciseState = ref.watch(exercisesProvider).value ?? ExerciseState(const []);
     final variations = exerciseState.findByVariationGroup(
       exercise.variationGroup,
       exerciseIdToExclude: exercise.id,

test/exercises/contribute_exercise_test.dart

@@ -54,7 +54,7 @@ void main() {
     mockExerciseRepository = MockExerciseRepository();
     when(
       mockExerciseRepository.watchAllDrift(),
-    ).thenAnswer((_) => Stream.value(const ExerciseState(<Exercise>[])));
+    ).thenAnswer((_) => Stream.value(ExerciseState(const <Exercise>[])));
   });
 
   /// Stubs the account fetch so the contribution gate sees a (non-)trustworthy

test/exercises/exercises_detail_widget_test.dart

@@ -44,7 +44,7 @@ void main() {
     mockExerciseRepo = MockExerciseRepository();
     when(
       mockExerciseRepo.watchAllDrift(),
-    ).thenAnswer((_) => Stream.value(const ExerciseState(<Exercise>[])));
+    ).thenAnswer((_) => Stream.value(ExerciseState(const <Exercise>[])));
   });
 
   Widget createHomeScreen({locale = 'en'}) {

test/exercises/exercises_notifier_test.dart

@@ -73,7 +73,7 @@ void main() {
       variationGroup: 'legs',
     );
     final variationExercises = [benchPress, inclineBench, squat, testCrunches];
-    const emptyState = ExerciseState([]);
+    final emptyState = ExerciseState(const []);
 
     test('getById returns the matching exercise', () {
       final s = ExerciseState(exercises);

test/routine/helpers/routine_form_test_overrides.dart

@@ -59,7 +59,7 @@ MockExerciseRepository _emptyExerciseRepoMock() {
   final mock = MockExerciseRepository();
   when(
     mock.watchAllDrift(),
-  ).thenAnswer((_) => Stream.value(const ExerciseState(<Exercise>[])));
+  ).thenAnswer((_) => Stream.value(ExerciseState(const <Exercise>[])));
   return mock;
 }
 

test/routine/routine_form_test.dart

@@ -91,7 +91,7 @@ void main() {
     mockExerciseRepo = MockExerciseRepository();
     when(
       mockExerciseRepo.watchAllDrift(),
-    ).thenAnswer((_) => Stream.value(const ExerciseState(<Exercise>[])));
+    ).thenAnswer((_) => Stream.value(ExerciseState(const <Exercise>[])));
   });
 
   tearDown(() {

test/routine/routines_provider_test.dart

@@ -60,7 +60,7 @@ void main() {
     mockExerciseRepo = MockExerciseRepository();
     when(
       mockExerciseRepo.watchAllDrift(),
-    ).thenAnswer((_) => Stream.value(const ExerciseState(<Exercise>[])));
+    ).thenAnswer((_) => Stream.value(ExerciseState(const <Exercise>[])));
     testDay = Day(
       id: 15,
       routineId: 101,