fix: issue with converting LocalizedTags to JSON (#766)

* fix: issue with converting LocalizedTags to JSON Fixes #765 * refactor: address PR #766 feedback
openfoodfacts · Jul 20, 2023 · 80c3ddb · 80c3ddb
1 parent a1fc1d8
commit 80c3ddb
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 25 deletions.
diff --git a/lib/src/model/localized_tag.dart b/lib/src/model/localized_tag.dart
@@ -25,6 +25,9 @@ class LocalizedTag extends JsonObject {
   factory LocalizedTag.fromJson(Map<String, dynamic> json) =>
       _$LocalizedTagFromJson(json);
 
+  static Map<String, dynamic> objToJson(LocalizedTag? tag) =>
+      tag != null ? tag.toJson() : {};
+
   @override
   Map<String, dynamic> toJson() => _$LocalizedTagToJson(this);
 

diff --git a/lib/src/model/product_packaging.dart b/lib/src/model/product_packaging.dart
@@ -8,15 +8,24 @@ part 'product_packaging.g.dart';
 @JsonSerializable()
 class ProductPackaging extends JsonObject {
   /// Shape, canonicalized using [TaxonomyPackagingShape].
-  @JsonKey(includeIfNull: false)
+  @JsonKey(
+    includeIfNull: false,
+    toJson: LocalizedTag.objToJson,
+  )
   LocalizedTag? shape;
 
   /// Material, canonicalized using [TaxonomyPackagingMaterial].
-  @JsonKey(includeIfNull: false)
+  @JsonKey(
+    includeIfNull: false,
+    toJson: LocalizedTag.objToJson,
+  )
   LocalizedTag? material;
 
   /// Recycling status, canonicalized using [TaxonomyPackagingRecycling].
-  @JsonKey(includeIfNull: false)
+  @JsonKey(
+    includeIfNull: false,
+    toJson: LocalizedTag.objToJson,
+  )
   LocalizedTag? recycling;
 
   /// Number of units of this component contained in the product.

diff --git a/lib/src/model/product_packaging.g.dart b/lib/src/model/product_packaging.g.dart
diff --git a/test/issue752_test.dart b/test/issue752_test.dart
diff --git a/test/json_conversion_test.dart b/test/json_conversion_test.dart
@@ -0,0 +1,20 @@
+import 'package:openfoodfacts/openfoodfacts.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('ProductPackaging bug - covers issues #752 and #765', () {
+    const expectedProductName = 'Orange';
+    final testProduct = Product()..productName = expectedProductName;
+    const expectedQuantity = '75cl';
+    final packing = ProductPackaging()..quantityPerUnit = expectedQuantity;
+    const expectedId = '4';
+    packing.shape = LocalizedTag()..id = expectedId;
+    testProduct.packagings = [packing];
+    final productJson = testProduct.toJson();
+    final productRestored = Product.fromJson(productJson);
+    expect(productRestored.productName, expectedProductName);
+    final packingRestored = productRestored.packagings!.first;
+    expect(packingRestored.quantityPerUnit, expectedQuantity);
+    expect(packingRestored.shape!.id, expectedId);
+  });
+}