Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add new endpoint similar to exercise info

Roland Geider2a2c26149888
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index 37c1f3f46..5c5b98e67 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -120,7 +120,11 @@ class LanguageSerializer(serializers.ModelSerializer):
class Meta:
model = Language
- fields = ['short_name', 'full_name']
+ fields = [
+ 'id',
+ 'short_name',
+ 'full_name'
+ ]
class DaysOfWeekSerializer(serializers.ModelSerializer):
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 41b2915d8..d85c5f35c 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -152,6 +152,24 @@ class ExerciseSerializer(serializers.ModelSerializer):
)
+class ExerciseTranslationSerializer(serializers.ModelSerializer):
+ """
+ Exercise translation serializer
+ """
+ class Meta:
+ model = Exercise
+ fields = (
+ "id",
+ "uuid",
+ "name",
+ "description",
+ "creation_date",
+ "language",
+ "license",
+ "license_author",
+ )
+
+
class ExerciseInfoSerializer(serializers.ModelSerializer):
"""
Exercise info serializer
@@ -172,6 +190,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
"id",
"name",
"uuid",
+ "exercise_base_id",
"description",
"creation_date",
"category",
@@ -185,3 +204,35 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
"comments",
"variations",
]
+
+
+class ExerciseBaseInfoSerializer(serializers.ModelSerializer):
+ """
+ Exercise base info serializer
+ """
+
+ images = ExerciseImageSerializer(source='exerciseimage_set', many=True, read_only=True)
+ category = ExerciseCategorySerializer(read_only=True)
+ muscles = MuscleSerializer(many=True, read_only=True)
+ muscles_secondary = MuscleSerializer(many=True, read_only=True)
+ equipment = EquipmentSerializer(many=True, read_only=True)
+ exercises = ExerciseTranslationSerializer(many=True, read_only=True)
+ variations = serializers.PrimaryKeyRelatedField(read_only=True)
+
+ class Meta:
+ model = ExerciseBase
+ depth = 1
+ fields = [
+ "id",
+ "uuid",
+ "category",
+ "muscles",
+ "muscles_secondary",
+ "equipment",
+ "license",
+ "license_author",
+ "images",
+ "exercises",
+ "variations",
+ "images",
+ ]
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 883b3405d..3674f6b63 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -41,12 +41,14 @@ from wger.exercises.api.serializers import (
ExerciseCommentSerializer,
ExerciseImageSerializer,
ExerciseInfoSerializer,
+ ExerciseBaseInfoSerializer,
ExerciseSerializer,
MuscleSerializer,
)
from wger.exercises.models import (
Equipment,
Exercise,
+ ExerciseBase,
ExerciseCategory,
ExerciseComment,
ExerciseImage,
@@ -212,7 +214,6 @@ class ExerciseInfoViewset(viewsets.ReadOnlyModelViewSet):
filterset_fields = (
'creation_date',
'description',
- 'language',
'name',
'exercise_base',
'license',
@@ -220,6 +221,26 @@ class ExerciseInfoViewset(viewsets.ReadOnlyModelViewSet):
)
+class ExerciseBaseInfoViewset(viewsets.ReadOnlyModelViewSet):
+ """
+ Read-only info API endpoint for exercise objects, grouped by the exercise
+ base. Returns nested data structures for more easy and faster parsing.
+ """
+
+ queryset = ExerciseBase.objects.accepted()
+ serializer_class = ExerciseBaseInfoSerializer
+ ordering_fields = '__all__'
+ filterset_fields = (
+ 'category',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment',
+ 'variations',
+ 'license',
+ 'license_author',
+ )
+
+
class EquipmentViewSet(viewsets.ReadOnlyModelViewSet):
"""
API endpoint for equipment objects
diff --git a/wger/urls.py b/wger/urls.py
index 843b2ebc2..821315399 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -88,6 +88,7 @@ router.register(
# Exercises app
router.register(r'exerciseinfo', exercises_api_views.ExerciseInfoViewset, basename='exerciseinfo')
+router.register(r'exercisebaseinfo', exercises_api_views.ExerciseBaseInfoViewset, basename='exercisebaseinfo')
router.register(r'exercise', exercises_api_views.ExerciseViewSet, basename='exercise')
router.register(r'equipment', exercises_api_views.EquipmentViewSet, basename='api')
router.register(