await for all setExercisesAndUnits calls

Not setting the "await" was causing the method to be run asynchronously which means
that sometimes these would get called several times for the same exercise, which in
turn would cause exercises to be written several times to the local db, polluting the
exercise list, etc. etc.

We increase the schemaVersion of the database because this causes all the cache tables
to be dropped and re-created

Author: rolandgeider

lib/database/exercises/exercise_database.dart

@@ -78,7 +78,7 @@ class ExerciseDatabase extends _$ExerciseDatabase {
 
   /// Note that this needs to be bumped if the JSON response from the server changes
   @override
-  int get schemaVersion => 2;
+  int get schemaVersion => 3;
 
   /// There is not really a migration strategy. If we bump the version
   /// number, delete everything and recreate the new tables. The provider

lib/providers/exercises.dart

@@ -310,9 +310,10 @@ class ExercisesProvider with ChangeNotifier {
   ) async {
     Exercise exercise;
 
-    // TODO: this should be a .getSingleOrNull()!!! However, for some reason there
-    //       can be duplicates in the db. Perhaps a race condition so that two
-    //       entries are written at the same time or something?
+    // NOTE: this should not be necessary anymore. We had a bug that would
+    //       create duplicate entries in the database and should be fixed now.
+    //       However, we keep it here for now to be on the safe side.
+    //       In the future this can be replaced by a .getSingleOrNull()
     final exerciseResult =
         await (database.select(database.exercises)..where((e) => e.id.equals(exerciseId))).get();
 
@@ -321,9 +322,13 @@ class ExercisesProvider with ChangeNotifier {
       exerciseDb = exerciseResult.first;
     }
 
+    // Note that this shouldn't happen anymore...
+    if (exerciseResult.length > 1) {
+      _logger.warning('Found ${exerciseResult.length} entries for exercise $exerciseId in the db');
+    }
+
     // Exercise is already known locally
     if (exerciseDb != null) {
-      // _logger.fine('Exercise $exerciseId found in local cache');
       final nextFetch = exerciseDb.lastFetched.add(const Duration(days: EXERCISE_CACHE_DAYS));
       exercise = Exercise.fromApiDataString(exerciseDb.data, _languages);
 
@@ -455,15 +460,13 @@ class ExercisesProvider with ChangeNotifier {
 
   /// Updates the exercise database with *all* the exercises from the server
   Future<void> updateExerciseCache(ExerciseDatabase database) async {
-    final data = await baseProvider.fetch(
-      baseProvider.makeUrl(exerciseInfoUrlPath, query: {'limit': '1000'}),
+    final data = await baseProvider.fetchPaginated(
+      baseProvider.makeUrl(exerciseInfoUrlPath, query: {'limit': '999'}),
     );
-
-    final List<dynamic> exercisesData = data['results'];
-    exercises = exercisesData.map((e) => Exercise.fromApiDataJson(e, _languages)).toList();
+    exercises = data.map((e) => Exercise.fromApiDataJson(e, _languages)).toList();
 
     // Insert new entries and update ones that have been edited
-    Future.forEach(exercisesData, (exerciseData) async {
+    Future.forEach(data, (exerciseData) async {
       final exercise = await (database.select(database.exercises)
             ..where((e) => e.id.equals(exerciseData['id'])))
           .getSingleOrNull();

lib/providers/routines.dart

@@ -20,7 +20,6 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:wger/exceptions/http_exception.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/helpers/shared_preferences.dart';
@@ -199,7 +198,7 @@ class RoutinesProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  void setExercisesAndUnits(List<DayData> entries) async {
+  Future<void> setExercisesAndUnits(List<DayData> entries) async {
     for (final entry in entries) {
       for (final slot in entry.slots) {
         for (final setConfig in slot.setConfigs) {
@@ -276,10 +275,10 @@ class RoutinesProvider with ChangeNotifier {
      * note that setExercisesAndUnits modifies the list in-place
      */
     final dayDataEntriesDisplay = dayData.map((entry) => DayData.fromJson(entry)).toList();
-    setExercisesAndUnits(dayDataEntriesDisplay);
+    await setExercisesAndUnits(dayDataEntriesDisplay);
 
     final dayDataEntriesGym = dayDataGym.map((entry) => DayData.fromJson(entry)).toList();
-    setExercisesAndUnits(dayDataEntriesGym);
+    await setExercisesAndUnits(dayDataEntriesGym);
 
     final sessionDataEntries =
         sessionData.map((entry) => WorkoutSessionApi.fromJson(entry)).toList();

test/core/settings_test.mocks.dart

@@ -176,7 +176,7 @@ class MockExercisesProvider extends _i1.Mock implements _i17.ExercisesProvider {
 
   @override
   Map<int, List<_i4.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseBasesByVariation),
+        Invocation.getter(#exerciseByVariation),
         returnValue: <int, List<_i4.Exercise>>{},
       ) as Map<int, List<_i4.Exercise>>);
 

test/exercises/exercises_detail_widget_test.mocks.dart

@@ -119,7 +119,7 @@ class MockExercisesProvider extends _i1.Mock implements _i9.ExercisesProvider {
 
   @override
   Map<int, List<_i4.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseBasesByVariation),
+        Invocation.getter(#exerciseByVariation),
         returnValue: <int, List<_i4.Exercise>>{},
       ) as Map<int, List<_i4.Exercise>>);
 

test/workout/day_form_test.mocks.dart

@@ -219,10 +219,11 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
       ) as _i13.Future<void>);
 
   @override
-  void setExercisesAndUnits(List<_i14.DayData>? entries) => super.noSuchMethod(
+  _i13.Future<void> setExercisesAndUnits(List<_i14.DayData>? entries) => (super.noSuchMethod(
         Invocation.method(#setExercisesAndUnits, [entries]),
-        returnValueForMissingStub: null,
-      );
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
 
   @override
   _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(

test/workout/gym_mode_screen_test.mocks.dart

@@ -248,7 +248,7 @@ class MockExercisesProvider extends _i1.Mock implements _i12.ExercisesProvider {
 
   @override
   Map<int, List<_i6.Exercise>> get exerciseByVariation => (super.noSuchMethod(
-        Invocation.getter(#exerciseBasesByVariation),
+        Invocation.getter(#exerciseByVariation),
         returnValue: <int, List<_i6.Exercise>>{},
       ) as Map<int, List<_i6.Exercise>>);
 

test/workout/repetition_unit_form_widget_test.mocks.dart

@@ -219,10 +219,11 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
       ) as _i13.Future<void>);
 
   @override
-  void setExercisesAndUnits(List<_i14.DayData>? entries) => super.noSuchMethod(
+  _i13.Future<void> setExercisesAndUnits(List<_i14.DayData>? entries) => (super.noSuchMethod(
         Invocation.method(#setExercisesAndUnits, [entries]),
-        returnValueForMissingStub: null,
-      );
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
 
   @override
   _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(

test/workout/routine_edit_screen_test.mocks.dart

@@ -219,10 +219,11 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
       ) as _i13.Future<void>);
 
   @override
-  void setExercisesAndUnits(List<_i14.DayData>? entries) => super.noSuchMethod(
+  _i13.Future<void> setExercisesAndUnits(List<_i14.DayData>? entries) => (super.noSuchMethod(
         Invocation.method(#setExercisesAndUnits, [entries]),
-        returnValueForMissingStub: null,
-      );
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
 
   @override
   _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(

test/workout/routine_edit_test.mocks.dart

@@ -219,10 +219,11 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
       ) as _i13.Future<void>);
 
   @override
-  void setExercisesAndUnits(List<_i14.DayData>? entries) => super.noSuchMethod(
+  _i13.Future<void> setExercisesAndUnits(List<_i14.DayData>? entries) => (super.noSuchMethod(
         Invocation.method(#setExercisesAndUnits, [entries]),
-        returnValueForMissingStub: null,
-      );
+        returnValue: _i13.Future<void>.value(),
+        returnValueForMissingStub: _i13.Future<void>.value(),
+      ) as _i13.Future<void>);
 
   @override
   _i13.Future<_i5.Routine> fetchAndSetRoutineSparse(int? planId) => (super.noSuchMethod(