Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add REST endpoint for nutrition diary
Roland Geider707082219595
diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.pyindex ff7a7ae37..0fbb7ffcb 100644--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@ -22,6 +22,7 @@ from rest_framework import serializersfrom wger.nutrition.models import (Ingredient,IngredientWeightUnit,+ LogItem,Meal,MealItem,NutritionPlan,@@ -134,15 +135,36 @@ class MealItemSerializer(serializers.ModelSerializer):'amount']+class LogItemSerializer(serializers.ModelSerializer):+ """+ LogItem serializer+ """++ class Meta:+ model = LogItem+ fields = ['id',+ 'plan',+ 'ingredient',+ 'weight_unit',+ 'datetime',+ 'amount']++class MealItemInfoSerializer(serializers.ModelSerializer):"""Meal Item info serializer"""+ meal = serializers.PrimaryKeyRelatedField(read_only=True)+ ingredient = serializers.PrimaryKeyRelatedField(read_only=True)+ ingredient_obj = IngredientInfoSerializer(source='ingredient', read_only=True)+class Meta:model = MealItemdepth = 1fields = ['id',+ 'meal',+ 'ingredient_obj','ingredient','weight_unit','order',@@ -169,10 +191,12 @@ class MealInfoSerializer(serializers.ModelSerializer):"""meal_items = MealItemInfoSerializer(source='mealitem_set', many=True)+ plan = serializers.PrimaryKeyRelatedField(read_only=True)class Meta:model = Mealfields = ['id',+ 'plan','order','time','meal_items',diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex 8089d4dcd..88eeaa766 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -34,6 +34,7 @@ from wger.nutrition.api.serializers import (IngredientInfoSerializer,IngredientSerializer,IngredientWeightUnitSerializer,+ LogItemSerializer,MealItemSerializer,MealSerializer,NutritionPlanInfoSerializer,@@ -44,6 +45,7 @@ from wger.nutrition.forms import UnitChooserFormfrom wger.nutrition.models import (Ingredient,IngredientWeightUnit,+ LogItem,Meal,MealItem,NutritionPlan,@@ -331,3 +333,38 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):Return an overview of the nutritional plan's values"""return Response(MealItem.objects.get(pk=pk).get_nutritional_values())+++class LogItemViewSet(WgerOwnerObjectModelViewSet):+ """+ API endpoint for a meal log item+ """++ serializer_class = LogItemSerializer+ is_private = True+ ordering_fields = '__all__'+ filterset_fields = ('amount',+ 'ingredient',+ 'plan',+ 'weight_unit')++ def get_queryset(self):+ """+ Only allow access to appropriate objects+ """+ return LogItem.objects.filter(plan__user=self.request.user)++ def get_owner_objects(self):+ """+ Return objects to check for ownership permission+ """+ return [(NutritionPlan, 'plan')]++ @action(detail=True)+ def nutritional_values(self, request, pk):+ """+ Return an overview of the nutritional plan's values+ """+ return Response(LogItem.objects+ .get(pk=pk, plan__user=self.request.user)+ .get_nutritional_values())diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex c735166b9..31cc06588 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -850,7 +850,6 @@ class LogItem(BaseMealItem, models.Model):plan = models.ForeignKey(NutritionPlan,verbose_name=_('Nutrition plan'),- editable=False,on_delete=models.CASCADE)"""The plan this log belongs todiff --git a/wger/software/templates/api.html b/wger/software/templates/api.htmlindex 760891b9a..2e0652307 100644--- a/wger/software/templates/api.html+++ b/wger/software/templates/api.html@@ -53,6 +53,7 @@ generated. At the moment it is not possible to register via the API.</p><li>meal</li><li>mealitem</li><li>nutritionplan</li>+ <li>nutritiondiary</li><li>schedule</li><li>schedulestep</li><li>set</li>diff --git a/wger/urls.py b/wger/urls.pyindex 884bc6804..141b2b766 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -54,25 +54,24 @@ router = routers.DefaultRouter()## Manager app-router.register(r'workout', manager_api_views.WorkoutViewSet, basename='workout')-router.register(r'workoutsession', manager_api_views.WorkoutSessionViewSet, basename='workoutsession')-router.register(r'schedulestep', manager_api_views.ScheduleStepViewSet, basename='schedulestep')-router.register(r'schedule', manager_api_views.ScheduleViewSet, basename='schedule')router.register(r'day', manager_api_views.DayViewSet, basename='day')router.register(r'set', manager_api_views.SetViewSet, basename='Set')router.register(r'setting', manager_api_views.SettingViewSet, basename='Setting')+router.register(r'workout', manager_api_views.WorkoutViewSet, basename='workout')+router.register(r'workoutsession', manager_api_views.WorkoutSessionViewSet, basename='workoutsession')router.register(r'workoutlog', manager_api_views.WorkoutLogViewSet, basename='workoutlog')+router.register(r'schedulestep', manager_api_views.ScheduleStepViewSet, basename='schedulestep')+router.register(r'schedule', manager_api_views.ScheduleViewSet, basename='schedule')# Core app-router.register(r'userprofile', core_api_views.UserProfileViewSet, basename='userprofile')-router.register(r'language', core_api_views.LanguageViewSet, basename='language')router.register(r'daysofweek', core_api_views.DaysOfWeekViewSet, basename='daysofweek')+router.register(r'language', core_api_views.LanguageViewSet, basename='language')router.register(r'license', core_api_views.LicenseViewSet, basename='license')+router.register(r'userprofile', core_api_views.UserProfileViewSet, basename='userprofile')router.register(r'setting-repetitionunit', core_api_views.RepetitionUnitViewSet, basename='setting-repetition-unit')router.register(r'setting-weightunit', core_api_views.WeightUnitViewSet, basename='setting-weight-unit')# Exercises app-# Add router for viewing exercise inforouter.register(r'exerciseinfo', exercises_api_views.ExerciseInfoViewset, basename='exerciseinfo')router.register(r'exercise', exercises_api_views.ExerciseViewSet, basename='exercise')router.register(r'equipment', exercises_api_views.EquipmentViewSet, basename='api')@@ -88,9 +87,9 @@ router.register(r'weightunit', nutrition_api_views.WeightUnitViewSet, basename='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'nutritiondiary', nutrition_api_views.LogItemViewSet, basename='nutritiondiary')router.register(r'meal', nutrition_api_views.MealViewSet, basename='meal')router.register(r'mealitem', nutrition_api_views.MealItemViewSet, basename='mealitem')-#router.register(r'nutritiondiary', nutrition_api_views.LogItemViewSet, basename='nutritiondiary')# Weight approuter.register(r'weightentry', weight_api_views.WeightEntryViewSet, basename='weightentry')