Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add nutrition plan info endpoint as well
Roland Geider109a6548eac7
diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.pyindex 68592ec31..261434b27 100644--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@ -29,16 +29,6 @@ from wger.nutrition.models import ()-class NutritionPlanSerializer(serializers.ModelSerializer):- """- Nutritional plan serializer- """-- class Meta:- model = NutritionPlan- exclude = ('user',)--class IngredientWeightUnitSerializer(serializers.ModelSerializer):"""IngredientWeightUnit serializer@@ -72,30 +62,6 @@ class WeightUnitSerializer(serializers.ModelSerializer):fields = '__all__'-class MealItemSerializer(serializers.ModelSerializer):- """- MealItem serializer- """- meal = serializers.PrimaryKeyRelatedField(label='Nutrition plan',- queryset=Meal.objects.all())-- class Meta:- model = MealItem- fields = '__all__'---class MealSerializer(serializers.ModelSerializer):- """- Meal serializer- """- plan = serializers.PrimaryKeyRelatedField(label='Nutrition plan',- queryset=NutritionPlan.objects.all())-- class Meta:- model = Meal- fields = '__all__'--class IngredientSerializer(serializers.ModelSerializer):"""Ingredient serializer@@ -144,3 +110,83 @@ class IngredientInfoSerializer(serializers.ModelSerializer):'license','license_author','ingredientweightunit_set']+++class MealItemSerializer(serializers.ModelSerializer):+ """+ MealItem serializer+ """+ meal = serializers.PrimaryKeyRelatedField(label='Nutrition plan',+ queryset=Meal.objects.all())++ class Meta:+ model = MealItem+ fields = '__all__'+++class MealItemInfoSerializer(serializers.ModelSerializer):+ """+ Meal Item info serializer+ """++ class Meta:+ model = MealItem+ depth = 1+ fields = ['ingredient',+ 'weight_unit',+ 'order',+ 'amount']+++class MealSerializer(serializers.ModelSerializer):+ """+ Meal serializer+ """+ plan = serializers.PrimaryKeyRelatedField(label='Nutrition plan',+ queryset=NutritionPlan.objects.all())++ class Meta:+ model = Meal+ fields = '__all__'+++class MealInfoSerializer(serializers.ModelSerializer):+ """+ Meal info serializer+ """++ meal_items = MealItemInfoSerializer(source='mealitem_set', many=True)++ class Meta:+ model = Meal+ fields = ['order',+ 'time',+ 'meal_items',+ 'get_nutritional_values']+++class NutritionPlanSerializer(serializers.ModelSerializer):+ """+ Nutritional plan serializer+ """++ class Meta:+ model = NutritionPlan+ exclude = ('user',)+++class NutritionPlanInfoSerializer(serializers.ModelSerializer):+ """+ Nutritional plan info serializer+ """++ meals = MealInfoSerializer(source='meal_set', many=True)++ class Meta:+ model = NutritionPlan+ depth = 1+ fields = ['language',+ 'creation_date',+ 'description',+ 'get_nutritional_values',+ 'meals']diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex fd9431882..00e11a0fb 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -36,6 +36,7 @@ from wger.nutrition.api.serializers import (IngredientWeightUnitSerializer,MealItemSerializer,MealSerializer,+ NutritionPlanInfoSerializer,NutritionPlanSerializer,WeightUnitSerializer)@@ -246,6 +247,14 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):return Response(plan.get_log_summary(date))+class NutritionPlanInfoViewSet(NutritionPlanViewSet):+ """+ Read-only info API endpoint for nutrition plan objects. Returns nested data+ structures for more easy parsing.+ """+ serializer_class = NutritionPlanInfoSerializer++class MealViewSet(WgerOwnerObjectModelViewSet):"""API endpoint for meal objectsdiff --git a/wger/urls.py b/wger/urls.pyindex 3963c949d..1f1cefb3e 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -84,6 +84,7 @@ router.register(r'ingredientinfo', nutrition_api_views.IngredientInfoViewSet, barouter.register(r'weightunit', nutrition_api_views.WeightUnitViewSet, basename='weightunit')router.register(r'ingredientweightunit', nutrition_api_views.IngredientWeightUnitViewSet, basename='ingredientweightunit')router.register(r'nutritionplan', nutrition_api_views.NutritionPlanViewSet, basename='nutritionplan')+router.register(r'nutritionplaninfo', nutrition_api_views.NutritionPlanInfoViewSet, basename='nutritionplaninfo')router.register(r'meal', nutrition_api_views.MealViewSet, basename='meal')router.register(r'mealitem', nutrition_api_views.MealItemViewSet, basename='mealitem')