Implemented review comments

Author: PrimaelQuemerais

lib/src/model/nutrient_modifier.dart

@@ -1,51 +1,26 @@
 import 'package:openfoodfacts/src/model/off_tagged.dart';
 
 enum NutrientModifier implements OffTagged {
-  approximately,
-  superiorTo,
-  inferiorTo;
+  approximately(offTag: '~'),
+  greaterThan(offTag: '>'),
+  lessThan(offTag: '<');
 
+  const NutrientModifier({
+    required this.offTag,
+  });
   @override
-  String get offTag => symbol;
-}
-
-extension NutrientModifierExtension on NutrientModifier {
-  String get symbol {
-    switch (this) {
-      case NutrientModifier.approximately:
-        return '~';
-      case NutrientModifier.superiorTo:
-        return '>';
-      case NutrientModifier.inferiorTo:
-        return '<';
-    }
-  }
+  final String offTag;
 
-  static NutrientModifier? fromString(String? modifier) {
-    for (final NutrientModifier value in NutrientModifier.values) {
-      if (value.symbol == modifier) {
-        return value;
-      }
-    }
-
-    switch (modifier) {
-      case '~':
-        return NutrientModifier.approximately;
-      case '>':
-        return NutrientModifier.superiorTo;
-      case '<':
-        return NutrientModifier.inferiorTo;
-      default:
-        return null;
-    }
-  }
+  /// Returns the first [NutrientModifier] that matches the [offTag].
+  static NutrientModifier? fromOffTag(final String? offTag) =>
+      OffTagged.fromOffTag(offTag, NutrientModifier.values)
+          as NutrientModifier?;
 
-  static NutrientModifier? fromValue(String value) {
-    if (value.trim().isEmpty) {
+  static NutrientModifier? fromValue(final String? value) {
+    if (value == null || value.isEmpty) {
       return null;
     }
 
-    String modifier = value.trim().substring(0, 1);
-    return fromString(modifier);
+    return fromOffTag(value.substring(0, 1));
   }
 }

lib/src/model/robotoff_nutrient_extraction.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:openfoodfacts/src/model/per_size.dart';
-import 'package:openfoodfacts/src/model/robotoff_nutrient_extraction_annotation.dart';
+import 'per_size.dart';
+import 'robotoff_nutrient_extraction_annotation.dart';
 import '../interface/json_object.dart';
 import 'nutrient.dart';
 import 'robotoff_nutrient_extraction_insight.dart';
@@ -12,14 +12,21 @@ class RobotoffNutrientExtractionResult extends JsonObject {
   final String? status;
   final int? count;
   final List<RobotoffNutrientExtractionInsight>? insights;
+  RobotoffNutrientExtractionInsight? _latestInsight;
 
-  const RobotoffNutrientExtractionResult({
+  RobotoffNutrientExtractionResult({
     this.status,
     this.count,
     this.insights,
   });
 
-  RobotoffNutrientExtractionInsight? get getLatestInsights {
+  RobotoffNutrientExtractionInsight? getLatestInsights({
+    bool recompute = false,
+  }) {
+    if (_latestInsight != null && !recompute) {
+      return _latestInsight;
+    }
+
     insights?.sort((a, b) {
       if (a.completedAt == null && b.completedAt == null) {
         return 0;
@@ -31,17 +38,30 @@ class RobotoffNutrientExtractionResult extends JsonObject {
 
       return a.completedAt!.compareTo(b.completedAt!);
     });
-    return insights?.last;
+
+    _latestInsight = insights?.last;
+
+    return _latestInsight;
   }
 
   RobotoffNutrientEntity? getNutrientEntity(
-      Nutrient nutrient, PerSize perSize) {
-    return getLatestInsights
-        ?.data?.nutrients?[nutrient.getOffTagPerSize(perSize)];
+    Nutrient nutrient,
+    PerSize perSize, {
+    bool recomputeLatest = false,
+  }) {
+    return getLatestInsights(recompute: recomputeLatest)
+        ?.data
+        ?.nutrients?[nutrient.getOffTagPerSize(perSize)];
   }
 
-  RobotoffNutrientAnnotationData? getNutrientAnnotation(Nutrient nutrient) {
-    return getLatestInsights?.data?.annotation?.nutrients?[nutrient.offTag];
+  RobotoffNutrientAnnotationData? getNutrientAnnotation(
+    Nutrient nutrient, {
+    bool recomputeLatest = false,
+  }) {
+    return getLatestInsights(recompute: recomputeLatest)
+        ?.data
+        ?.annotation
+        ?.nutrients?[nutrient.offTag];
   }
 
   factory RobotoffNutrientExtractionResult.fromJson(

lib/src/model/robotoff_nutrient_extraction_annotation.dart

@@ -9,16 +9,18 @@ part 'robotoff_nutrient_extraction_annotation.g.dart';
 class RobotoffNutrientAnnotationData {
   @JsonKey(toJson: UnitHelper.unitToString, fromJson: UnitHelper.stringToUnit)
   Unit? unit;
+  @JsonKey(name: 'value')
   String valueWithModifer;
 
   RobotoffNutrientAnnotationData({
     this.unit,
     required this.valueWithModifer,
   });
 
-  get modifier => NutrientModifierExtension.fromValue(valueWithModifer);
+  NutrientModifier? get modifier =>
+      NutrientModifier.fromValue(valueWithModifer);
 
-  get value {
+  double? get value {
     if (valueWithModifer.trim().isEmpty) {
       return null;
     }

lib/src/model/robotoff_nutrient_extraction_annotation.g.dart

@@ -57,14 +57,10 @@ class RobotoffNutrientExtractionInsight extends JsonObject {
   // TODO: Figure out what this field is and what type it should be
   // final String? type;
   final RobotoffNutrientDataWrapper? data;
-  @JsonKey(
-      fromJson: JsonHelper.nullableStringTimestampToDate,
-      toJson: JsonHelper.nullableDateToStringTimestamp)
+  @JsonKey(fromJson: JsonHelper.nullableStringTimestampToDate)
   final DateTime? timestamp;
   @JsonKey(
-      name: 'completed_at',
-      fromJson: JsonHelper.nullableStringTimestampToDate,
-      toJson: JsonHelper.nullableDateToStringTimestamp)
+      name: 'completed_at', fromJson: JsonHelper.nullableStringTimestampToDate)
   final DateTime? completedAt;
   final int? annotation;
   @JsonKey(name: 'annotated_result')
@@ -103,7 +99,6 @@ class RobotoffNutrientExtractionInsight extends JsonObject {
   RobotoffNutrientExtractionInsight({
     this.insightId,
     this.barcode,
-    // this.type,
     this.data,
     this.timestamp,
     this.completedAt,
@@ -125,7 +120,6 @@ class RobotoffNutrientExtractionInsight extends JsonObject {
     this.predictorVersion,
     this.campaign,
     this.confidence,
-    // this.boundingBox,
   });
 
   factory RobotoffNutrientExtractionInsight.fromJson(

lib/src/model/robotoff_nutrient_extraction_insight.dart

@@ -408,12 +408,6 @@ class JsonHelper {
   static DateTime? nullableStringTimestampToDate(dynamic json) =>
       json == null ? null : stringTimestampToDate(json);
 
-  static String dateToStringTimestamp(DateTime dateTime) =>
-      dateTime.toIso8601String();
-
-  static String? nullableDateToStringTimestamp(DateTime? dateTime) =>
-      dateTime == null ? null : dateToStringTimestamp(dateTime);
-
   static const String _checkboxOnValue = 'on';
   static const String _checkboxOffValue = '';
 

lib/src/model/robotoff_nutrient_extraction_insight.g.dart

@@ -231,6 +231,7 @@ void main() {
     expect(result.status, 'found');
     expect(result.insights!, isNotEmpty);
     expect(result.insights![0].barcode, barcode);
+
     for (Nutrient nutrient in [
       Nutrient.fat,
       Nutrient.salt,
@@ -244,19 +245,6 @@ void main() {
     ]) {
       expect(result.getNutrientEntity(nutrient, PerSize.oneHundredGrams),
           isNotNull);
-    }
-
-    for (Nutrient nutrient in [
-      Nutrient.fat,
-      Nutrient.salt,
-      Nutrient.fiber,
-      Nutrient.sugars,
-      Nutrient.proteins,
-      Nutrient.energyKJ,
-      Nutrient.energyKCal,
-      Nutrient.carbohydrates,
-      Nutrient.saturatedFat,
-    ]) {
       expect(
           result.getNutrientAnnotation(nutrient)?.valueWithModifer, isNotNull);
     }