Fix merge errors

Author: rolandgeider

integration_test/5_nutritional_plan.dart

@@ -11,12 +11,12 @@ import 'package:wger/providers/nutrition.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../test/other/base_provider_test.mocks.dart';
-import '../test/utils.dart';
+import '../test/user/provider_test.mocks.dart';
 
 Widget createNutritionalPlanScreen({locale = 'en'}) {
+  var mockBaseProvider = MockWgerBaseProvider();
+
   final key = GlobalKey<NavigatorState>();
-  final client = MockClient();
 
   final muesli = Ingredient(
     id: 1,
@@ -96,7 +96,7 @@ Widget createNutritionalPlanScreen({locale = 'en'}) {
   return MultiProvider(
     providers: [
       ChangeNotifierProvider<NutritionPlansProvider>(
-        create: (context) => NutritionPlansProvider(testAuthProvider, [], client),
+        create: (context) => NutritionPlansProvider(mockBaseProvider, []),
       ),
       ChangeNotifierProvider<BodyWeightProvider>(
         create: (context) => BodyWeightProvider(mockBaseProvider),

lib/main.dart

@@ -84,9 +84,12 @@ class MyApp extends StatelessWidget {
               previous ?? WorkoutPlansProvider(WgerBaseProvider(auth), exercises, []),
         ),
         ChangeNotifierProxyProvider<AuthProvider, NutritionPlansProvider>(
-          create: (context) =>
-              NutritionPlansProvider(Provider.of<AuthProvider>(context, listen: false), []),
-          update: (context, auth, previous) => previous ?? NutritionPlansProvider(auth, []),
+          create: (context) => NutritionPlansProvider(
+            WgerBaseProvider(Provider.of<AuthProvider>(context, listen: false)),
+            [],
+          ),
+          update: (context, auth, previous) =>
+              previous ?? NutritionPlansProvider(WgerBaseProvider(auth), []),
         ),
         ChangeNotifierProxyProvider<AuthProvider, MeasurementProvider>(
           create: (context) => MeasurementProvider(

lib/providers/nutrition.dart

@@ -90,9 +90,10 @@ class NutritionPlansProvider with ChangeNotifier {
   /// Fetches and sets all plans sparsely, i.e. only with the data on the plan
   /// object itself and no child attributes
   Future<void> fetchAndSetAllPlansSparse() async {
-    final data = await fetch(makeUrl(_nutritionalPlansPath, query: {'limit': '1000'}));
+    final data = await baseProvider
+        .fetchPaginated(baseProvider.makeUrl(_nutritionalPlansPath, query: {'limit': '1000'}));
     _plans = [];
-    for (final planData in data['results']) {
+    for (final planData in data) {
       final plan = NutritionalPlan.fromJson(planData);
       _plans.add(plan);
       _plans.sort((a, b) => b.creationDate.compareTo(a.creationDate));
@@ -128,7 +129,7 @@ class NutritionPlansProvider with ChangeNotifier {
     NutritionalPlan plan;
     try {
       plan = findById(planId);
-    } on NoSuchEntryException catch (e) {
+    } on NoSuchEntryException {
       plan = await fetchAndSetPlanSparse(planId);
     }