Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cleanup api endpoints

Roland Geider99782c224a8b
diff --git a/wger/exercises/api/endpoints.py b/wger/exercises/api/endpoints.py
index 8c19119db..04914cd47 100644
--- a/wger/exercises/api/endpoints.py
+++ b/wger/exercises/api/endpoints.py
@@ -1,4 +1,4 @@
-EXERCISE_ENDPOINT = 'exercisebaseinfo'
+EXERCISE_ENDPOINT = 'exerciseinfo'
DELETION_LOG_ENDPOINT = 'deletion-log'
CATEGORY_ENDPOINT = 'exercisecategory'
MUSCLE_ENDPOINT = 'muscle'
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index c8477c41e..c34bfeed2 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -396,48 +396,6 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
Exercise info serializer
"""
- images = ExerciseImageSerializer(many=True, read_only=True)
- videos = ExerciseVideoSerializer(many=True, read_only=True)
- comments = ExerciseCommentSerializer(source='exercisecomment_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)
- variations = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
- aliases = ExerciseInfoAliasSerializer(source='alias_set', many=True, read_only=True)
- author_history = serializers.ListSerializer(child=serializers.CharField())
-
- class Meta:
- model = Translation
- depth = 1
- fields = [
- 'id',
- 'name',
- 'aliases',
- 'uuid',
- 'exercise_id',
- 'description',
- 'created',
- 'category',
- 'muscles',
- 'muscles_secondary',
- 'equipment',
- 'language',
- 'license',
- 'license_author',
- 'images',
- 'videos',
- 'comments',
- 'variations',
- 'author_history',
- ]
-
-
-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)
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index cd8148fcf..39ff8d12c 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -56,13 +56,11 @@ from wger.exercises.api.serializers import (
DeletionLogSerializer,
EquipmentSerializer,
ExerciseAliasSerializer,
- ExerciseBaseInfoSerializer,
+ ExerciseInfoSerializer,
ExerciseBaseSerializer,
ExerciseCategorySerializer,
ExerciseCommentSerializer,
ExerciseImageSerializer,
- ExerciseInfoSerializer,
- TranslationSerializer,
ExerciseTranslationSerializer,
ExerciseVariationSerializer,
ExerciseVideoSerializer,
@@ -95,11 +93,11 @@ from wger.utils.language import load_language
logger = logging.getLogger(__name__)
-class ExerciseBaseViewSet(ModelViewSet):
+class ExerciseViewSet(ModelViewSet):
"""
- API endpoint for exercise base objects.
+ API endpoint for exercise objects.
- For a read-only endpoint with all the information of an exercise, see /api/v2/exercisebaseinfo/
+ For a read-only endpoint with all the information of an exercise, see /api/v2/exerciseinfo/
"""
queryset = Exercise.with_translations.all()
@@ -215,83 +213,6 @@ class ExerciseTranslationViewSet(ModelViewSet):
)
-class TranslationViewSet(viewsets.ReadOnlyModelViewSet):
- """
- API endpoint for exercise objects, use /api/v2/exercisebaseinfo/ instead.
-
- This is only kept for backwards compatibility and will be removed in the future
- """
-
- queryset = Translation.objects.all()
- permission_classes = (CanContributeExercises,)
- serializer_class = TranslationSerializer
- ordering_fields = '__all__'
- filterset_fields = (
- 'uuid',
- 'created',
- 'exercise',
- 'description',
- 'language',
- 'name',
- )
-
- @method_decorator(cache_page(settings.WGER_SETTINGS['EXERCISE_CACHE_TTL']))
- def dispatch(self, request, *args, **kwargs):
- return super().dispatch(request, *args, **kwargs)
-
- @extend_schema(deprecated=True)
- def list(self, request, *args, **kwargs):
- return super().list(request, *args, **kwargs)
-
- @extend_schema(deprecated=True)
- def retrieve(self, request, *args, **kwargs):
- return super().retrieve(request, *args, **kwargs)
-
- def get_queryset(self):
- """Add additional filters for fields from exercise base"""
-
- qs = Translation.objects.all()
-
- category = self.request.query_params.get('category')
- muscles = self.request.query_params.get('muscles')
- muscles_secondary = self.request.query_params.get('muscles_secondary')
- equipment = self.request.query_params.get('equipment')
- license = self.request.query_params.get('license')
-
- if category:
- try:
- qs = qs.filter(exercise__category_id=int(category))
- except ValueError:
- logger.info(f'Got {category} as category ID')
-
- if muscles:
- try:
- qs = qs.filter(exercise__muscles__in=[int(m) for m in muscles.split(',')])
- except ValueError:
- logger.info(f'Got {muscles} as muscle IDs')
-
- if muscles_secondary:
- try:
- muscle_ids = [int(m) for m in muscles_secondary.split(',')]
- qs = qs.filter(exercise__muscles_secondary__in=muscle_ids)
- except ValueError:
- logger.info(f"Got '{muscles_secondary}' as secondary muscle IDs")
-
- if equipment:
- try:
- qs = qs.filter(exercise__equipment__in=[int(e) for e in equipment.split(',')])
- except ValueError:
- logger.info(f'Got {equipment} as equipment IDs')
-
- if license:
- try:
- qs = qs.filter(exercise__license_id=int(license))
- except ValueError:
- logger.info(f'Got {license} as license ID')
-
- return qs
-
-
@extend_schema(
parameters=[
OpenApiParameter(
@@ -396,37 +317,7 @@ def search(request):
return Response(response)
-class TranslationInfoViewset(viewsets.ReadOnlyModelViewSet):
- """
- API endpoint for exercise objects, use /api/v2/exercisebaseinfo/ instead.
- """
-
- queryset = Translation.objects.all()
- serializer_class = ExerciseInfoSerializer
- ordering_fields = '__all__'
- filterset_fields = (
- 'created',
- 'description',
- 'name',
- 'exercise',
- 'license',
- 'license_author',
- )
-
- @method_decorator(cache_page(settings.WGER_SETTINGS['EXERCISE_CACHE_TTL']))
- def dispatch(self, request, *args, **kwargs):
- return super().dispatch(request, *args, **kwargs)
-
- @extend_schema(deprecated=True)
- def list(self, request, *args, **kwargs):
- return super().list(request, *args, **kwargs)
-
- @extend_schema(deprecated=True)
- def retrieve(self, request, *args, **kwargs):
- return super().retrieve(request, *args, **kwargs)
-
-
-class ExerciseBaseInfoViewset(viewsets.ReadOnlyModelViewSet):
+class ExerciseInfoViewset(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 and
@@ -434,7 +325,7 @@ class ExerciseBaseInfoViewset(viewsets.ReadOnlyModelViewSet):
"""
queryset = Exercise.objects.all()
- serializer_class = ExerciseBaseInfoSerializer
+ serializer_class = ExerciseInfoSerializer
ordering_fields = '__all__'
filterset_fields = (
'uuid',
diff --git a/wger/exercises/management/commands/warmup-exercise-api-cache.py b/wger/exercises/management/commands/warmup-exercise-api-cache.py
index de7215e7a..2483e5fa3 100644
--- a/wger/exercises/management/commands/warmup-exercise-api-cache.py
+++ b/wger/exercises/management/commands/warmup-exercise-api-cache.py
@@ -16,7 +16,7 @@
from django.core.management.base import BaseCommand
# wger
-from wger.exercises.api.serializers import ExerciseBaseInfoSerializer
+from wger.exercises.api.serializers import ExerciseInfoSerializer
from wger.exercises.models import Exercise
from wger.utils.cache import reset_exercise_api_cache
@@ -63,5 +63,5 @@ class Command(BaseCommand):
if force:
reset_exercise_api_cache(exercise.uuid)
- serializer = ExerciseBaseInfoSerializer(exercise)
+ serializer = ExerciseInfoSerializer(exercise)
serializer.data
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 1102898a9..265fd8ed4 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -109,7 +109,7 @@ class ExerciseCustomApiTestCase(ExerciseCrudApiTestCase):
}
def get_resource_name(self):
- return 'exercise-base'
+ return 'exercise'
def test_delete_replace_by(self):
"""Test that setting the replaced_by attribute works"""
diff --git a/wger/exercises/tests/test_exercise_api_cache.py b/wger/exercises/tests/test_exercise_api_cache.py
index 31f05aa14..c86a9e830 100644
--- a/wger/exercises/tests/test_exercise_api_cache.py
+++ b/wger/exercises/tests/test_exercise_api_cache.py
@@ -28,12 +28,12 @@ from wger.utils.cache import cache_mapper
class ExerciseApiCacheTestCase(WgerTestCase):
"""
- Tests the API cache for the exercisebaseinfo endpoint
+ Tests the API cache for the exerciseinfo endpoint
"""
exercise_id = 1
exercise_uuid = 'acad3949-36fb-4481-9a72-be2ddae2bc05'
- url = '/api/v2/exercisebaseinfo/1/'
+ url = '/api/v2/exerciseinfo/1/'
cache_key = cache_mapper.get_exercise_api_key('acad3949-36fb-4481-9a72-be2ddae2bc05')
diff --git a/wger/exercises/tests/test_exercise_translation.py b/wger/exercises/tests/test_exercise_translation.py
index 99822f6e4..5edb91504 100644
--- a/wger/exercises/tests/test_exercise_translation.py
+++ b/wger/exercises/tests/test_exercise_translation.py
@@ -127,23 +127,6 @@ class ExerciseInfoApiTestCase(
api_base_test.BaseTestCase,
api_base_test.ApiBaseTestCase,
api_base_test.ApiGetTestCase,
-):
- """
- Tests the exercise info resource
- """
-
- pk = 1
- private_resource = False
- overview_cached = True
-
- def get_resource_name(self):
- return 'exerciseinfo'
-
-
-class ExerciseBaseInfoApiTestCase(
- api_base_test.BaseTestCase,
- api_base_test.ApiBaseTestCase,
- api_base_test.ApiGetTestCase,
):
"""
Tests the exercise base info resource
@@ -154,7 +137,7 @@ class ExerciseBaseInfoApiTestCase(
overview_cached = True
def get_resource_name(self):
- return 'exercisebaseinfo'
+ return 'exerciseinfo'
class ExerciseCustomApiTestCase(ExerciseCrudApiTestCase):
diff --git a/wger/exercises/tests/test_sync.py b/wger/exercises/tests/test_sync.py
index 5e7ff4281..0d05515df 100644
--- a/wger/exercises/tests/test_sync.py
+++ b/wger/exercises/tests/test_sync.py
@@ -685,7 +685,7 @@ class TestSyncMethods(WgerTestCase):
sync_exercises(lambda x: x)
mock_request.assert_called_with(
- 'https://wger.de/api/v2/exercisebaseinfo/?limit=100',
+ 'https://wger.de/api/v2/exerciseinfo/?limit=100',
headers=wger_headers(),
)
self.assertEqual(Exercise.objects.count(), 9)
diff --git a/wger/urls.py b/wger/urls.py
index 9bb17c806..e7644a1a6 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -149,28 +149,19 @@ router.register(
# Exercises app
router.register(
r'exerciseinfo',
- exercises_api_views.TranslationInfoViewset,
+ exercises_api_views.ExerciseInfoViewset,
basename='exerciseinfo',
)
-router.register(
- r'exercisebaseinfo',
- exercises_api_views.ExerciseBaseInfoViewset,
- basename='exercisebaseinfo',
-)
-router.register(
- r'exercise',
- exercises_api_views.TranslationViewSet,
- basename='exercise',
-)
+
router.register(
r'exercise-translation',
exercises_api_views.ExerciseTranslationViewSet,
basename='exercise-translation',
)
router.register(
- r'exercise-base',
- exercises_api_views.ExerciseBaseViewSet,
- basename='exercise-base',
+ r'exercise',
+ exercises_api_views.ExerciseViewSet,
+ basename='exercise',
)
router.register(
r'equipment',