Merge pull request #29 from openfoodfacts/smooth-app

Fixed servingQuantity issue raised by 0.3.4
openfoodfacts · Jun 28, 2020 · 21df57e · 21df57e
2 parents d5ad7d6 + 71d07f8
commit 21df57e
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [0.3.5] - 28.06.2020
+- fixed servingQuantity issue introduced in 0.3.4
+
 ## [0.3.4] - 25.06.2020
 - selectedImages toJson implementation
 - codebase improvements

diff --git a/lib/model/Product.dart b/lib/model/Product.dart
@@ -37,8 +37,8 @@ class Product extends JsonObject {
   String imgSmallUrl;
   @JsonKey(name: 'serving_size')
   String servingSize;
-  @JsonKey(name: 'serving_quantity')
-  String servingQuantity;
+  @JsonKey(name: 'serving_quantity', fromJson: JsonHelper.servingQuantityFromJson)
+  double servingQuantity;
   @JsonKey(name: 'product_quantity')
   dynamic packagingQuantity;
 

diff --git a/lib/model/Product.g.dart b/lib/model/Product.g.dart
diff --git a/lib/utils/JsonHelper.dart b/lib/utils/JsonHelper.dart
@@ -96,4 +96,19 @@ class JsonHelper {
     // not implemented and needed, yet.
     return Map<String, dynamic>();
   }
+
+  static double servingQuantityFromJson(dynamic data) {
+    if(data is double) {
+      return data;
+    }
+    if(data is int) {
+      return data.toDouble();
+    }
+    try {
+      return double.parse(data);
+    } catch(e) {
+      print("Unable to parse data to double : $e");
+      return null;
+    }
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: openfoodfacts
 description: Dart package for the Open Food Facts API, a food products database made by everyone, for everyone.
-version: 0.3.4
+version: 0.3.5
 #authors:
 #- Alexander Schacht <grumpf@gmx.de>
 #- Primaël Quémerais <primael@reefind.com>

diff --git a/test/api_test_getProduct.dart b/test/api_test_getProduct.dart
@@ -40,8 +40,6 @@ void main() {
       result.product.ingredients.forEach((element) {
         print(element.toData().toString());});
       expect(result.product.ingredients.length, 13);
-      print("Serving Size: ");
-      print(result.product.servingSize);
 
       expect(result.product.ingredients.any((i) => i.text == "Wasser"), true);
       expect(
@@ -87,8 +85,6 @@ void main() {
       expect(result.product.additives.ids[4], "en:e950");
       expect(result.product.additives.names[4], "E950");
 
-      expect(result.product.servingSize == null, true);
-
       expect(
           result.product.nutrientLevels.levels[NutrientLevels.NUTRIENT_SUGARS],
           Level.LOW);
@@ -122,7 +118,6 @@ void main() {
       expect(result.product != null, true);
       expect(result.product.barcode, barcode);
 
-      expect(result.product.servingSize != null, true);
       expect(result.product.nutriments.carbohydratesServing != null, true);
       expect(result.product.nutriments.proteinsServing != null, true);
       expect(result.product.nutriments.saltServing != null, true);

diff --git a/test/api_test_getProductRaw.dart b/test/api_test_getProductRaw.dart
@@ -98,7 +98,6 @@ void main() {
       expect(result.product != null, true);
       expect(result.product.barcode, barcode);
 
-      expect(result.product.servingSize != null, true);
       expect(result.product.nutriments.carbohydratesServing != null, true);
       expect(result.product.nutriments.proteinsServing != null, true);
       expect(result.product.nutriments.saltServing != null, true);
@@ -135,7 +134,6 @@ void main() {
       expect(result.product.nutriments.proteins, null);
       expect(result.product.nutriments.novaGroup, 1);
       expect(result.product.nutriments.fatServing == null, true);
-      expect(result.product.servingSize == null, true);
     });
   });
 }
diff --git a/test/api_test_saveProduct.dart b/test/api_test_saveProduct.dart
@@ -10,11 +10,11 @@ import 'test_constants.dart';
 void main() {
   group('$OpenFoodAPIClient add new products', () {
     setUpAll(() async {
-      new HttpHelper().isTestMode = true;
+      HttpHelper().isTestMode = true;
     });
 
     test('add new product test 1', () async {
-      Product product = new Product(
+      Product product = Product(
           barcode: "0048151623426",
           productName: "Maryland Choc Chip",
           quantity: "230g",
@@ -35,7 +35,7 @@ void main() {
     });
 
     test('add new product test 2', () async {
-      Product product = new Product(
+      Product product = Product(
         barcode: "8008698011065",
         productName: "Meisterbäckers Vital",
         quantity: "350g",
@@ -51,7 +51,7 @@ void main() {
     });
 
     test('add new product test 3', () async {
-      Product product = new Product(
+      Product product = Product(
         barcode: "4250752200784",
         productName: "Johanneskraut-Rotöl Kapseln",
         quantity: "30 Kapseln",
@@ -69,7 +69,7 @@ void main() {
     });
 
     test('add new product test 4', () async {
-      Product product = new Product(
+      Product product = Product(
           barcode: "4052700676180",
           productName: "Calcium + Vitamin D3 + C",
           quantity: "14 Tabletten",