From d5fa2b9c187ab5c4be9be0405c98fa3610569fb4 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Wed, 29 May 2024 12:47:17 +0200
Subject: [PATCH] fiber rename fixes

---
 lib/models/nutrition/nutritional_plan.dart           | 12 ++++++------
 lib/models/nutrition/nutritional_plan.g.dart         |  9 ++++-----
 lib/widgets/nutrition/charts.dart                    |  2 +-
 lib/widgets/nutrition/forms.dart                     | 10 +++++-----
 .../nutrition/nutritional_plan_detail_response.json  |  2 +-
 .../nutritional_plan_info_detail_response.json       |  2 +-
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/models/nutrition/nutritional_plan.dart b/lib/models/nutrition/nutritional_plan.dart
index a4527ec1..1d64758f 100644
--- a/lib/models/nutrition/nutritional_plan.dart
+++ b/lib/models/nutrition/nutritional_plan.dart
@@ -56,8 +56,8 @@ class NutritionalPlan {
   @JsonKey(required: true, name: 'goal_fat')
   late num? goalFat;
 
-  @JsonKey(required: true, name: 'goal_fibers')
-  late num? goalFibers;
+  @JsonKey(required: true, name: 'goal_fiber')
+  late num? goalFiber;
 
   @JsonKey(includeFromJson: false, includeToJson: false, defaultValue: [])
   List<Meal> meals = [];
@@ -74,7 +74,7 @@ class NutritionalPlan {
     this.goalProtein,
     this.goalCarbohydrates,
     this.goalFat,
-    this.goalFibers,
+    this.goalFiber,
     List<Meal>? meals,
     List<Log>? diaryEntries,
   }) {
@@ -89,7 +89,7 @@ class NutritionalPlan {
     goalEnergy = null;
     goalProtein = null;
     goalCarbohydrates = null;
-    goalFibers = null;
+    goalFiber = null;
     goalFat = null;
   }
 
@@ -110,7 +110,7 @@ class NutritionalPlan {
   }
 
   bool get hasAnyAdvancedGoals {
-    return goalFibers != null;
+    return goalFiber != null;
   }
 
   /// Calculations
@@ -126,7 +126,7 @@ class NutritionalPlan {
         fat: goalFat?.toDouble(),
         protein: goalProtein?.toDouble(),
         carbohydrates: goalCarbohydrates?.toDouble(),
-        fiber: goalFibers?.toDouble(),
+        fiber: goalFiber?.toDouble(),
       );
     }
     // if there are no set goals and no defined meals, the goals are still undefined
diff --git a/lib/models/nutrition/nutritional_plan.g.dart b/lib/models/nutrition/nutritional_plan.g.dart
index 76f7c470..2e979f9a 100644
--- a/lib/models/nutrition/nutritional_plan.g.dart
+++ b/lib/models/nutrition/nutritional_plan.g.dart
@@ -18,7 +18,7 @@ NutritionalPlan _$NutritionalPlanFromJson(Map<String, dynamic> json) {
       'goal_protein',
       'goal_carbohydrates',
       'goal_fat',
-      'goal_fibers'
+      'goal_fiber'
     ],
   );
   return NutritionalPlan(
@@ -30,12 +30,11 @@ NutritionalPlan _$NutritionalPlanFromJson(Map<String, dynamic> json) {
     goalProtein: json['goal_protein'] as num?,
     goalCarbohydrates: json['goal_carbohydrates'] as num?,
     goalFat: json['goal_fat'] as num?,
-    goalFibers: json['goal_fibers'] as num?,
+    goalFiber: json['goal_fiber'] as num?,
   );
 }
 
-Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) => <String, dynamic>{
       'id': instance.id,
       'description': instance.description,
       'creation_date': toDate(instance.creationDate),
@@ -44,5 +43,5 @@ Map<String, dynamic> _$NutritionalPlanToJson(NutritionalPlan instance) =>
       'goal_protein': instance.goalProtein,
       'goal_carbohydrates': instance.goalCarbohydrates,
       'goal_fat': instance.goalFat,
-      'goal_fibers': instance.goalFibers,
+      'goal_fiber': instance.goalFiber,
     };
diff --git a/lib/widgets/nutrition/charts.dart b/lib/widgets/nutrition/charts.dart
index 5b3c0939..4fe7d2fb 100644
--- a/lib/widgets/nutrition/charts.dart
+++ b/lib/widgets/nutrition/charts.dart
@@ -401,7 +401,7 @@ class NutritionalDiaryChartWidgetFlState extends State<NutritionalDiaryChartWidg
                     barchartGroup(3, barsSpace, barsWidth, 'fat'),
                     barchartGroup(4, barsSpace, barsWidth, 'fatSaturated'),
                     if (widget._nutritionalPlan.nutritionalGoals.fiber != null)
-                      barchartGroup(5, barsSpace, barsWidth, 'fibers'),
+                      barchartGroup(5, barsSpace, barsWidth, 'fiber'),
                   ],
                 ),
               ),
diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart
index ba96b5cd..624e1a36 100644
--- a/lib/widgets/nutrition/forms.dart
+++ b/lib/widgets/nutrition/forms.dart
@@ -512,9 +512,9 @@ class _PlanFormState extends State<PlanForm> {
                           widget._plan.goalProtein = null;
                           widget._plan.goalCarbohydrates = null;
                           widget._plan.goalFat = null;
-                          widget._plan.goalFibers = null;
+                          widget._plan.goalFiber = null;
                         case GoalType.basic:
-                          widget._plan.goalFibers = null;
+                          widget._plan.goalFiber = null;
                           break;
                         default:
                           break;
@@ -562,11 +562,11 @@ class _PlanFormState extends State<PlanForm> {
 
           if (_goalType == GoalType.advanced)
             GoalMacros(
-              val: widget._plan.goalFibers?.toString(),
+              val: widget._plan.goalFiber?.toString(),
               label: AppLocalizations.of(context).goalFiber,
               suffix: AppLocalizations.of(context).g,
-              onSave: (double value) => widget._plan.goalFibers = value,
-              key: const Key('field-goal-fibers'),
+              onSave: (double value) => widget._plan.goalFiber = value,
+              key: const Key('field-goal-fiber'),
             ),
           ElevatedButton(
             key: const Key(SUBMIT_BUTTON_KEY_NAME),
diff --git a/test/fixtures/nutrition/nutritional_plan_detail_response.json b/test/fixtures/nutrition/nutritional_plan_detail_response.json
index 078fe9a3..42b0ab0f 100644
--- a/test/fixtures/nutrition/nutritional_plan_detail_response.json
+++ b/test/fixtures/nutrition/nutritional_plan_detail_response.json
@@ -7,6 +7,6 @@
   "goal_protein": null,
   "goal_carbohydrates": null,
   "goal_fat": null,
-  "goal_fibers": null,
+  "goal_fiber": null,
   "language": 1
 }
\ No newline at end of file
diff --git a/test/fixtures/nutrition/nutritional_plan_info_detail_response.json b/test/fixtures/nutrition/nutritional_plan_info_detail_response.json
index b2a7156e..233d2e1a 100644
--- a/test/fixtures/nutrition/nutritional_plan_info_detail_response.json
+++ b/test/fixtures/nutrition/nutritional_plan_info_detail_response.json
@@ -11,7 +11,7 @@
   "goal_protein": null,
   "goal_carbohydrates": null,
   "goal_fat": null,
-  "goal_fibers": null,
+  "goal_fiber": null,
   "description": "",
   "get_nutritional_values": {
     "total": {