From 831d74d90dc7a02f9ae1451dbe2d9b6ffcf2dcba Mon Sep 17 00:00:00 2001 From: Adrian Halko Date: Mon, 22 Nov 2021 19:22:59 +0100 Subject: [PATCH] Added code property to Ingredient model. Generate ingredient.g.dart. --- lib/models/measurements/measurement_entry.g.dart | 3 ++- lib/models/nutrition/ingredient.dart | 5 +++++ lib/models/nutrition/ingredient.g.dart | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/models/measurements/measurement_entry.g.dart b/lib/models/measurements/measurement_entry.g.dart index 7f6e346a..4b096960 100644 --- a/lib/models/measurements/measurement_entry.g.dart +++ b/lib/models/measurements/measurement_entry.g.dart @@ -20,7 +20,8 @@ MeasurementEntry _$MeasurementEntryFromJson(Map json) { ); } -Map _$MeasurementEntryToJson(MeasurementEntry instance) => { +Map _$MeasurementEntryToJson(MeasurementEntry instance) => + { 'id': instance.id, 'category': instance.category, 'date': toDate(instance.date), diff --git a/lib/models/nutrition/ingredient.dart b/lib/models/nutrition/ingredient.dart index 69d1ce44..a60d6f79 100644 --- a/lib/models/nutrition/ingredient.dart +++ b/lib/models/nutrition/ingredient.dart @@ -25,6 +25,10 @@ class Ingredient { @JsonKey(required: true) final int id; + /// Barcode of the product + @JsonKey(required: true) + final String code; + /// Name of the product @JsonKey(required: true) final String name; @@ -66,6 +70,7 @@ class Ingredient { const Ingredient({ required this.id, + required this.code, required this.name, required this.creationDate, required this.energy, diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart index 05ef48d7..c4afcabb 100644 --- a/lib/models/nutrition/ingredient.g.dart +++ b/lib/models/nutrition/ingredient.g.dart @@ -11,6 +11,7 @@ Ingredient _$IngredientFromJson(Map json) { json, requiredKeys: const [ 'id', + 'code', 'name', 'creation_date', 'energy', @@ -25,6 +26,7 @@ Ingredient _$IngredientFromJson(Map json) { ); return Ingredient( id: json['id'] as int, + code: json['code'] as String, name: json['name'] as String, creationDate: DateTime.parse(json['creation_date'] as String), energy: json['energy'] as int, @@ -38,8 +40,10 @@ Ingredient _$IngredientFromJson(Map json) { ); } -Map _$IngredientToJson(Ingredient instance) => { +Map _$IngredientToJson(Ingredient instance) => + { 'id': instance.id, + 'code': instance.code, 'name': instance.name, 'creation_date': toDate(instance.creationDate), 'energy': instance.energy,