Further work on reworking the exercise provider

test_data/exercises.dart

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:wger/models/exercises/base.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
 import 'package:wger/models/exercises/exercise.dart';
@@ -32,38 +33,67 @@ const category3 = ExerciseCategory(id: 3, name: 'Abs');
 const equipment1 = Equipment(id: 1, name: 'Bench');
 const equipment2 = Equipment(id: 1, name: 'Dumbbell');
 
-final exercise1 = Exercise(
-  id: 1,
-  uuid: 'uuid',
-  creationDate: DateTime(2021, 1, 15),
-  name: 'test exercise 1',
-  description: 'add clever text',
-  category: category1,
-  muscles: [muscle1, muscle2],
-  musclesSecondary: [muscle3],
-  equipment: [equipment1, equipment2],
-);
+List<Exercise> getExercise() {
+  final base1 = ExerciseBase(
+    id: 1,
+    uuid: 'uuid1',
+    creationDate: DateTime(2021, 09, 01),
+    updateDate: DateTime(2021, 09, 10),
+    category: category1,
+    equipment: [equipment1, equipment2],
+    muscles: [muscle1, muscle2],
+    musclesSecondary: [muscle3],
+  );
 
-final exercise2 = Exercise(
-  id: 2,
-  uuid: '111-2222-44444',
-  creationDate: DateTime(2021, 1, 15),
-  name: 'test exercise 2',
-  description: 'Lorem ipsum etc',
-  category: category2,
-  muscles: [muscle1],
-  musclesSecondary: [muscle2],
-  equipment: [equipment2],
-);
+  final exercise1 = Exercise(
+      id: 1,
+      baseId: 1,
+      uuid: 'uuid',
+      languageId: 1,
+      creationDate: DateTime(2021, 1, 15),
+      name: 'test exercise 1',
+      description: 'add clever text',
+      base: base1);
 
-final exercise3 = Exercise(
-  id: 3,
-  uuid: 'a3b6c7bb-9d22-4119-a5fc-818584d5e9bc',
-  creationDate: DateTime(2021, 4, 1),
-  name: 'test exercise 3',
-  description: 'The man in black fled across the desert, and the gunslinger followed',
-  category: category3,
-  muscles: [muscle1],
-  musclesSecondary: [muscle2],
-  equipment: [equipment2],
-);
+  final base2 = ExerciseBase(
+    id: 2,
+    uuid: 'uuid2',
+    creationDate: DateTime(2021, 08, 01),
+    updateDate: DateTime(2021, 08, 10),
+    category: category2,
+    equipment: [equipment2],
+    muscles: [muscle1],
+    musclesSecondary: [muscle2],
+  );
+  final exercise2 = Exercise(
+      id: 2,
+      baseId: 2,
+      uuid: '111-2222-44444',
+      languageId: 2,
+      creationDate: DateTime(2021, 1, 15),
+      name: 'test exercise 2',
+      description: 'Lorem ipsum etc',
+      base: base2);
+
+  final base3 = ExerciseBase(
+    id: 3,
+    uuid: 'uuid3',
+    creationDate: DateTime(2021, 08, 01),
+    updateDate: DateTime(2021, 08, 01),
+    category: category3,
+    equipment: [equipment2],
+    muscles: [muscle1],
+    musclesSecondary: [muscle2],
+  );
+  final exercise3 = Exercise(
+      id: 3,
+      baseId: 2,
+      uuid: 'a3b6c7bb-9d22-4119-a5fc-818584d5e9bc',
+      languageId: 2,
+      creationDate: DateTime(2021, 4, 1),
+      name: 'test exercise 3',
+      description: 'The man in black fled across the desert, and the gunslinger followed',
+      base: base3);
+
+  return [exercise1, exercise2, exercise3];
+}

test_data/workouts.dart

@@ -45,7 +45,7 @@ WorkoutPlan getWorkout() {
   );
   setting1.repetitionUnit = repetitionUnit1;
   setting1.weightUnit = weightUnit1;
-  setting1.exercise = exercise1;
+  setting1.exercise = getExercise()[0];
   setting1.weight = 10;
 
   var log1 = Log.empty()
@@ -55,7 +55,7 @@ WorkoutPlan getWorkout() {
     ..date = DateTime(2021, 5, 1)
     ..reps = 10
     ..workoutPlan = 1;
-  log1.exercise = exercise1;
+  log1.exercise = getExercise()[0];
   log1.weightUnit = weightUnit1;
   log1.repetitionUnit = repetitionUnit1;
 
@@ -66,7 +66,7 @@ WorkoutPlan getWorkout() {
     ..date = DateTime(2021, 5, 1)
     ..reps = 12
     ..workoutPlan = 1;
-  log2.exercise = exercise1;
+  log2.exercise = getExercise()[0];
   log2.weightUnit = weightUnit1;
   log2.repetitionUnit = repetitionUnit1;
 
@@ -77,7 +77,7 @@ WorkoutPlan getWorkout() {
     ..date = DateTime(2021, 5, 2)
     ..reps = 8
     ..workoutPlan = 1;
-  log3.exercise = exercise2;
+  log3.exercise = getExercise()[1];
   log3.weightUnit = weightUnit1;
   log3.repetitionUnit = repetitionUnit1;
 
@@ -88,7 +88,7 @@ WorkoutPlan getWorkout() {
     order: 1,
     comment: 'Important to do exercises correctly',
   );
-  set1.addExercise(exercise1);
+  set1.addExercise(getExercise()[0]);
   set1.settings.add(setting1);
   set1.settingsComputed = [setting1, setting1];