fix: Allow some ProductPackaging fields to accept string and JSON map (…

…openfoodfacts#977)
Rujitsuki · Sep 27, 2024 · 3a47327 · 3a47327
1 parent da2ef05
commit 3a47327
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/lib/src/model/product_packaging.dart b/lib/src/model/product_packaging.dart
@@ -1,5 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'localized_tag.dart';
+import '../utils/json_helper.dart';
 import '../interface/json_object.dart';
 
 part 'product_packaging.g.dart';
@@ -10,20 +11,23 @@ class ProductPackaging extends JsonObject {
   /// Shape, canonicalized using [TaxonomyPackagingShape].
   @JsonKey(
     includeIfNull: false,
+    fromJson: JsonHelper.localizedTagFromJson,
     toJson: LocalizedTag.objToJson,
   )
   LocalizedTag? shape;
 
   /// Material, canonicalized using [TaxonomyPackagingMaterial].
   @JsonKey(
     includeIfNull: false,
+    fromJson: JsonHelper.localizedTagFromJson,
     toJson: LocalizedTag.objToJson,
   )
   LocalizedTag? material;
 
   /// Recycling status, canonicalized using [TaxonomyPackagingRecycling].
   @JsonKey(
     includeIfNull: false,
+    fromJson: JsonHelper.localizedTagFromJson,
     toJson: LocalizedTag.objToJson,
   )
   LocalizedTag? recycling;

diff --git a/lib/src/model/product_packaging.g.dart b/lib/src/model/product_packaging.g.dart
diff --git a/lib/src/utils/json_helper.dart b/lib/src/utils/json_helper.dart
@@ -1,6 +1,7 @@
 import '../interface/json_object.dart';
 import '../model/attribute_group.dart';
 import '../model/ingredient.dart';
+import '../model/localized_tag.dart';
 import '../model/product_image.dart';
 import '../model/product_packaging.dart';
 import '../utils/language_helper.dart';
@@ -378,6 +379,16 @@ class JsonHelper {
     return result;
   }
 
+  /// Returns a [LocalizedTag] from JSON map or String
+  static LocalizedTag? localizedTagFromJson(dynamic json) {
+    if (json is Map<String, dynamic>) {
+      return LocalizedTag.fromJson(json);
+    } else if (json is String) {
+      return LocalizedTag()..name = json;
+    }
+    return null;
+  }
+
   /// Returns a JSON map from [AttributeGroup]s
   static List<Map<String, dynamic>>? attributeGroupsToJson(
       List<AttributeGroup>? list) {