Mark meal ID in logs as optional

2026-02-19 07:50:52 +01:00 · 2021-10-24 22:14:00 +02:00
parent e8ca3dd33f
commit c593086692
10 changed files with 43 additions and 22 deletions
--- a/lib/models/nutrition/log.dart
+++ b/lib/models/nutrition/log.dart
@@ -32,7 +32,7 @@ class Log {
  int? id;

  @JsonKey(required: false, name: 'meal')
-  int mealId;
+  int? mealId;

  @JsonKey(required: true, name: 'plan')
  int planId;
--- a/lib/models/nutrition/log.g.dart
+++ b/lib/models/nutrition/log.g.dart
@@ -7,22 +7,15 @@ part of 'log.dart';
 // **************************************************************************

 Log _$LogFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'meal',
-    'plan',
-    'datetime',
-    'ingredient',
-    'weight_unit',
-    'amount'
-  ]);
+  $checkKeys(json,
+      requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount']);
  return Log(
    id: json['id'] as int?,
+    mealId: json['meal'] as int?,
    ingredientId: json['ingredient'] as int,
    weightUnitId: json['weight_unit'] as int?,
    amount: stringToNum(json['amount'] as String?),
    planId: json['plan'] as int,
-    mealId: json['meal'] as int,
    datetime: DateTime.parse(json['datetime'] as String),
    comment: json['comment'] as String?,
  );
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -14,7 +14,7 @@ packages:
      name: analyzer
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.7.2"
+    version: "1.7.1"
  android_metadata:
    dependency: "direct main"
    description:
@@ -42,7 +42,7 @@ packages:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.8.1"
+    version: "2.6.1"
  boolean_selector:
    dependency: transitive
    description:
@@ -133,7 +133,7 @@ packages:
      name: charcode
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.1"
+    version: "1.2.0"
  charts_common:
    dependency: transitive
    description:
@@ -353,7 +353,7 @@ packages:
      name: flutter_plugin_android_lifecycle
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
  flutter_svg:
    dependency: transitive
    description:
@@ -384,7 +384,7 @@ packages:
      name: font_awesome_flutter
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "9.1.0"
+    version: "9.2.0"
  frontend_server_client:
    dependency: transitive
    description:
@@ -454,7 +454,7 @@ packages:
      name: image_picker_for_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
  image_picker_platform_interface:
    dependency: transitive
    description:
@@ -524,14 +524,14 @@ packages:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.7.0"
+    version: "1.3.0"
  mime:
    dependency: transitive
    description:
      name: mime
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
  mockito:
    dependency: "direct dev"
    description:
@@ -809,7 +809,7 @@ packages:
      name: table_calendar
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  term_glyph:
    dependency: transitive
    description:
@@ -823,7 +823,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.2"
+    version: "0.3.0"
  timing:
    dependency: transitive
    description:
@@ -984,7 +984,7 @@ packages:
      name: win32
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.2.9"
+    version: "2.2.10"
  xdg_directories:
    dependency: transitive
    description:
--- a/test/base_provider_test.mocks.dart
+++ b/test/base_provider_test.mocks.dart
@@ -80,4 +80,6 @@ class MockClient extends _i1.Mock implements _i4.Client {
  @override
  void close() =>
      super.noSuchMethod(Invocation.method(#close, []), returnValueForMissingStub: null);
+  @override
+  String toString() => super.toString();
 }
--- a/test/gallery_screen_test.mocks.dart
+++ b/test/gallery_screen_test.mocks.dart
@@ -60,6 +60,9 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
  bool get hasListeners =>
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+  @override
  _i6.Future<void> fetchAndSetGallery() =>
      (super.noSuchMethod(Invocation.method(#fetchAndSetGallery, []),
          returnValue: Future<void>.value(),
@@ -105,6 +108,8 @@ class MockGalleryProvider extends _i1.Mock implements _i4.GalleryProvider {
      (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
          returnValue: Future<_i3.Response>.value(_FakeResponse_3())) as _i6.Future<_i3.Response>);
  @override
+  String toString() => super.toString();
+  @override
  void addListener(_i8.VoidCallback? listener) => super
      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
  @override
--- a/test/measurements/measurement_categories_screen_test.mocks.dart
+++ b/test/measurements/measurement_categories_screen_test.mocks.dart
@@ -97,6 +97,8 @@ class MockMeasurementProvider extends _i1.Mock implements _i4.MeasurementProvide
          returnValue: Future<void>.value(),
          returnValueForMissingStub: Future<void>.value()) as _i5.Future<void>);
  @override
+  String toString() => super.toString();
+  @override
  void addListener(_i7.VoidCallback? listener) => super
      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
  @override
--- a/test/measurements/measurement_provider_test.mocks.dart
+++ b/test/measurements/measurement_provider_test.mocks.dart
@@ -71,4 +71,6 @@ class MockWgerBaseProvider extends _i1.Mock implements _i4.WgerBaseProvider {
  _i5.Future<_i3.Response> deleteRequest(String? url, int? id) =>
      (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
          returnValue: Future<_i3.Response>.value(_FakeResponse_3())) as _i5.Future<_i3.Response>);
+  @override
+  String toString() => super.toString();
 }
--- a/test/nutritional_plan_form_test.mocks.dart
+++ b/test/nutritional_plan_form_test.mocks.dart
@@ -67,6 +67,9 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
  bool get hasListeners =>
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+  @override
  _i4.NutritionalPlan findById(int? id) =>
      (super.noSuchMethod(Invocation.method(#findById, [id]), returnValue: _FakeNutritionalPlan_2())
          as _i4.NutritionalPlan);
@@ -184,6 +187,8 @@ class MockNutritionPlansProvider extends _i1.Mock implements _i8.NutritionPlansP
      (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
          returnValue: Future<_i3.Response>.value(_FakeResponse_7())) as _i9.Future<_i3.Response>);
  @override
+  String toString() => super.toString();
+  @override
  void addListener(_i10.VoidCallback? listener) => super
      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
  @override
--- a/test/workout_form_test.mocks.dart
+++ b/test/workout_form_test.mocks.dart
@@ -96,6 +96,9 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
  bool get hasListeners =>
      (super.noSuchMethod(Invocation.getter(#hasListeners), returnValue: false) as bool);
  @override
+  void clear() =>
+      super.noSuchMethod(Invocation.method(#clear, []), returnValueForMissingStub: null);
+  @override
  _i6.WorkoutPlan findById(int? id) =>
      (super.noSuchMethod(Invocation.method(#findById, [id]), returnValue: _FakeWorkoutPlan_4())
          as _i6.WorkoutPlan);
@@ -222,6 +225,11 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
      (super.noSuchMethod(Invocation.method(#addLog, [log]),
          returnValue: Future<_i11.Log>.value(_FakeLog_9())) as _i13.Future<_i11.Log>);
  @override
+  _i13.Future<void> deleteLog(_i11.Log? log) =>
+      (super.noSuchMethod(Invocation.method(#deleteLog, [log]),
+          returnValue: Future<void>.value(),
+          returnValueForMissingStub: Future<void>.value()) as _i13.Future<void>);
+  @override
  Uri makeUrl(String? path, {int? id, String? objectMethod, Map<String, dynamic>? query}) =>
      (super.noSuchMethod(
          Invocation.method(
@@ -247,6 +255,8 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i12.WorkoutPlansProv
      Invocation.method(#deleteRequest, [url, id]),
      returnValue: Future<_i5.Response>.value(_FakeResponse_11())) as _i13.Future<_i5.Response>);
  @override
+  String toString() => super.toString();
+  @override
  void addListener(_i15.VoidCallback? listener) => super
      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
  @override
--- a/test/workout_set_form_test.mocks.dart
+++ b/test/workout_set_form_test.mocks.dart
@@ -115,6 +115,8 @@ class MockExercisesProvider extends _i1.Mock implements _i5.ExercisesProvider {
      (super.noSuchMethod(Invocation.method(#deleteRequest, [url, id]),
          returnValue: Future<_i3.Response>.value(_FakeResponse_4())) as _i6.Future<_i3.Response>);
  @override
+  String toString() => super.toString();
+  @override
  void addListener(_i7.VoidCallback? listener) => super
      .noSuchMethod(Invocation.method(#addListener, [listener]), returnValueForMissingStub: null);
  @override