The ingredient ID is an integer, not a string

rolandgeider · rolandgeider · commit d79645a6f567 · 2023-04-09T11:40:40.000+02:00
diff --git a/lib/models/nutrition/image.dart b/lib/models/nutrition/image.dart
@@ -30,23 +30,26 @@ class IngredientImage {
 
   /// Name of the product
   @JsonKey(required: true, name: 'ingredient_id')
-  final String ingredientId;
+  final int ingredientId;
 
+  /// URL of the image on the server
   @JsonKey(required: true)
   final String image;
 
   /// Size in bytes
   @JsonKey(required: true)
   final int size;
 
-  const IngredientImage(
-      {required this.id,
-      required this.uuid,
-      required this.ingredientId,
-      required this.image,
-      required this.size});
+  const IngredientImage({
+    required this.id,
+    required this.uuid,
+    required this.ingredientId,
+    required this.image,
+    required this.size,
+  });
 
   // Boilerplate
   factory IngredientImage.fromJson(Map<String, dynamic> json) => _$IngredientImageFromJson(json);
+
   Map<String, dynamic> toJson() => _$IngredientImageToJson(this);
 }
diff --git a/lib/models/nutrition/image.g.dart b/lib/models/nutrition/image.g.dart
diff --git a/test/exercises/contribute_exercise_test.mocks.dart b/test/exercises/contribute_exercise_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/exercises/contribute_exercise_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/gallery/gallery_form_test.mocks.dart b/test/gallery/gallery_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/gallery/gallery_form_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/gallery/gallery_screen_test.mocks.dart b/test/gallery/gallery_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/gallery/gallery_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/measurements/measurement_categories_screen_test.mocks.dart b/test/measurements/measurement_categories_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/measurements/measurement_categories_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/measurements/measurement_provider_test.mocks.dart b/test/measurements/measurement_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/measurements/measurement_provider_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/nutrition/nutritional_meal_form_test.mocks.dart b/test/nutrition/nutritional_meal_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/nutrition/nutritional_meal_form_test.dart.
 // Do not manually edit this file.
 
@@ -359,7 +359,7 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP
   ]) =>
       (super.noSuchMethod(
         Invocation.method(
-          #logIngredentToDiary,
+          #logIngredientToDiary,
           [
             mealItem,
             planId,
diff --git a/test/nutrition/nutritional_plan_form_test.mocks.dart b/test/nutrition/nutritional_plan_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/nutrition/nutritional_plan_form_test.dart.
 // Do not manually edit this file.
 
@@ -359,7 +359,7 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i7.NutritionPlansP
   ]) =>
       (super.noSuchMethod(
         Invocation.method(
-          #logIngredentToDiary,
+          #logIngredientToDiary,
           [
             mealItem,
             planId,
diff --git a/test/nutrition/nutritional_plan_screen_test.mocks.dart b/test/nutrition/nutritional_plan_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/nutrition/nutritional_plan_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/nutrition/nutritional_plans_screen_test.mocks.dart b/test/nutrition/nutritional_plans_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/nutrition/nutritional_plans_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/other/base_provider_test.mocks.dart b/test/other/base_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/other/base_provider_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/user/provider_test.mocks.dart b/test/user/provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/user/provider_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/weight/weight_provider_test.mocks.dart b/test/weight/weight_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/weight/weight_provider_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/weight/weight_screen_test.mocks.dart b/test/weight/weight_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/weight/weight_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/gym_mode_screen_test.mocks.dart b/test/workout/gym_mode_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/gym_mode_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/repetition_unit_form_widget_test.mocks.dart b/test/workout/repetition_unit_form_widget_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/repetition_unit_form_widget_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/weight_unit_form_widget_test.mocks.dart b/test/workout/weight_unit_form_widget_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/weight_unit_form_widget_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/workout_day_form_test.mocks.dart b/test/workout/workout_day_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/workout_day_form_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/workout_form_test.mocks.dart b/test/workout/workout_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/workout_form_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/workout_plan_screen_test.mocks.dart b/test/workout/workout_plan_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/workout_plan_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/workout_plans_screen_test.mocks.dart b/test/workout/workout_plans_screen_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/workout_plans_screen_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/workout_provider_test.mocks.dart b/test/workout/workout_provider_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/workout_provider_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in wger/test/workout/workout_set_form_test.dart.
 // Do not manually edit this file.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Mocks generated by Mockito 5.3.2 from annotations`
	`1`	`+// Mocks generated by Mockito 5.4.0 from annotations`
`2`	`2`	`// in wger/test/exercises/contribute_exercise_test.dart.`
`3`	`3`	`// Do not manually edit this file.`
`4`	`4`