Ajout champ Nutriments

betagouv · Jan 9, 2025 · d35102a · d35102a
1 parent 6f90ac1
commit d35102a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/api/serializers/declaration.py b/api/serializers/declaration.py
@@ -305,6 +305,7 @@ class OpenDataDeclarationSerializer(serializers.ModelSerializer):
     declared_microorganisms = serializers.SerializerMethodField()
     declared_substances = serializers.SerializerMethodField()
     declared_additives = serializers.SerializerMethodField()
+    declared_nutriments = serializers.SerializerMethodField()
 
     modification_date = serializers.DateTimeField(format="%Y-%m-%d")
 
@@ -329,6 +330,7 @@ class Meta:
             "declared_plants",
             "declared_microorganisms",
             "declared_additives",
+            "declared_nutriments",
             "declared_substances",
             "modification_date",
         )
@@ -413,6 +415,12 @@ def get_declared_additives(self, obj):
             for declared_ingredient in obj.declared_ingredients.filter(ingredient__ingredient_type=2)
         ]
 
+    def get_declared_nutriments(self, obj):
+        return [
+            str(declared_ingredient.ingredient.name)
+            for declared_ingredient in obj.declared_ingredients.filter(ingredient__ingredient_type=1)
+        ]
+
 
 class DeclarationSerializer(serializers.ModelSerializer):
     def __init__(self, *args, **kwargs):

diff --git a/data/etl/transformer_loader.py b/data/etl/transformer_loader.py
@@ -64,6 +64,7 @@ def __init__(self):
             "declared_microorganisms": "micro_organismes",
             "declared_substances": "substances",
             "declared_additives": "additifs",
+            "declared_nutriments": "nutriments",
             "modification_date": "date_decision",  #  Warning : Se baser sur la du snapshot d'autorisation si la plateforme Compl'Alim permet d'editer la déclaration (ex: abandon)
         }