diff --git a/lib/src/folksonomy.dart b/lib/src/folksonomy.dart index afb62dcd2a..a8178b50ee 100644 --- a/lib/src/folksonomy.dart +++ b/lib/src/folksonomy.dart @@ -200,39 +200,6 @@ class FolksonomyAPIClient { return ProductTag.fromJson(json); } - /// Returns all the [ProductTag]s for this product, with their subkeys. - /// - /// The key of the returned map is the key. - // TODO: deprecated from 2024-09-05; remove when old enough - @Deprecated('Not supported anymore; use getProductTags instead') - static Future> getProductTagWithSubKeys({ - required final String barcode, - required final String key, - final UriHelper uriHelper = uriHelperFolksonomyProd, - }) async { - final Map parameters = {}; - final Response response = await HttpHelper().doGetRequest( - uriHelper.getUri( - path: 'product/$barcode/$key*', // look at the star! - queryParameters: parameters, - ), - uriHelper: uriHelper, - ); - _checkResponse(response); - final Map result = {}; - if (response.body == 'null') { - // not found - return result; - } - final List json = - HttpHelper().jsonDecode(response.body) as List; - for (var element in json) { - final ProductTag productTag = ProductTag.fromJson(element); - result[productTag.key] = productTag; - } - return result; - } - static Future> deleteProductTag({ required final String barcode, required final String key, diff --git a/lib/src/model/agribalyse.g.dart b/lib/src/model/agribalyse.g.dart index 0419d81a43..2092a8fd5a 100644 --- a/lib/src/model/agribalyse.g.dart +++ b/lib/src/model/agribalyse.g.dart @@ -10,15 +10,7 @@ Agribalyse _$AgribalyseFromJson(Map json) => Agribalyse( score: JsonObject.parseDouble(json['score']), ); -Map _$AgribalyseToJson(Agribalyse instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('score', instance.score); - return val; -} +Map _$AgribalyseToJson(Agribalyse instance) => + { + if (instance.score case final value?) 'score': value, + }; diff --git a/lib/src/model/ecoscore_adjustments.g.dart b/lib/src/model/ecoscore_adjustments.g.dart index 83dc4a53bf..d6dfb29e7b 100644 --- a/lib/src/model/ecoscore_adjustments.g.dart +++ b/lib/src/model/ecoscore_adjustments.g.dart @@ -17,17 +17,10 @@ EcoscoreAdjustments _$EcoscoreAdjustmentsFromJson(Map json) => json['origins_of_ingredients'] as Map), ); -Map _$EcoscoreAdjustmentsToJson(EcoscoreAdjustments instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('packaging', instance.packaging?.toJson()); - writeNotNull( - 'origins_of_ingredients', instance.originsOfIngredients?.toJson()); - return val; -} +Map _$EcoscoreAdjustmentsToJson( + EcoscoreAdjustments instance) => + { + if (instance.packaging?.toJson() case final value?) 'packaging': value, + if (instance.originsOfIngredients?.toJson() case final value?) + 'origins_of_ingredients': value, + }; diff --git a/lib/src/model/ecoscore_data.g.dart b/lib/src/model/ecoscore_data.g.dart index 7ea3ac5344..533315b886 100644 --- a/lib/src/model/ecoscore_data.g.dart +++ b/lib/src/model/ecoscore_data.g.dart @@ -22,23 +22,17 @@ EcoscoreData _$EcoscoreDataFromJson(Map json) => EcoscoreData( : JsonObject.parseBool(json['missing_data_warning']), ); -Map _$EcoscoreDataToJson(EcoscoreData instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('grade', instance.grade); - writeNotNull('score', instance.score); - writeNotNull('status', _$EcoscoreStatusEnumMap[instance.status]); - writeNotNull('agribalyse', instance.agribalyse?.toJson()); - writeNotNull('adjustments', instance.adjustments?.toJson()); - val['missing_data_warning'] = instance.missingDataWarning; - return val; -} +Map _$EcoscoreDataToJson(EcoscoreData instance) => + { + if (instance.grade case final value?) 'grade': value, + if (instance.score case final value?) 'score': value, + if (_$EcoscoreStatusEnumMap[instance.status] case final value?) + 'status': value, + if (instance.agribalyse?.toJson() case final value?) 'agribalyse': value, + if (instance.adjustments?.toJson() case final value?) + 'adjustments': value, + 'missing_data_warning': instance.missingDataWarning, + }; const _$EcoscoreStatusEnumMap = { EcoscoreStatus.KNOWN: 'known', diff --git a/lib/src/model/ingredient.g.dart b/lib/src/model/ingredient.g.dart index 0e639cd840..7b769231ac 100644 --- a/lib/src/model/ingredient.g.dart +++ b/lib/src/model/ingredient.g.dart @@ -23,28 +23,24 @@ Ingredient _$IngredientFromJson(Map json) => Ingredient( bold: json['bold'] as bool? ?? false, ); -Map _$IngredientToJson(Ingredient instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('rank', instance.rank); - writeNotNull('id', instance.id); - val['text'] = instance.text; - writeNotNull('is_in_taxonomy', instance.isInTaxonomy); - writeNotNull('percent', instance.percent); - writeNotNull('percent_estimate', instance.percentEstimate); - writeNotNull('vegan', ingredientSpecialPropertyStatusToJson(instance.vegan)); - writeNotNull( - 'vegetarian', ingredientSpecialPropertyStatusToJson(instance.vegetarian)); - writeNotNull('from_palm_oil', - ingredientSpecialPropertyStatusToJson(instance.fromPalmOil)); - writeNotNull( - 'ingredients', JsonHelper.ingredientsToJson(instance.ingredients)); - val['bold'] = instance.bold; - return val; -} +Map _$IngredientToJson(Ingredient instance) => + { + if (instance.rank case final value?) 'rank': value, + if (instance.id case final value?) 'id': value, + 'text': instance.text, + if (instance.isInTaxonomy case final value?) 'is_in_taxonomy': value, + if (instance.percent case final value?) 'percent': value, + if (instance.percentEstimate case final value?) 'percent_estimate': value, + if (ingredientSpecialPropertyStatusToJson(instance.vegan) + case final value?) + 'vegan': value, + if (ingredientSpecialPropertyStatusToJson(instance.vegetarian) + case final value?) + 'vegetarian': value, + if (ingredientSpecialPropertyStatusToJson(instance.fromPalmOil) + case final value?) + 'from_palm_oil': value, + if (JsonHelper.ingredientsToJson(instance.ingredients) case final value?) + 'ingredients': value, + 'bold': instance.bold, + }; diff --git a/lib/src/model/localized_tag.g.dart b/lib/src/model/localized_tag.g.dart index c6a9b87e2b..3b99f7b5a7 100644 --- a/lib/src/model/localized_tag.g.dart +++ b/lib/src/model/localized_tag.g.dart @@ -11,17 +11,9 @@ LocalizedTag _$LocalizedTagFromJson(Map json) => LocalizedTag() ..name = json['name'] as String? ..lcName = json['lc_name'] as String?; -Map _$LocalizedTagToJson(LocalizedTag instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('id', instance.id); - writeNotNull('name', instance.name); - writeNotNull('lc_name', instance.lcName); - return val; -} +Map _$LocalizedTagToJson(LocalizedTag instance) => + { + if (instance.id case final value?) 'id': value, + if (instance.name case final value?) 'name': value, + if (instance.lcName case final value?) 'lc_name': value, + }; diff --git a/lib/src/model/login_status.dart b/lib/src/model/login_status.dart index 9a2b9ce6e2..1b1468eab5 100644 --- a/lib/src/model/login_status.dart +++ b/lib/src/model/login_status.dart @@ -41,9 +41,6 @@ class LoginStatus { final int status; final String statusVerbose; - // TODO: deprecated from 2024-04-09; remove when old enough - @Deprecated('Not retrieved anymore from the server') - final String? userEmail = null; final String? userName; final String? userId; final OpenFoodFactsLanguage? preferredLanguage; diff --git a/lib/src/model/ordered_nutrient.g.dart b/lib/src/model/ordered_nutrient.g.dart index 7043670ea9..421849a792 100644 --- a/lib/src/model/ordered_nutrient.g.dart +++ b/lib/src/model/ordered_nutrient.g.dart @@ -17,20 +17,11 @@ OrderedNutrient _$OrderedNutrientFromJson(Map json) => .toList(), ); -Map _$OrderedNutrientToJson(OrderedNutrient instance) { - final val = { - 'id': instance.id, - }; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('name', instance.name); - val['important'] = instance.important; - val['display_in_edit_form'] = instance.displayInEditForm; - writeNotNull('nutrients', instance.subNutrients); - return val; -} +Map _$OrderedNutrientToJson(OrderedNutrient instance) => + { + 'id': instance.id, + if (instance.name case final value?) 'name': value, + 'important': instance.important, + 'display_in_edit_form': instance.displayInEditForm, + if (instance.subNutrients case final value?) 'nutrients': value, + }; diff --git a/lib/src/model/origins_of_ingredients.g.dart b/lib/src/model/origins_of_ingredients.g.dart index 13d7691c54..2d13f86e33 100644 --- a/lib/src/model/origins_of_ingredients.g.dart +++ b/lib/src/model/origins_of_ingredients.g.dart @@ -16,18 +16,12 @@ OriginsOfIngredients _$OriginsOfIngredientsFromJson( ); Map _$OriginsOfIngredientsToJson( - OriginsOfIngredients instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('epi_score', instance.epiScore); - writeNotNull('epi_value', instance.epiValue); - writeNotNull('transportation_score', instance.transportationScore); - writeNotNull('transportation_value', instance.transportationValue); - return val; -} + OriginsOfIngredients instance) => + { + if (instance.epiScore case final value?) 'epi_score': value, + if (instance.epiValue case final value?) 'epi_value': value, + if (instance.transportationScore case final value?) + 'transportation_score': value, + if (instance.transportationValue case final value?) + 'transportation_value': value, + }; diff --git a/lib/src/model/packaging.g.dart b/lib/src/model/packaging.g.dart index 47d7a06c31..2b6bee2096 100644 --- a/lib/src/model/packaging.g.dart +++ b/lib/src/model/packaging.g.dart @@ -11,16 +11,7 @@ Packaging _$PackagingFromJson(Map json) => Packaging( value: JsonObject.parseDouble(json['value']), ); -Map _$PackagingToJson(Packaging instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('value', instance.value); - writeNotNull('score', instance.score); - return val; -} +Map _$PackagingToJson(Packaging instance) => { + if (instance.value case final value?) 'value': value, + if (instance.score case final value?) 'score': value, + }; diff --git a/lib/src/model/product.g.dart b/lib/src/model/product.g.dart index fc3ee6b2e2..c28002c6ff 100644 --- a/lib/src/model/product.g.dart +++ b/lib/src/model/product.g.dart @@ -201,160 +201,195 @@ Product _$ProductFromJson(Map json) => Product( ..owner = json['owner'] as String? ..expirationDate = json['expiration_date'] as String?; -Map _$ProductToJson(Product instance) { - final val = { - 'code': instance.barcode, - }; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('product_type', _$ProductTypeEnumMap[instance.productType]); - writeNotNull('product_name', instance.productName); - writeNotNull('product_name_in_languages', - LanguageHelper.toJsonStringMap(instance.productNameInLanguages)); - writeNotNull( - 'conservation_conditions_in_languages', - LanguageHelper.toJsonStringMap( - instance.conservationConditionsInLanguages)); - writeNotNull('customer_service_in_languages', - LanguageHelper.toJsonStringMap(instance.customerServiceInLanguages)); - writeNotNull('generic_name', instance.genericName); - writeNotNull('generic_name_in_languages', - LanguageHelper.toJsonStringMap(instance.genericNameInLanguages)); - writeNotNull('abbreviated_product_name', instance.abbreviatedName); - writeNotNull('abbreviated_product_name_in_languages', - LanguageHelper.toJsonStringMap(instance.abbreviatedNameInLanguages)); - writeNotNull('brands', instance.brands); - writeNotNull('brands_tags', instance.brandsTags); - writeNotNull('brands_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.brandsTagsInLanguages)); - writeNotNull('countries', instance.countries); - writeNotNull('countries_tags', instance.countriesTags); - writeNotNull('countries_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.countriesTagsInLanguages)); - val['lang'] = LanguageHelper.toJson(instance.lang); - writeNotNull('quantity', instance.quantity); - writeNotNull('image_front_url', instance.imageFrontUrl); - writeNotNull('image_front_small_url', instance.imageFrontSmallUrl); - writeNotNull('image_ingredients_url', instance.imageIngredientsUrl); - writeNotNull( - 'image_ingredients_small_url', instance.imageIngredientsSmallUrl); - writeNotNull('image_nutrition_url', instance.imageNutritionUrl); - writeNotNull('image_nutrition_small_url', instance.imageNutritionSmallUrl); - writeNotNull('image_packaging_url', instance.imagePackagingUrl); - writeNotNull('image_packaging_small_url', instance.imagePackagingSmallUrl); - writeNotNull('serving_size', instance.servingSize); - writeNotNull('serving_quantity', instance.servingQuantity); - writeNotNull('product_quantity', instance.packagingQuantity); - val['selected_images'] = - JsonHelper.selectedImagesToJson(instance.selectedImages); - val['images'] = JsonHelper.allImagesToJson(instance.images); - writeNotNull( - 'ingredients', JsonHelper.ingredientsToJson(instance.ingredients)); - writeNotNull('ingredients_text', instance.ingredientsText); - writeNotNull('ingredients_text_in_languages', - LanguageHelper.toJsonStringMap(instance.ingredientsTextInLanguages)); - writeNotNull('ingredients_tags', instance.ingredientsTags); - writeNotNull('ingredients_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.ingredientsTagsInLanguages)); - val['imagesFreshnessInLanguages'] = instance.imagesFreshnessInLanguages?.map( - (k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, - e.map((k, e) => MapEntry(_$ImageFieldEnumMap[k]!, e)))); - val['ingredients_analysis_tags'] = - IngredientsAnalysisTags.toJson(instance.ingredientsAnalysisTags); - writeNotNull( - 'ingredients_analysis_tags_in_languages', - LanguageHelper.toJsonStringsListMap( - instance.ingredientsAnalysisTagsInLanguages)); - writeNotNull('additives_tags', Additives.additivesToJson(instance.additives)); - writeNotNull('additives_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.additivesTagsInLanguages)); - writeNotNull('allergens_tags', Allergens.allergensToJson(instance.allergens)); - writeNotNull('allergens_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.allergensTagsInLanguages)); - writeNotNull( - 'nutrient_levels', NutrientLevels.toJson(instance.nutrientLevels)); - writeNotNull('nutriment_energy_unit', instance.nutrimentEnergyUnit); - val['nutrition_data'] = JsonHelper.checkboxToJSON(instance.nutritionData); - writeNotNull('nutrition_data_per', instance.nutrimentDataPer); - writeNotNull('nutrition_grade_fr', instance.nutriscore); - writeNotNull('compared_to_category', instance.comparedToCategory); - writeNotNull('categories', instance.categories); - writeNotNull('categories_tags', instance.categoriesTags); - writeNotNull('categories_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.categoriesTagsInLanguages)); - writeNotNull('labels', instance.labels); - writeNotNull('labels_tags', instance.labelsTags); - writeNotNull('labels_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.labelsTagsInLanguages)); - writeNotNull('packaging', instance.packaging); - writeNotNull( - 'packagings', JsonHelper.productPackagingsToJson(instance.packagings)); - val['packagings_complete'] = - JsonHelper.boolToJSON(instance.packagingsComplete); - writeNotNull('packaging_tags', instance.packagingTags); - writeNotNull('packaging_text_in_languages', - LanguageHelper.toJsonStringMap(instance.packagingTextInLanguages)); - writeNotNull('misc_tags', instance.miscTags); - writeNotNull('misc_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.miscTagsInLanguages)); - writeNotNull('states_tags', instance.statesTags); - writeNotNull('states_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.statesTagsInLanguages)); - writeNotNull('traces_tags', instance.tracesTags); - writeNotNull('traces_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.tracesTagsInLanguages)); - writeNotNull('traces', instance.traces); - writeNotNull('stores_tags', instance.storesTags); - writeNotNull('stores_tags_in_languages', - LanguageHelper.toJsonStringsListMap(instance.storesTagsInLanguages)); - writeNotNull('stores', instance.stores); - writeNotNull('attribute_groups', - JsonHelper.attributeGroupsToJson(instance.attributeGroups)); - writeNotNull( - 'last_modified_t', JsonHelper.dateToTimestamp(instance.lastModified)); - writeNotNull('last_modified_by', instance.lastModifiedBy); - writeNotNull('last_image_t', JsonHelper.dateToTimestamp(instance.lastImage)); - writeNotNull('last_editor', instance.lastEditor); - writeNotNull('entry_dates_tags', instance.entryDates); - writeNotNull('last_check_dates_tags', instance.lastCheckDates); - writeNotNull('last_edit_dates_tags', instance.lastEditDates); - writeNotNull('last_image_dates_tags', instance.lastImageDates); - writeNotNull( - 'last_checked_t', JsonHelper.dateToTimestamp(instance.lastChecked)); - writeNotNull('last_checker', instance.lastChecker); - writeNotNull('created_t', JsonHelper.dateToTimestamp(instance.created)); - writeNotNull('creator', instance.creator); - writeNotNull('editors_tags', instance.editors); - writeNotNull('ecoscore_grade', instance.ecoscoreGrade); - writeNotNull('ecoscore_score', instance.ecoscoreScore); - writeNotNull( - 'ecoscore_data', EcoscoreData.toJsonHelper(instance.ecoscoreData)); - writeNotNull('knowledge_panels', - KnowledgePanels.toJsonHelper(instance.knowledgePanels)); - writeNotNull('emb_codes', instance.embCodes); - writeNotNull('manufacturing_places', instance.manufacturingPlaces); - writeNotNull('origins', instance.origins); - writeNotNull('nova_group', instance.novaGroup); - writeNotNull('link', instance.website); - writeNotNull('data_quality_tags', instance.dataQualityTags); - writeNotNull('data_quality_bugs_tags', instance.dataQualityBugsTags); - writeNotNull('data_quality_errors_tags', instance.dataQualityErrorsTags); - writeNotNull('data_quality_info_tags', instance.dataQualityInfoTags); - writeNotNull('data_quality_warnings_tags', instance.dataQualityWarningsTags); - val['obsolete'] = JsonHelper.checkboxToJSON(instance.obsolete); - writeNotNull('owner_fields', instance.ownerFields); - writeNotNull('owner', instance.owner); - writeNotNull('expiration_date', instance.expirationDate); - val['no_nutrition_data'] = - JsonHelper.checkboxToJSON(instance.noNutritionData); - val['nutriments'] = Nutriments.toJsonHelper(instance.nutriments); - return val; -} +Map _$ProductToJson(Product instance) => { + 'code': instance.barcode, + if (_$ProductTypeEnumMap[instance.productType] case final value?) + 'product_type': value, + if (instance.productName case final value?) 'product_name': value, + if (LanguageHelper.toJsonStringMap(instance.productNameInLanguages) + case final value?) + 'product_name_in_languages': value, + if (LanguageHelper.toJsonStringMap( + instance.conservationConditionsInLanguages) + case final value?) + 'conservation_conditions_in_languages': value, + if (LanguageHelper.toJsonStringMap(instance.customerServiceInLanguages) + case final value?) + 'customer_service_in_languages': value, + if (instance.genericName case final value?) 'generic_name': value, + if (LanguageHelper.toJsonStringMap(instance.genericNameInLanguages) + case final value?) + 'generic_name_in_languages': value, + if (instance.abbreviatedName case final value?) + 'abbreviated_product_name': value, + if (LanguageHelper.toJsonStringMap(instance.abbreviatedNameInLanguages) + case final value?) + 'abbreviated_product_name_in_languages': value, + if (instance.brands case final value?) 'brands': value, + if (instance.brandsTags case final value?) 'brands_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.brandsTagsInLanguages) + case final value?) + 'brands_tags_in_languages': value, + if (instance.countries case final value?) 'countries': value, + if (instance.countriesTags case final value?) 'countries_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.countriesTagsInLanguages) + case final value?) + 'countries_tags_in_languages': value, + 'lang': LanguageHelper.toJson(instance.lang), + if (instance.quantity case final value?) 'quantity': value, + if (instance.imageFrontUrl case final value?) 'image_front_url': value, + if (instance.imageFrontSmallUrl case final value?) + 'image_front_small_url': value, + if (instance.imageIngredientsUrl case final value?) + 'image_ingredients_url': value, + if (instance.imageIngredientsSmallUrl case final value?) + 'image_ingredients_small_url': value, + if (instance.imageNutritionUrl case final value?) + 'image_nutrition_url': value, + if (instance.imageNutritionSmallUrl case final value?) + 'image_nutrition_small_url': value, + if (instance.imagePackagingUrl case final value?) + 'image_packaging_url': value, + if (instance.imagePackagingSmallUrl case final value?) + 'image_packaging_small_url': value, + if (instance.servingSize case final value?) 'serving_size': value, + if (instance.servingQuantity case final value?) 'serving_quantity': value, + if (instance.packagingQuantity case final value?) + 'product_quantity': value, + 'selected_images': + JsonHelper.selectedImagesToJson(instance.selectedImages), + 'images': JsonHelper.allImagesToJson(instance.images), + if (JsonHelper.ingredientsToJson(instance.ingredients) case final value?) + 'ingredients': value, + if (instance.ingredientsText case final value?) 'ingredients_text': value, + if (LanguageHelper.toJsonStringMap(instance.ingredientsTextInLanguages) + case final value?) + 'ingredients_text_in_languages': value, + if (instance.ingredientsTags case final value?) 'ingredients_tags': value, + if (LanguageHelper.toJsonStringsListMap( + instance.ingredientsTagsInLanguages) + case final value?) + 'ingredients_tags_in_languages': value, + 'imagesFreshnessInLanguages': instance.imagesFreshnessInLanguages?.map( + (k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, + e.map((k, e) => MapEntry(_$ImageFieldEnumMap[k]!, e)))), + 'ingredients_analysis_tags': + IngredientsAnalysisTags.toJson(instance.ingredientsAnalysisTags), + if (LanguageHelper.toJsonStringsListMap( + instance.ingredientsAnalysisTagsInLanguages) + case final value?) + 'ingredients_analysis_tags_in_languages': value, + if (Additives.additivesToJson(instance.additives) case final value?) + 'additives_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.additivesTagsInLanguages) + case final value?) + 'additives_tags_in_languages': value, + if (Allergens.allergensToJson(instance.allergens) case final value?) + 'allergens_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.allergensTagsInLanguages) + case final value?) + 'allergens_tags_in_languages': value, + if (NutrientLevels.toJson(instance.nutrientLevels) case final value?) + 'nutrient_levels': value, + if (instance.nutrimentEnergyUnit case final value?) + 'nutriment_energy_unit': value, + 'nutrition_data': JsonHelper.checkboxToJSON(instance.nutritionData), + if (instance.nutrimentDataPer case final value?) + 'nutrition_data_per': value, + if (instance.nutriscore case final value?) 'nutrition_grade_fr': value, + if (instance.comparedToCategory case final value?) + 'compared_to_category': value, + if (instance.categories case final value?) 'categories': value, + if (instance.categoriesTags case final value?) 'categories_tags': value, + if (LanguageHelper.toJsonStringsListMap( + instance.categoriesTagsInLanguages) + case final value?) + 'categories_tags_in_languages': value, + if (instance.labels case final value?) 'labels': value, + if (instance.labelsTags case final value?) 'labels_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.labelsTagsInLanguages) + case final value?) + 'labels_tags_in_languages': value, + if (instance.packaging case final value?) 'packaging': value, + if (JsonHelper.productPackagingsToJson(instance.packagings) + case final value?) + 'packagings': value, + 'packagings_complete': JsonHelper.boolToJSON(instance.packagingsComplete), + if (instance.packagingTags case final value?) 'packaging_tags': value, + if (LanguageHelper.toJsonStringMap(instance.packagingTextInLanguages) + case final value?) + 'packaging_text_in_languages': value, + if (instance.miscTags case final value?) 'misc_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.miscTagsInLanguages) + case final value?) + 'misc_tags_in_languages': value, + if (instance.statesTags case final value?) 'states_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.statesTagsInLanguages) + case final value?) + 'states_tags_in_languages': value, + if (instance.tracesTags case final value?) 'traces_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.tracesTagsInLanguages) + case final value?) + 'traces_tags_in_languages': value, + if (instance.traces case final value?) 'traces': value, + if (instance.storesTags case final value?) 'stores_tags': value, + if (LanguageHelper.toJsonStringsListMap(instance.storesTagsInLanguages) + case final value?) + 'stores_tags_in_languages': value, + if (instance.stores case final value?) 'stores': value, + if (JsonHelper.attributeGroupsToJson(instance.attributeGroups) + case final value?) + 'attribute_groups': value, + if (JsonHelper.dateToTimestamp(instance.lastModified) case final value?) + 'last_modified_t': value, + if (instance.lastModifiedBy case final value?) 'last_modified_by': value, + if (JsonHelper.dateToTimestamp(instance.lastImage) case final value?) + 'last_image_t': value, + if (instance.lastEditor case final value?) 'last_editor': value, + if (instance.entryDates case final value?) 'entry_dates_tags': value, + if (instance.lastCheckDates case final value?) + 'last_check_dates_tags': value, + if (instance.lastEditDates case final value?) + 'last_edit_dates_tags': value, + if (instance.lastImageDates case final value?) + 'last_image_dates_tags': value, + if (JsonHelper.dateToTimestamp(instance.lastChecked) case final value?) + 'last_checked_t': value, + if (instance.lastChecker case final value?) 'last_checker': value, + if (JsonHelper.dateToTimestamp(instance.created) case final value?) + 'created_t': value, + if (instance.creator case final value?) 'creator': value, + if (instance.editors case final value?) 'editors_tags': value, + if (instance.ecoscoreGrade case final value?) 'ecoscore_grade': value, + if (instance.ecoscoreScore case final value?) 'ecoscore_score': value, + if (EcoscoreData.toJsonHelper(instance.ecoscoreData) case final value?) + 'ecoscore_data': value, + if (KnowledgePanels.toJsonHelper(instance.knowledgePanels) + case final value?) + 'knowledge_panels': value, + if (instance.embCodes case final value?) 'emb_codes': value, + if (instance.manufacturingPlaces case final value?) + 'manufacturing_places': value, + if (instance.origins case final value?) 'origins': value, + if (instance.novaGroup case final value?) 'nova_group': value, + if (instance.website case final value?) 'link': value, + if (instance.dataQualityTags case final value?) + 'data_quality_tags': value, + if (instance.dataQualityBugsTags case final value?) + 'data_quality_bugs_tags': value, + if (instance.dataQualityErrorsTags case final value?) + 'data_quality_errors_tags': value, + if (instance.dataQualityInfoTags case final value?) + 'data_quality_info_tags': value, + if (instance.dataQualityWarningsTags case final value?) + 'data_quality_warnings_tags': value, + 'obsolete': JsonHelper.checkboxToJSON(instance.obsolete), + if (instance.ownerFields case final value?) 'owner_fields': value, + if (instance.owner case final value?) 'owner': value, + if (instance.expirationDate case final value?) 'expiration_date': value, + 'no_nutrition_data': JsonHelper.checkboxToJSON(instance.noNutritionData), + 'nutriments': Nutriments.toJsonHelper(instance.nutriments), + }; const _$ProductTypeEnumMap = { ProductType.food: 'food', diff --git a/lib/src/model/product_packaging.g.dart b/lib/src/model/product_packaging.g.dart index a243a322af..875568a0ca 100644 --- a/lib/src/model/product_packaging.g.dart +++ b/lib/src/model/product_packaging.g.dart @@ -21,21 +21,13 @@ ProductPackaging _$ProductPackagingFromJson(Map json) => ..quantityPerUnit = json['quantity_per_unit'] as String? ..weightMeasured = JsonObject.parseDouble(json['weight_measured']); -Map _$ProductPackagingToJson(ProductPackaging instance) { - final val = { - 'shape': LocalizedTag.objToJson(instance.shape), - 'material': LocalizedTag.objToJson(instance.material), - 'recycling': LocalizedTag.objToJson(instance.recycling), - }; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('number_of_units', instance.numberOfUnits); - writeNotNull('quantity_per_unit', instance.quantityPerUnit); - writeNotNull('weight_measured', instance.weightMeasured); - return val; -} +Map _$ProductPackagingToJson(ProductPackaging instance) => + { + 'shape': LocalizedTag.objToJson(instance.shape), + 'material': LocalizedTag.objToJson(instance.material), + 'recycling': LocalizedTag.objToJson(instance.recycling), + if (instance.numberOfUnits case final value?) 'number_of_units': value, + if (instance.quantityPerUnit case final value?) + 'quantity_per_unit': value, + if (instance.weightMeasured case final value?) 'weight_measured': value, + }; diff --git a/lib/src/model/product_result_field.g.dart b/lib/src/model/product_result_field.g.dart index 998a198497..0290b1e732 100644 --- a/lib/src/model/product_result_field.g.dart +++ b/lib/src/model/product_result_field.g.dart @@ -13,18 +13,10 @@ ProductResultField _$ProductResultFieldFromJson(Map json) => ..defaultValue = JsonHelper.stringFromJSON(json['default_value']) ..valuedConverted = JsonHelper.stringFromJSON(json['valued_converted']); -Map _$ProductResultFieldToJson(ProductResultField instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('id', instance.id); - writeNotNull('value', instance.value); - writeNotNull('default_value', instance.defaultValue); - writeNotNull('valued_converted', instance.valuedConverted); - return val; -} +Map _$ProductResultFieldToJson(ProductResultField instance) => + { + if (instance.id case final value?) 'id': value, + if (instance.value case final value?) 'value': value, + if (instance.defaultValue case final value?) 'default_value': value, + if (instance.valuedConverted case final value?) 'valued_converted': value, + }; diff --git a/lib/src/model/product_result_field_answer.g.dart b/lib/src/model/product_result_field_answer.g.dart index e889ef8272..100036906c 100644 --- a/lib/src/model/product_result_field_answer.g.dart +++ b/lib/src/model/product_result_field_answer.g.dart @@ -20,17 +20,9 @@ ProductResultFieldAnswer _$ProductResultFieldAnswerFromJson( : LocalizedTag.fromJson(json['message'] as Map); Map _$ProductResultFieldAnswerToJson( - ProductResultFieldAnswer instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('field', instance.field); - writeNotNull('impact', instance.impact); - writeNotNull('message', instance.message); - return val; -} + ProductResultFieldAnswer instance) => + { + if (instance.field case final value?) 'field': value, + if (instance.impact case final value?) 'impact': value, + if (instance.message case final value?) 'message': value, + }; diff --git a/lib/src/model/product_result_v3.g.dart b/lib/src/model/product_result_v3.g.dart index 54a74184f5..0f4977460a 100644 --- a/lib/src/model/product_result_v3.g.dart +++ b/lib/src/model/product_result_v3.g.dart @@ -19,20 +19,12 @@ ProductResultV3 _$ProductResultV3FromJson(Map json) => ? null : Product.fromJson(json['product'] as Map); -Map _$ProductResultV3ToJson(ProductResultV3 instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('code', instance.barcode); - writeNotNull('result', instance.result); - writeNotNull('status', instance.status); - writeNotNull('errors', instance.errors); - writeNotNull('warnings', instance.warnings); - writeNotNull('product', instance.product); - return val; -} +Map _$ProductResultV3ToJson(ProductResultV3 instance) => + { + if (instance.barcode case final value?) 'code': value, + if (instance.result case final value?) 'result': value, + if (instance.status case final value?) 'status': value, + if (instance.errors case final value?) 'errors': value, + if (instance.warnings case final value?) 'warnings': value, + if (instance.product case final value?) 'product': value, + }; diff --git a/lib/src/model/search_result.g.dart b/lib/src/model/search_result.g.dart index 8c053c7501..7463042bb4 100644 --- a/lib/src/model/search_result.g.dart +++ b/lib/src/model/search_result.g.dart @@ -17,21 +17,12 @@ SearchResult _$SearchResultFromJson(Map json) => SearchResult( .toList(), ); -Map _$SearchResultToJson(SearchResult instance) { - final val = { - 'page': instance.page, - 'page_size': instance.pageSize, - 'count': instance.count, - 'page_count': instance.pageCount, - 'skip': instance.skip, - }; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('products', instance.products); - return val; -} +Map _$SearchResultToJson(SearchResult instance) => + { + 'page': instance.page, + 'page_size': instance.pageSize, + 'count': instance.count, + 'page_count': instance.pageCount, + 'skip': instance.skip, + if (instance.products case final value?) 'products': value, + }; diff --git a/lib/src/model/spelling_corrections.g.dart b/lib/src/model/spelling_corrections.g.dart index 3824cf1d21..a185291a50 100644 --- a/lib/src/model/spelling_corrections.g.dart +++ b/lib/src/model/spelling_corrections.g.dart @@ -15,20 +15,12 @@ SpellingCorrection _$SpellingCorrectionFromJson(Map json) => .toList(), ); -Map _$SpellingCorrectionToJson(SpellingCorrection instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('corrected', instance.corrected); - val['text'] = instance.input; - writeNotNull('corrections', instance.termCorrections); - return val; -} +Map _$SpellingCorrectionToJson(SpellingCorrection instance) => + { + if (instance.corrected case final value?) 'corrected': value, + 'text': instance.input, + if (instance.termCorrections case final value?) 'corrections': value, + }; TermCorrections _$TermCorrectionsFromJson(Map json) => TermCorrections( @@ -52,19 +44,11 @@ Correction _$CorrectionFromJson(Map json) => Correction( json['is_valid'] as bool?, ); -Map _$CorrectionToJson(Correction instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('correction', instance.correction); - val['original'] = instance.original; - val['start_offset'] = instance.startOffset; - val['end_offset'] = instance.endOffset; - val['is_valid'] = instance.isValid; - return val; -} +Map _$CorrectionToJson(Correction instance) => + { + if (instance.correction case final value?) 'correction': value, + 'original': instance.original, + 'start_offset': instance.startOffset, + 'end_offset': instance.endOffset, + 'is_valid': instance.isValid, + }; diff --git a/lib/src/model/taxonomy_additive.g.dart b/lib/src/model/taxonomy_additive.g.dart index 4675084471..6fe0b794b4 100644 --- a/lib/src/model/taxonomy_additive.g.dart +++ b/lib/src/model/taxonomy_additive.g.dart @@ -46,74 +46,87 @@ TaxonomyAdditive _$TaxonomyAdditiveFromJson(Map json) => LanguageHelper.fromJsonStringMap(json['wikidata']), ); -Map _$TaxonomyAdditiveToJson(TaxonomyAdditive instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('additives_classes', - LanguageHelper.toJsonStringMap(instance.additivesClasses)); - writeNotNull( - 'carbon_footprint_fr_foodges_ingredient', - LanguageHelper.toJsonStringMap( - instance.carbonFootprintFrFoodgesIngredient)); - writeNotNull('carbon_footprint_fr_foodges_value', - LanguageHelper.toJsonStringMap(instance.carbonFootprintFrFoodgesValue)); - writeNotNull('children', instance.children); - writeNotNull( - 'colour_index', LanguageHelper.toJsonStringMap(instance.colourIndex)); - writeNotNull('comment', LanguageHelper.toJsonStringMap(instance.comment)); - writeNotNull('default_additive_class', - LanguageHelper.toJsonStringMap(instance.defaultAdditiveClass)); - writeNotNull( - 'description', LanguageHelper.toJsonStringMap(instance.description)); - writeNotNull('e_number', LanguageHelper.toJsonStringMap(instance.eNumber)); - writeNotNull('efsa', LanguageHelper.toJsonStringMap(instance.efsa)); - writeNotNull('efsa_evaluation', - LanguageHelper.toJsonStringMap(instance.efsaEvaluation)); - writeNotNull('efsa_evaluation_adi', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdi)); - writeNotNull('efsa_evaluation_adi_established', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdiEstablished)); - writeNotNull('efsa_evaluation_date', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationDate)); - writeNotNull( - 'efsa_evaluation_exposure_95th_greater_than_adi', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposure95thGreaterThanAdi)); - writeNotNull( - 'efsa_evaluation_exposure_95th_greater_than_noael', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposure95thGreaterThanNoael)); - writeNotNull( - 'efsa_evaluation_exposure_mean_greater_than_adi', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposureMeanGreaterThanAdi)); - writeNotNull( - 'efsa_evaluation_exposure_mean_greater_than_noael', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposureMeanGreaterThanNoael)); - writeNotNull('efsa_evaluation_overexposure_risk', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationOverexposureRisk)); - writeNotNull('efsa_evaluation_safety_assessed', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationSafetyAssessed)); - writeNotNull('efsa_evaluation_url', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationUrl)); - writeNotNull( - 'from_palm_oil', LanguageHelper.toJsonStringMap(instance.fromPalmOil)); - writeNotNull('mandatory_additive_class', - LanguageHelper.toJsonStringMap(instance.mandatoryAdditiveClass)); - writeNotNull('name', LanguageHelper.toJsonStringMap(instance.name)); - writeNotNull( - 'organic_eu', LanguageHelper.toJsonStringMap(instance.organicEu)); - writeNotNull('parents', instance.parents); - writeNotNull('vegan', LanguageHelper.toJsonStringMap(instance.vegan)); - writeNotNull( - 'vegetarian', LanguageHelper.toJsonStringMap(instance.vegetarian)); - writeNotNull('wikidata', LanguageHelper.toJsonStringMap(instance.wikidata)); - return val; -} +Map _$TaxonomyAdditiveToJson(TaxonomyAdditive instance) => + { + if (LanguageHelper.toJsonStringMap(instance.additivesClasses) + case final value?) + 'additives_classes': value, + if (LanguageHelper.toJsonStringMap( + instance.carbonFootprintFrFoodgesIngredient) + case final value?) + 'carbon_footprint_fr_foodges_ingredient': value, + if (LanguageHelper.toJsonStringMap(instance.carbonFootprintFrFoodgesValue) + case final value?) + 'carbon_footprint_fr_foodges_value': value, + if (instance.children case final value?) 'children': value, + if (LanguageHelper.toJsonStringMap(instance.colourIndex) + case final value?) + 'colour_index': value, + if (LanguageHelper.toJsonStringMap(instance.comment) case final value?) + 'comment': value, + if (LanguageHelper.toJsonStringMap(instance.defaultAdditiveClass) + case final value?) + 'default_additive_class': value, + if (LanguageHelper.toJsonStringMap(instance.description) + case final value?) + 'description': value, + if (LanguageHelper.toJsonStringMap(instance.eNumber) case final value?) + 'e_number': value, + if (LanguageHelper.toJsonStringMap(instance.efsa) case final value?) + 'efsa': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluation) + case final value?) + 'efsa_evaluation': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdi) + case final value?) + 'efsa_evaluation_adi': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdiEstablished) + case final value?) + 'efsa_evaluation_adi_established': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationDate) + case final value?) + 'efsa_evaluation_date': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposure95thGreaterThanAdi) + case final value?) + 'efsa_evaluation_exposure_95th_greater_than_adi': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposure95thGreaterThanNoael) + case final value?) + 'efsa_evaluation_exposure_95th_greater_than_noael': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposureMeanGreaterThanAdi) + case final value?) + 'efsa_evaluation_exposure_mean_greater_than_adi': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposureMeanGreaterThanNoael) + case final value?) + 'efsa_evaluation_exposure_mean_greater_than_noael': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationOverexposureRisk) + case final value?) + 'efsa_evaluation_overexposure_risk': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationSafetyAssessed) + case final value?) + 'efsa_evaluation_safety_assessed': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationUrl) + case final value?) + 'efsa_evaluation_url': value, + if (LanguageHelper.toJsonStringMap(instance.fromPalmOil) + case final value?) + 'from_palm_oil': value, + if (LanguageHelper.toJsonStringMap(instance.mandatoryAdditiveClass) + case final value?) + 'mandatory_additive_class': value, + if (LanguageHelper.toJsonStringMap(instance.name) case final value?) + 'name': value, + if (LanguageHelper.toJsonStringMap(instance.organicEu) case final value?) + 'organic_eu': value, + if (instance.parents case final value?) 'parents': value, + if (LanguageHelper.toJsonStringMap(instance.vegan) case final value?) + 'vegan': value, + if (LanguageHelper.toJsonStringMap(instance.vegetarian) case final value?) + 'vegetarian': value, + if (LanguageHelper.toJsonStringMap(instance.wikidata) case final value?) + 'wikidata': value, + }; diff --git a/lib/src/model/taxonomy_allergen.g.dart b/lib/src/model/taxonomy_allergen.g.dart index 54f0247374..8cdb193f08 100644 --- a/lib/src/model/taxonomy_allergen.g.dart +++ b/lib/src/model/taxonomy_allergen.g.dart @@ -13,18 +13,13 @@ TaxonomyAllergen _$TaxonomyAllergenFromJson(Map json) => LanguageHelper.fromJsonStringMap(json['wikidata']), ); -Map _$TaxonomyAllergenToJson(TaxonomyAllergen instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('name', LanguageHelper.toJsonStringMap(instance.name)); - writeNotNull( - 'synonyms', LanguageHelper.toJsonStringsListMap(instance.synonyms)); - writeNotNull('wikidata', LanguageHelper.toJsonStringMap(instance.wikidata)); - return val; -} +Map _$TaxonomyAllergenToJson(TaxonomyAllergen instance) => + { + if (LanguageHelper.toJsonStringMap(instance.name) case final value?) + 'name': value, + if (LanguageHelper.toJsonStringsListMap(instance.synonyms) + case final value?) + 'synonyms': value, + if (LanguageHelper.toJsonStringMap(instance.wikidata) case final value?) + 'wikidata': value, + }; diff --git a/lib/src/model/taxonomy_category.g.dart b/lib/src/model/taxonomy_category.g.dart index bf64d84703..d4d7ee1e38 100644 --- a/lib/src/model/taxonomy_category.g.dart +++ b/lib/src/model/taxonomy_category.g.dart @@ -40,65 +40,80 @@ TaxonomyCategory _$TaxonomyCategoryFromJson(Map json) => LanguageHelper.fromJsonStringMap(json['wikidata_wikipedia_category']), ); -Map _$TaxonomyCategoryToJson(TaxonomyCategory instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('agribalyse_food_code', - LanguageHelper.toJsonStringMap(instance.agribalyseFoodCode)); - writeNotNull('agribalyse_food_name', - LanguageHelper.toJsonStringMap(instance.agribalyseFoodName)); - writeNotNull('agribalyse_proxy_food_code', - LanguageHelper.toJsonStringMap(instance.agribalyseProxyFoodCode)); - writeNotNull('agribalyse_proxy_food_name', - LanguageHelper.toJsonStringMap(instance.agribalyseProxyFoodName)); - writeNotNull('agribalyse_proxy_name', - LanguageHelper.toJsonStringMap(instance.agribalyseProxyName)); - writeNotNull( - 'carbon_footprint_fr_foodges_ingredient', - LanguageHelper.toJsonStringMap( - instance.carbonFootprintFrFoodgesIngredient)); - writeNotNull('children', instance.children); - writeNotNull('ciqual_food_code', - LanguageHelper.toJsonStringMap(instance.ciqualFoodCode)); - writeNotNull('ciqual_food_name', - LanguageHelper.toJsonStringMap(instance.ciqualFoodName)); - writeNotNull('ciqual_proxy_food_code', - LanguageHelper.toJsonStringMap(instance.ciqualProxyFoodCode)); - writeNotNull('ciqual_proxy_food_name', - LanguageHelper.toJsonStringMap(instance.ciqualProxyFoodName)); - writeNotNull('country', LanguageHelper.toJsonStringMap(instance.country)); - writeNotNull( - 'grapevariety', LanguageHelper.toJsonStringMap(instance.grapevariety)); - writeNotNull( - 'instanceof', LanguageHelper.toJsonStringMap(instance.instanceof)); - writeNotNull('name', LanguageHelper.toJsonStringMap(instance.name)); - writeNotNull('nova', LanguageHelper.toJsonStringMap(instance.nova)); - writeNotNull( - 'oqali_family', LanguageHelper.toJsonStringMap(instance.oqaliFamily)); - writeNotNull('origins', LanguageHelper.toJsonStringMap(instance.origins)); - writeNotNull('parents', instance.parents); - writeNotNull( - 'pnns_group_1', LanguageHelper.toJsonStringMap(instance.pnnsGroup1)); - writeNotNull( - 'pnns_group_2', LanguageHelper.toJsonStringMap(instance.pnnsGroup2)); - writeNotNull('protected_name_file_number', - LanguageHelper.toJsonStringMap(instance.protectedNameFileNumber)); - writeNotNull('protected_name_type', - LanguageHelper.toJsonStringMap(instance.protectedNameType)); - writeNotNull('region', LanguageHelper.toJsonStringMap(instance.region)); - writeNotNull('season_in_country_fr', - LanguageHelper.toJsonStringMap(instance.seasonInCountryFr)); - writeNotNull('who_id', LanguageHelper.toJsonStringMap(instance.whoId)); - writeNotNull('wikidata', LanguageHelper.toJsonStringMap(instance.wikidata)); - writeNotNull('wikidata_category', - LanguageHelper.toJsonStringMap(instance.wikidataCategory)); - writeNotNull('wikidata_wikipedia_category', - LanguageHelper.toJsonStringMap(instance.wikidataWikipediaCategory)); - return val; -} +Map _$TaxonomyCategoryToJson(TaxonomyCategory instance) => + { + if (LanguageHelper.toJsonStringMap(instance.agribalyseFoodCode) + case final value?) + 'agribalyse_food_code': value, + if (LanguageHelper.toJsonStringMap(instance.agribalyseFoodName) + case final value?) + 'agribalyse_food_name': value, + if (LanguageHelper.toJsonStringMap(instance.agribalyseProxyFoodCode) + case final value?) + 'agribalyse_proxy_food_code': value, + if (LanguageHelper.toJsonStringMap(instance.agribalyseProxyFoodName) + case final value?) + 'agribalyse_proxy_food_name': value, + if (LanguageHelper.toJsonStringMap(instance.agribalyseProxyName) + case final value?) + 'agribalyse_proxy_name': value, + if (LanguageHelper.toJsonStringMap( + instance.carbonFootprintFrFoodgesIngredient) + case final value?) + 'carbon_footprint_fr_foodges_ingredient': value, + if (instance.children case final value?) 'children': value, + if (LanguageHelper.toJsonStringMap(instance.ciqualFoodCode) + case final value?) + 'ciqual_food_code': value, + if (LanguageHelper.toJsonStringMap(instance.ciqualFoodName) + case final value?) + 'ciqual_food_name': value, + if (LanguageHelper.toJsonStringMap(instance.ciqualProxyFoodCode) + case final value?) + 'ciqual_proxy_food_code': value, + if (LanguageHelper.toJsonStringMap(instance.ciqualProxyFoodName) + case final value?) + 'ciqual_proxy_food_name': value, + if (LanguageHelper.toJsonStringMap(instance.country) case final value?) + 'country': value, + if (LanguageHelper.toJsonStringMap(instance.grapevariety) + case final value?) + 'grapevariety': value, + if (LanguageHelper.toJsonStringMap(instance.instanceof) case final value?) + 'instanceof': value, + if (LanguageHelper.toJsonStringMap(instance.name) case final value?) + 'name': value, + if (LanguageHelper.toJsonStringMap(instance.nova) case final value?) + 'nova': value, + if (LanguageHelper.toJsonStringMap(instance.oqaliFamily) + case final value?) + 'oqali_family': value, + if (LanguageHelper.toJsonStringMap(instance.origins) case final value?) + 'origins': value, + if (instance.parents case final value?) 'parents': value, + if (LanguageHelper.toJsonStringMap(instance.pnnsGroup1) case final value?) + 'pnns_group_1': value, + if (LanguageHelper.toJsonStringMap(instance.pnnsGroup2) case final value?) + 'pnns_group_2': value, + if (LanguageHelper.toJsonStringMap(instance.protectedNameFileNumber) + case final value?) + 'protected_name_file_number': value, + if (LanguageHelper.toJsonStringMap(instance.protectedNameType) + case final value?) + 'protected_name_type': value, + if (LanguageHelper.toJsonStringMap(instance.region) case final value?) + 'region': value, + if (LanguageHelper.toJsonStringMap(instance.seasonInCountryFr) + case final value?) + 'season_in_country_fr': value, + if (LanguageHelper.toJsonStringMap(instance.whoId) case final value?) + 'who_id': value, + if (LanguageHelper.toJsonStringMap(instance.wikidata) case final value?) + 'wikidata': value, + if (LanguageHelper.toJsonStringMap(instance.wikidataCategory) + case final value?) + 'wikidata_category': value, + if (LanguageHelper.toJsonStringMap(instance.wikidataWikipediaCategory) + case final value?) + 'wikidata_wikipedia_category': value, + }; diff --git a/lib/src/model/taxonomy_country.g.dart b/lib/src/model/taxonomy_country.g.dart index 9dc3d0c6e1..275bd391dd 100644 --- a/lib/src/model/taxonomy_country.g.dart +++ b/lib/src/model/taxonomy_country.g.dart @@ -20,34 +20,27 @@ TaxonomyCountry _$TaxonomyCountryFromJson(Map json) => ..officialCountryCode2 = LanguageHelper.fromJsonStringMapIsoUnique( json['official_country_code_2']); -Map _$TaxonomyCountryToJson(TaxonomyCountry instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('country_code_2', instance.countryCode2); - writeNotNull('country_code_3', instance.countryCode3); - writeNotNull( - 'language_codes', - instance.languages - ?.map((e) => _$OpenFoodFactsLanguageEnumMap[e]!) - .toList()); - writeNotNull( - 'name', - instance.name - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'synonyms', - instance.synonyms - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull('wikidata', instance.wikidata); - writeNotNull('official_country_code_2', instance.officialCountryCode2); - return val; -} +Map _$TaxonomyCountryToJson(TaxonomyCountry instance) => + { + if (instance.countryCode2 case final value?) 'country_code_2': value, + if (instance.countryCode3 case final value?) 'country_code_3': value, + if (instance.languages + ?.map((e) => _$OpenFoodFactsLanguageEnumMap[e]!) + .toList() + case final value?) + 'language_codes': value, + if (instance.name + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'name': value, + if (instance.synonyms + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'synonyms': value, + if (instance.wikidata case final value?) 'wikidata': value, + if (instance.officialCountryCode2 case final value?) + 'official_country_code_2': value, + }; const _$OpenFoodFactsLanguageEnumMap = { OpenFoodFactsLanguage.ENGLISH: 'ENGLISH', diff --git a/lib/src/model/taxonomy_ingredient.g.dart b/lib/src/model/taxonomy_ingredient.g.dart index 4cf97794bf..b967e676b0 100644 --- a/lib/src/model/taxonomy_ingredient.g.dart +++ b/lib/src/model/taxonomy_ingredient.g.dart @@ -60,95 +60,120 @@ TaxonomyIngredient _$TaxonomyIngredientFromJson(Map json) => LanguageHelper.fromJsonStringMap(json['wiktionary']), ); -Map _$TaxonomyIngredientToJson(TaxonomyIngredient instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('additives_classes', - LanguageHelper.toJsonStringMap(instance.additivesClasses)); - writeNotNull('allergens', LanguageHelper.toJsonStringMap(instance.allergens)); - writeNotNull('brioche', LanguageHelper.toJsonStringMap(instance.brioche)); - writeNotNull( - 'carbon_footprint_fr_foodges_ingredient', - LanguageHelper.toJsonStringMap( - instance.carbonFootprintFrFoodgesIngredient)); - writeNotNull('carbon_footprint_fr_foodges_value', - LanguageHelper.toJsonStringMap(instance.carbonFootprintFrFoodgesValue)); - writeNotNull('children', instance.children); - writeNotNull('ciqual_food_code', - LanguageHelper.toJsonStringMap(instance.ciqualFoodCode)); - writeNotNull('ciqual_food_name', - LanguageHelper.toJsonStringMap(instance.ciqualFoodName)); - writeNotNull( - 'colour_index', LanguageHelper.toJsonStringMap(instance.colourIndex)); - writeNotNull('comment', LanguageHelper.toJsonStringMap(instance.comment)); - writeNotNull('default_additive_class', - LanguageHelper.toJsonStringMap(instance.defaultAdditiveClass)); - writeNotNull( - 'description', LanguageHelper.toJsonStringMap(instance.description)); - writeNotNull('e_number', LanguageHelper.toJsonStringMap(instance.eNumber)); - writeNotNull('efsa', LanguageHelper.toJsonStringMap(instance.efsa)); - writeNotNull('efsa_evaluation', - LanguageHelper.toJsonStringMap(instance.efsaEvaluation)); - writeNotNull('efsa_evaluation_adi', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdi)); - writeNotNull('efsa_evaluation_adi_established', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdiEstablished)); - writeNotNull('efsa_evaluation_date', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationDate)); - writeNotNull( - 'efsa_evaluation_exposure_95_th_greater_than_adi', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposure95ThGreaterThanAdi)); - writeNotNull( - 'efsa_evaluation_exposure_95_th_greater_than_noael', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposure95ThGreaterThanNoael)); - writeNotNull( - 'efsa_evaluation_exposure_mean_greater_than_adi', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposureMeanGreaterThanAdi)); - writeNotNull( - 'efsa_evaluation_exposure_mean_greater_than_noael', - LanguageHelper.toJsonStringMap( - instance.efsaEvaluationExposureMeanGreaterThanNoael)); - writeNotNull('efsa_evaluation_overexposure_risk', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationOverexposureRisk)); - writeNotNull('efsa_evaluation_safety_assessed', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationSafetyAssessed)); - writeNotNull('efsa_evaluation_url', - LanguageHelper.toJsonStringMap(instance.efsaEvaluationUrl)); - writeNotNull( - 'from_palm_oil', LanguageHelper.toJsonStringMap(instance.fromPalmOil)); - writeNotNull('likely_allergens', - LanguageHelper.toJsonStringMap(instance.likelyAllergens)); - writeNotNull('mandatory_additive_class', - LanguageHelper.toJsonStringMap(instance.mandatoryAdditiveClass)); - writeNotNull('name', LanguageHelper.toJsonStringMap(instance.name)); - writeNotNull('nova', LanguageHelper.toJsonStringMap(instance.nova)); - writeNotNull('nutriscore_fruits_vegetables_nuts', - LanguageHelper.toJsonStringMap(instance.nutriscoreFruitsVegetablesNuts)); - writeNotNull( - 'organic_eu', LanguageHelper.toJsonStringMap(instance.organicEu)); - writeNotNull('origins', LanguageHelper.toJsonStringMap(instance.origins)); - writeNotNull('parents', instance.parents); - writeNotNull( - 'pnns_group_2', LanguageHelper.toJsonStringMap(instance.pnnsGroup2)); - writeNotNull('protected_name_type', - LanguageHelper.toJsonStringMap(instance.protectedNameType)); - writeNotNull('reblochon', LanguageHelper.toJsonStringMap(instance.reblochon)); - writeNotNull( - 'synonyms', LanguageHelper.toJsonStringsListMap(instance.synonyms)); - writeNotNull('vegan', LanguageHelper.toJsonStringMap(instance.vegan)); - writeNotNull( - 'vegetarian', LanguageHelper.toJsonStringMap(instance.vegetarian)); - writeNotNull('wikidata', LanguageHelper.toJsonStringMap(instance.wikidata)); - writeNotNull( - 'wiktionary', LanguageHelper.toJsonStringMap(instance.wiktionary)); - return val; -} +Map _$TaxonomyIngredientToJson(TaxonomyIngredient instance) => + { + if (LanguageHelper.toJsonStringMap(instance.additivesClasses) + case final value?) + 'additives_classes': value, + if (LanguageHelper.toJsonStringMap(instance.allergens) case final value?) + 'allergens': value, + if (LanguageHelper.toJsonStringMap(instance.brioche) case final value?) + 'brioche': value, + if (LanguageHelper.toJsonStringMap( + instance.carbonFootprintFrFoodgesIngredient) + case final value?) + 'carbon_footprint_fr_foodges_ingredient': value, + if (LanguageHelper.toJsonStringMap(instance.carbonFootprintFrFoodgesValue) + case final value?) + 'carbon_footprint_fr_foodges_value': value, + if (instance.children case final value?) 'children': value, + if (LanguageHelper.toJsonStringMap(instance.ciqualFoodCode) + case final value?) + 'ciqual_food_code': value, + if (LanguageHelper.toJsonStringMap(instance.ciqualFoodName) + case final value?) + 'ciqual_food_name': value, + if (LanguageHelper.toJsonStringMap(instance.colourIndex) + case final value?) + 'colour_index': value, + if (LanguageHelper.toJsonStringMap(instance.comment) case final value?) + 'comment': value, + if (LanguageHelper.toJsonStringMap(instance.defaultAdditiveClass) + case final value?) + 'default_additive_class': value, + if (LanguageHelper.toJsonStringMap(instance.description) + case final value?) + 'description': value, + if (LanguageHelper.toJsonStringMap(instance.eNumber) case final value?) + 'e_number': value, + if (LanguageHelper.toJsonStringMap(instance.efsa) case final value?) + 'efsa': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluation) + case final value?) + 'efsa_evaluation': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdi) + case final value?) + 'efsa_evaluation_adi': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationAdiEstablished) + case final value?) + 'efsa_evaluation_adi_established': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationDate) + case final value?) + 'efsa_evaluation_date': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposure95ThGreaterThanAdi) + case final value?) + 'efsa_evaluation_exposure_95_th_greater_than_adi': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposure95ThGreaterThanNoael) + case final value?) + 'efsa_evaluation_exposure_95_th_greater_than_noael': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposureMeanGreaterThanAdi) + case final value?) + 'efsa_evaluation_exposure_mean_greater_than_adi': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationExposureMeanGreaterThanNoael) + case final value?) + 'efsa_evaluation_exposure_mean_greater_than_noael': value, + if (LanguageHelper.toJsonStringMap( + instance.efsaEvaluationOverexposureRisk) + case final value?) + 'efsa_evaluation_overexposure_risk': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationSafetyAssessed) + case final value?) + 'efsa_evaluation_safety_assessed': value, + if (LanguageHelper.toJsonStringMap(instance.efsaEvaluationUrl) + case final value?) + 'efsa_evaluation_url': value, + if (LanguageHelper.toJsonStringMap(instance.fromPalmOil) + case final value?) + 'from_palm_oil': value, + if (LanguageHelper.toJsonStringMap(instance.likelyAllergens) + case final value?) + 'likely_allergens': value, + if (LanguageHelper.toJsonStringMap(instance.mandatoryAdditiveClass) + case final value?) + 'mandatory_additive_class': value, + if (LanguageHelper.toJsonStringMap(instance.name) case final value?) + 'name': value, + if (LanguageHelper.toJsonStringMap(instance.nova) case final value?) + 'nova': value, + if (LanguageHelper.toJsonStringMap( + instance.nutriscoreFruitsVegetablesNuts) + case final value?) + 'nutriscore_fruits_vegetables_nuts': value, + if (LanguageHelper.toJsonStringMap(instance.organicEu) case final value?) + 'organic_eu': value, + if (LanguageHelper.toJsonStringMap(instance.origins) case final value?) + 'origins': value, + if (instance.parents case final value?) 'parents': value, + if (LanguageHelper.toJsonStringMap(instance.pnnsGroup2) case final value?) + 'pnns_group_2': value, + if (LanguageHelper.toJsonStringMap(instance.protectedNameType) + case final value?) + 'protected_name_type': value, + if (LanguageHelper.toJsonStringMap(instance.reblochon) case final value?) + 'reblochon': value, + if (LanguageHelper.toJsonStringsListMap(instance.synonyms) + case final value?) + 'synonyms': value, + if (LanguageHelper.toJsonStringMap(instance.vegan) case final value?) + 'vegan': value, + if (LanguageHelper.toJsonStringMap(instance.vegetarian) case final value?) + 'vegetarian': value, + if (LanguageHelper.toJsonStringMap(instance.wikidata) case final value?) + 'wikidata': value, + if (LanguageHelper.toJsonStringMap(instance.wiktionary) case final value?) + 'wiktionary': value, + }; diff --git a/lib/src/model/taxonomy_label.g.dart b/lib/src/model/taxonomy_label.g.dart index da51a2db95..4cf5336777 100644 --- a/lib/src/model/taxonomy_label.g.dart +++ b/lib/src/model/taxonomy_label.g.dart @@ -34,48 +34,60 @@ TaxonomyLabel _$TaxonomyLabelFromJson(Map json) => LanguageHelper.fromJsonStringMap(json['wikidata']), ); -Map _$TaxonomyLabelToJson(TaxonomyLabel instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull( - 'auth_address', LanguageHelper.toJsonStringMap(instance.authAddress)); - writeNotNull('auth_name', LanguageHelper.toJsonStringMap(instance.authName)); - writeNotNull('auth_url', LanguageHelper.toJsonStringMap(instance.authUrl)); - writeNotNull( - 'categories', LanguageHelper.toJsonStringMap(instance.categories)); - writeNotNull('countries_where_sold', - LanguageHelper.toJsonStringMap(instance.countriesWhereSold)); - writeNotNull('children', instance.children); - writeNotNull('country', LanguageHelper.toJsonStringMap(instance.country)); - writeNotNull( - 'description', LanguageHelper.toJsonStringMap(instance.description)); - writeNotNull('eu_groups', LanguageHelper.toJsonStringMap(instance.euGroups)); - writeNotNull( - 'exceptions', LanguageHelper.toJsonStringMap(instance.exceptions)); - writeNotNull('image', LanguageHelper.toJsonStringMap(instance.image)); - writeNotNull('images', LanguageHelper.toJsonStringMap(instance.images)); - writeNotNull( - 'ingredients', LanguageHelper.toJsonStringMap(instance.ingredients)); - writeNotNull('label_categories', - LanguageHelper.toJsonStringMap(instance.labelCategories)); - writeNotNull('manufacturing_places', - LanguageHelper.toJsonStringMap(instance.manufacturingPlaces)); - writeNotNull('name', LanguageHelper.toJsonStringMap(instance.name)); - writeNotNull('opposite', LanguageHelper.toJsonStringMap(instance.opposite)); - writeNotNull('origins', LanguageHelper.toJsonStringMap(instance.origins)); - writeNotNull('packaging', LanguageHelper.toJsonStringMap(instance.packaging)); - writeNotNull('packaging_places', - LanguageHelper.toJsonStringMap(instance.packagingPlaces)); - writeNotNull('parents', instance.parents); - writeNotNull('protected_name_type', - LanguageHelper.toJsonStringMap(instance.protectedNameType)); - writeNotNull('stores', LanguageHelper.toJsonStringMap(instance.stores)); - writeNotNull('wikidata', LanguageHelper.toJsonStringMap(instance.wikidata)); - return val; -} +Map _$TaxonomyLabelToJson(TaxonomyLabel instance) => + { + if (LanguageHelper.toJsonStringMap(instance.authAddress) + case final value?) + 'auth_address': value, + if (LanguageHelper.toJsonStringMap(instance.authName) case final value?) + 'auth_name': value, + if (LanguageHelper.toJsonStringMap(instance.authUrl) case final value?) + 'auth_url': value, + if (LanguageHelper.toJsonStringMap(instance.categories) case final value?) + 'categories': value, + if (LanguageHelper.toJsonStringMap(instance.countriesWhereSold) + case final value?) + 'countries_where_sold': value, + if (instance.children case final value?) 'children': value, + if (LanguageHelper.toJsonStringMap(instance.country) case final value?) + 'country': value, + if (LanguageHelper.toJsonStringMap(instance.description) + case final value?) + 'description': value, + if (LanguageHelper.toJsonStringMap(instance.euGroups) case final value?) + 'eu_groups': value, + if (LanguageHelper.toJsonStringMap(instance.exceptions) case final value?) + 'exceptions': value, + if (LanguageHelper.toJsonStringMap(instance.image) case final value?) + 'image': value, + if (LanguageHelper.toJsonStringMap(instance.images) case final value?) + 'images': value, + if (LanguageHelper.toJsonStringMap(instance.ingredients) + case final value?) + 'ingredients': value, + if (LanguageHelper.toJsonStringMap(instance.labelCategories) + case final value?) + 'label_categories': value, + if (LanguageHelper.toJsonStringMap(instance.manufacturingPlaces) + case final value?) + 'manufacturing_places': value, + if (LanguageHelper.toJsonStringMap(instance.name) case final value?) + 'name': value, + if (LanguageHelper.toJsonStringMap(instance.opposite) case final value?) + 'opposite': value, + if (LanguageHelper.toJsonStringMap(instance.origins) case final value?) + 'origins': value, + if (LanguageHelper.toJsonStringMap(instance.packaging) case final value?) + 'packaging': value, + if (LanguageHelper.toJsonStringMap(instance.packagingPlaces) + case final value?) + 'packaging_places': value, + if (instance.parents case final value?) 'parents': value, + if (LanguageHelper.toJsonStringMap(instance.protectedNameType) + case final value?) + 'protected_name_type': value, + if (LanguageHelper.toJsonStringMap(instance.stores) case final value?) + 'stores': value, + if (LanguageHelper.toJsonStringMap(instance.wikidata) case final value?) + 'wikidata': value, + }; diff --git a/lib/src/model/taxonomy_language.g.dart b/lib/src/model/taxonomy_language.g.dart index 1589777901..e885ea12c1 100644 --- a/lib/src/model/taxonomy_language.g.dart +++ b/lib/src/model/taxonomy_language.g.dart @@ -14,20 +14,16 @@ TaxonomyLanguage _$TaxonomyLanguageFromJson(Map json) => LanguageHelper.fromJsonStringMap(json['wikidata']), ); -Map _$TaxonomyLanguageToJson(TaxonomyLanguage instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('language_code_2', - LanguageHelper.toJsonStringMap(instance.languageCode2)); - writeNotNull('language_code_3', - LanguageHelper.toJsonStringMap(instance.languageCode3)); - writeNotNull('name', LanguageHelper.toJsonStringMap(instance.name)); - writeNotNull('wikidata', LanguageHelper.toJsonStringMap(instance.wikidata)); - return val; -} +Map _$TaxonomyLanguageToJson(TaxonomyLanguage instance) => + { + if (LanguageHelper.toJsonStringMap(instance.languageCode2) + case final value?) + 'language_code_2': value, + if (LanguageHelper.toJsonStringMap(instance.languageCode3) + case final value?) + 'language_code_3': value, + if (LanguageHelper.toJsonStringMap(instance.name) case final value?) + 'name': value, + if (LanguageHelper.toJsonStringMap(instance.wikidata) case final value?) + 'wikidata': value, + }; diff --git a/lib/src/model/taxonomy_nova.g.dart b/lib/src/model/taxonomy_nova.g.dart index 7af85a872f..d8ebb40c0a 100644 --- a/lib/src/model/taxonomy_nova.g.dart +++ b/lib/src/model/taxonomy_nova.g.dart @@ -10,25 +10,17 @@ TaxonomyNova _$TaxonomyNovaFromJson(Map json) => TaxonomyNova() ..name = LanguageHelper.fromJsonStringMap(json['name']) ..synonyms = LanguageHelper.fromJsonStringMapList(json['synonyms']); -Map _$TaxonomyNovaToJson(TaxonomyNova instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull( - 'name', - instance.name - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'synonyms', - instance.synonyms - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - return val; -} +Map _$TaxonomyNovaToJson(TaxonomyNova instance) => + { + if (instance.name + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'name': value, + if (instance.synonyms + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'synonyms': value, + }; const _$OpenFoodFactsLanguageEnumMap = { OpenFoodFactsLanguage.ENGLISH: 'ENGLISH', diff --git a/lib/src/model/taxonomy_origin.g.dart b/lib/src/model/taxonomy_origin.g.dart index 11533a19d3..334bdae685 100644 --- a/lib/src/model/taxonomy_origin.g.dart +++ b/lib/src/model/taxonomy_origin.g.dart @@ -15,27 +15,19 @@ TaxonomyOrigin _$TaxonomyOriginFromJson(Map json) => ..parents = (json['parents'] as List?)?.map((e) => e as String).toList(); -Map _$TaxonomyOriginToJson(TaxonomyOrigin instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull( - 'name', - instance.name - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'synonyms', - instance.synonyms - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull('children', instance.children); - writeNotNull('parents', instance.parents); - return val; -} +Map _$TaxonomyOriginToJson(TaxonomyOrigin instance) => + { + if (instance.name + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'name': value, + if (instance.synonyms + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'synonyms': value, + if (instance.children case final value?) 'children': value, + if (instance.parents case final value?) 'parents': value, + }; const _$OpenFoodFactsLanguageEnumMap = { OpenFoodFactsLanguage.ENGLISH: 'ENGLISH', diff --git a/lib/src/model/taxonomy_packaging.g.dart b/lib/src/model/taxonomy_packaging.g.dart index 215dc37c8c..7bfe4a11fd 100644 --- a/lib/src/model/taxonomy_packaging.g.dart +++ b/lib/src/model/taxonomy_packaging.g.dart @@ -16,20 +16,15 @@ TaxonomyPackaging _$TaxonomyPackagingFromJson(Map json) => ..parents = (json['parents'] as List?)?.map((e) => e as String).toList(); -Map _$TaxonomyPackagingToJson(TaxonomyPackaging instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('name', LanguageHelper.toJsonStringMap(instance.name)); - writeNotNull( - 'synonyms', LanguageHelper.toJsonStringsListMap(instance.synonyms)); - writeNotNull('wikidata', LanguageHelper.toJsonStringMap(instance.wikidata)); - writeNotNull('children', instance.children); - writeNotNull('parents', instance.parents); - return val; -} +Map _$TaxonomyPackagingToJson(TaxonomyPackaging instance) => + { + if (LanguageHelper.toJsonStringMap(instance.name) case final value?) + 'name': value, + if (LanguageHelper.toJsonStringsListMap(instance.synonyms) + case final value?) + 'synonyms': value, + if (LanguageHelper.toJsonStringMap(instance.wikidata) case final value?) + 'wikidata': value, + if (instance.children case final value?) 'children': value, + if (instance.parents case final value?) 'parents': value, + }; diff --git a/lib/src/model/taxonomy_packaging_material.g.dart b/lib/src/model/taxonomy_packaging_material.g.dart index 8e058ae057..ceba49c3f6 100644 --- a/lib/src/model/taxonomy_packaging_material.g.dart +++ b/lib/src/model/taxonomy_packaging_material.g.dart @@ -17,27 +17,19 @@ TaxonomyPackagingMaterial _$TaxonomyPackagingMaterialFromJson( (json['parents'] as List?)?.map((e) => e as String).toList(); Map _$TaxonomyPackagingMaterialToJson( - TaxonomyPackagingMaterial instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull( - 'name', - instance.name - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'synonyms', - instance.synonyms - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull('children', instance.children); - writeNotNull('parents', instance.parents); - return val; -} + TaxonomyPackagingMaterial instance) => + { + if (instance.name + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'name': value, + if (instance.synonyms + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'synonyms': value, + if (instance.children case final value?) 'children': value, + if (instance.parents case final value?) 'parents': value, + }; const _$OpenFoodFactsLanguageEnumMap = { OpenFoodFactsLanguage.ENGLISH: 'ENGLISH', diff --git a/lib/src/model/taxonomy_packaging_recycling.g.dart b/lib/src/model/taxonomy_packaging_recycling.g.dart index a98e4ca066..5d65354d15 100644 --- a/lib/src/model/taxonomy_packaging_recycling.g.dart +++ b/lib/src/model/taxonomy_packaging_recycling.g.dart @@ -19,35 +19,27 @@ TaxonomyPackagingRecycling _$TaxonomyPackagingRecyclingFromJson( (json['parents'] as List?)?.map((e) => e as String).toList(); Map _$TaxonomyPackagingRecyclingToJson( - TaxonomyPackagingRecycling instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull( - 'name', - instance.name - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'synonyms', - instance.synonyms - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'shape', - instance.shape - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'material', - instance.material - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull('children', instance.children); - writeNotNull('parents', instance.parents); - return val; -} + TaxonomyPackagingRecycling instance) => + { + if (instance.name + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'name': value, + if (instance.synonyms + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'synonyms': value, + if (instance.shape + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'shape': value, + if (instance.material + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'material': value, + if (instance.children case final value?) 'children': value, + if (instance.parents case final value?) 'parents': value, + }; const _$OpenFoodFactsLanguageEnumMap = { OpenFoodFactsLanguage.ENGLISH: 'ENGLISH', diff --git a/lib/src/model/taxonomy_packaging_shape.g.dart b/lib/src/model/taxonomy_packaging_shape.g.dart index 4d80a89e95..3fd1bb7e3e 100644 --- a/lib/src/model/taxonomy_packaging_shape.g.dart +++ b/lib/src/model/taxonomy_packaging_shape.g.dart @@ -17,27 +17,19 @@ TaxonomyPackagingShape _$TaxonomyPackagingShapeFromJson( (json['parents'] as List?)?.map((e) => e as String).toList(); Map _$TaxonomyPackagingShapeToJson( - TaxonomyPackagingShape instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull( - 'name', - instance.name - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull( - 'synonyms', - instance.synonyms - ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e))); - writeNotNull('children', instance.children); - writeNotNull('parents', instance.parents); - return val; -} + TaxonomyPackagingShape instance) => + { + if (instance.name + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'name': value, + if (instance.synonyms + ?.map((k, e) => MapEntry(_$OpenFoodFactsLanguageEnumMap[k]!, e)) + case final value?) + 'synonyms': value, + if (instance.children case final value?) 'children': value, + if (instance.parents case final value?) 'parents': value, + }; const _$OpenFoodFactsLanguageEnumMap = { OpenFoodFactsLanguage.ENGLISH: 'ENGLISH', diff --git a/lib/src/model/user.g.dart b/lib/src/model/user.g.dart index 66d7aa8014..81d622ad72 100644 --- a/lib/src/model/user.g.dart +++ b/lib/src/model/user.g.dart @@ -13,18 +13,9 @@ User _$UserFromJson(Map json) => User( cookie: json['cookie'] as String?, ); -Map _$UserToJson(User instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('comment', instance.comment); - val['user_id'] = instance.userId; - val['password'] = instance.password; - val['cookie'] = instance.cookie; - return val; -} +Map _$UserToJson(User instance) => { + if (instance.comment case final value?) 'comment': value, + 'user_id': instance.userId, + 'password': instance.password, + 'cookie': instance.cookie, + }; diff --git a/lib/src/personalized_search/matched_product.dart b/lib/src/personalized_search/matched_product.dart index 17454f8277..99c18ef6b4 100644 --- a/lib/src/personalized_search/matched_product.dart +++ b/lib/src/personalized_search/matched_product.dart @@ -8,12 +8,16 @@ import 'product_preferences_manager.dart'; /// /// cf. https://github.com/openfoodfacts/smooth-app/issues/39 +// TODO: deprecated from 2025-08-20; remove when old enough +@Deprecated('Use MatchedProductStatusV2 instead') enum MatchedProductStatus { YES, NO, UNKNOWN, } +// TODO: deprecated from 2025-08-20; remove when old enough +@Deprecated('Use MatchedProductV2 instead') class MatchedProduct { MatchedProduct( this.product, @@ -67,7 +71,9 @@ class MatchedProduct { String _debug = ''; double get score => _score; + MatchedProductStatus? get status => _status; + String get debug => _debug; static List sort( diff --git a/lib/src/personalized_search/product_preferences_selection.dart b/lib/src/personalized_search/product_preferences_selection.dart index 897e6c4204..5baac2a924 100644 --- a/lib/src/personalized_search/product_preferences_selection.dart +++ b/lib/src/personalized_search/product_preferences_selection.dart @@ -31,7 +31,7 @@ class ProductPreferencesSelection { if (_setImportance == null) { return; } - await _setImportance!(attributeId, importanceId); + await _setImportance(attributeId, importanceId); } /// Gets the importance of an attribute, e.g. from a SharedPreferences. @@ -67,6 +67,6 @@ class ProductPreferencesSelection { if (_notify == null) { return; } - _notify!(); + _notify(); } } diff --git a/lib/src/utils/product_fields.dart b/lib/src/utils/product_fields.dart index d010d7cbb8..b8a411e2ae 100644 --- a/lib/src/utils/product_fields.dart +++ b/lib/src/utils/product_fields.dart @@ -297,41 +297,6 @@ enum ProductField implements OffTagged { } } -// TODO: deprecated from 2024-08-03; remove when old enough -@Deprecated('Use ProductField.getInLanguagesList() instead') -const Set fieldsInLanguages = { - ProductField.NAME_IN_LANGUAGES, - ProductField.GENERIC_NAME_IN_LANGUAGES, - ProductField.ABBREVIATED_NAME_IN_LANGUAGES, - ProductField.INGREDIENTS_TEXT_IN_LANGUAGES, - ProductField.PACKAGING_TEXT_IN_LANGUAGES, - ProductField.CATEGORIES_TAGS_IN_LANGUAGES, - ProductField.TRACES_TAGS_IN_LANGUAGES, - ProductField.STORES_TAGS_IN_LANGUAGES, - ProductField.STATES_TAGS_IN_LANGUAGES, - ProductField.BRANDS_TAGS_IN_LANGUAGES, - ProductField.MISC_TAGS_IN_LANGUAGES, - ProductField.INGREDIENTS_ANALYSIS_TAGS_IN_LANGUAGES, - ProductField.ADDITIVES_TAGS_IN_LANGUAGES, - ProductField.ALLERGENS_TAGS_IN_LANGUAGES, - ProductField.LABELS_TAGS_IN_LANGUAGES, - ProductField.COUNTRIES_TAGS_IN_LANGUAGES, - ProductField.INGREDIENTS_TAGS_IN_LANGUAGES, - ProductField.IMAGES_FRESHNESS_IN_LANGUAGES, -}; - -// TODO: deprecated from 2024-08-03; remove when old enough -@Deprecated('Use ProductField.getAllLanguagesList() instead') -const Set fieldsAllLanguages = { - ProductField.NAME_ALL_LANGUAGES, - ProductField.CUSTOMER_SERVICE_ALL_LANGUAGES, - ProductField.CONSERVATION_CONDITIONS_ALL_LANGUAGES, - ProductField.GENERIC_NAME_ALL_LANGUAGES, - ProductField.ABBREVIATED_NAME_ALL_LANGUAGES, - ProductField.INGREDIENTS_TEXT_ALL_LANGUAGES, - ProductField.PACKAGING_TEXT_ALL_LANGUAGES, -}; - /// NOTE: if one of the fields is IN_LANGUAGES and [languages] is empty - /// the function will throw. List convertFieldsToStrings( diff --git a/pubspec.yaml b/pubspec.yaml index 82b811c31d..e2b02d3578 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ version: 3.24.0 homepage: https://github.com/openfoodfacts/openfoodfacts-dart environment: - sdk: '>=2.17.0 <4.0.0' + sdk: '>=3.5.0 <4.0.0' dependencies: json_annotation: ^4.9.0 @@ -15,9 +15,9 @@ dependencies: meta: ^1.8.0 dev_dependencies: - analyzer: 6.11.0 - build_runner: 2.4.9 - json_serializable: 6.8.0 + analyzer: 7.7.0 + build_runner: 2.5.4 + json_serializable: 6.9.5 lints: ">=3.0.0 <7.0.0" test: 1.26.3 coverage: 1.15.0 diff --git a/test/api_matched_product_v1_test.dart b/test/api_matched_product_v1_test.dart deleted file mode 100644 index bd37a28f1a..0000000000 --- a/test/api_matched_product_v1_test.dart +++ /dev/null @@ -1,105 +0,0 @@ -import 'package:http/http.dart' as http; -import 'package:openfoodfacts/openfoodfacts.dart'; -import 'package:test/test.dart'; - -import 'test_constants.dart'; - -void main() { - const int HTTP_OK = 200; - - OpenFoodAPIConfiguration.userAgent = TestConstants.TEST_USER_AGENT; - - /// Tests around Matched Product v1. - group('$OpenFoodAPIClient matched product v1', () { - test('matched product', () async { - final Map attributeImportances = {}; - int refreshCounter = 0; - final ProductPreferencesManager manager = ProductPreferencesManager( - ProductPreferencesSelection( - setImportance: (String attributeId, String importanceIndex) async { - attributeImportances[attributeId] = importanceIndex; - }, - getImportance: (String attributeId) => - attributeImportances[attributeId] ?? - PreferenceImportance.ID_NOT_IMPORTANT, - notify: () => refreshCounter++, - ), - ); - const OpenFoodFactsLanguage language = OpenFoodFactsLanguage.ENGLISH; - final String languageCode = language.code; - final String importanceUrl = - AvailablePreferenceImportances.getUrl(languageCode); - final String attributeGroupUrl = - AvailableAttributeGroups.getUrl(languageCode); - http.Response response; - response = await http.get(Uri.parse(importanceUrl)); - expect(response.statusCode, HTTP_OK); - final String preferenceImportancesString = response.body; - response = await http.get(Uri.parse(attributeGroupUrl)); - expect(response.statusCode, HTTP_OK); - final String attributeGroupsString = response.body; - manager.availableProductPreferences = - AvailableProductPreferences.loadFromJSONStrings( - preferenceImportancesString: preferenceImportancesString, - attributeGroupsString: attributeGroupsString, - ); - expect(refreshCounter, 0); - - const String barcode = '0028400047685'; - final ProductQueryConfiguration configurations = - ProductQueryConfiguration( - barcode, - language: language, - fields: [ProductField.NAME, ProductField.ATTRIBUTE_GROUPS], - version: ProductQueryVersion.v3, - ); - await getProductTooManyRequestsManager.waitIfNeeded(); - final ProductResultV3 result = await OpenFoodAPIClient.getProductV3( - configurations, - user: TestConstants.PROD_USER, - ); - expect(result.status, ProductResultV3.statusSuccess); - expect(result.barcode, barcode); - - final String attributeId1 = Attribute.ATTRIBUTE_NUTRISCORE; - final String attributeId2 = Attribute.ATTRIBUTE_FOREST_FOOTPRINT; - final String importanceId1 = PreferenceImportance.ID_MANDATORY; - final String importanceId2 = PreferenceImportance.ID_IMPORTANT; - await manager.setImportance(attributeId1, importanceId1); - expect( - manager.getImportanceIdForAttributeId(attributeId1), importanceId1); - expect(refreshCounter, 1); - await manager.setImportance(attributeId2, importanceId2); - expect( - manager.getImportanceIdForAttributeId(attributeId2), importanceId2); - expect(refreshCounter, 2); - MatchedProduct matchedProduct; - - matchedProduct = MatchedProduct(result.product!, manager); - expect(matchedProduct.score, - greaterThan(50)); // 20240522: was 59.2727272727272 - expect(matchedProduct.status, MatchedProductStatus.NO); - - await manager.setImportance(attributeId1, importanceId2); - expect( - manager.getImportanceIdForAttributeId(attributeId1), importanceId2); - expect(refreshCounter, 3); - await manager.setImportance(attributeId2, importanceId1); - expect( - manager.getImportanceIdForAttributeId(attributeId2), importanceId1); - expect(refreshCounter, 4); - - matchedProduct = MatchedProduct(result.product!, manager); - expect(matchedProduct.score, - greaterThan(14)); // 20240522: was 14.8181818181818 - expect(matchedProduct.status, MatchedProductStatus.NO); - - await manager.clearImportances(); // no attribute parameters at all - expect(refreshCounter, 5); - - matchedProduct = MatchedProduct(result.product!, manager); - expect(matchedProduct.score, 0.0); - expect(matchedProduct.status, MatchedProductStatus.YES); - }); - }); -} diff --git a/test/api_save_product_v3_test.dart b/test/api_save_product_v3_test.dart index bc4653e840..e43af2ed0c 100644 --- a/test/api_save_product_v3_test.dart +++ b/test/api_save_product_v3_test.dart @@ -9,7 +9,7 @@ void main() { const UriProductHelper uriHelper = uriHelperFoodTest; group('$OpenFoodAPIClient save product V3', () { - const String barcode = '12345678'; + const String barcode = '7300400481588'; const OpenFoodFactsLanguage language = OpenFoodFactsLanguage.FRENCH; const OpenFoodFactsCountry country = OpenFoodFactsCountry.FRANCE;