Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename serializer to make drf spectacular happy

Roland Geiderdfd0e2e562a3
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index 701e99dcd..d72c94cb6 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -159,7 +159,7 @@ class RepetitionUnitSerializer(serializers.ModelSerializer):
fields = ['id', 'name']
-class WeightUnitSerializer(serializers.ModelSerializer):
+class RoutineWeightUnitSerializer(serializers.ModelSerializer):
"""
Weight unit serializer
"""
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 6c8558a3b..1c4dd3ca1 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -62,7 +62,7 @@ from wger.core.api.serializers import (
UserApiSerializer,
UserprofileSerializer,
UserRegistrationSerializer,
- WeightUnitSerializer,
+ RoutineWeightUnitSerializer,
)
from wger.core.forms import UserLoginForm
from wger.core.models import (
@@ -76,7 +76,6 @@ from wger.core.models import (
from wger.utils.api_token import create_token
from wger.utils.permissions import WgerPermission
-
logger = logging.getLogger(__name__)
@@ -170,7 +169,7 @@ class ApplicationVersionView(viewsets.ViewSet):
"""
Returns the application's version
"""
- permission_classes = (AllowAny, )
+ permission_classes = (AllowAny,)
@staticmethod
@extend_schema(
@@ -187,7 +186,7 @@ class PermissionView(viewsets.ViewSet):
"""
Checks whether the user has a django permission
"""
- permission_classes = (AllowAny, )
+ permission_classes = (AllowAny,)
@staticmethod
@extend_schema(
@@ -201,13 +200,13 @@ class PermissionView(viewsets.ViewSet):
],
responses={
201:
- inline_serializer(name='PermissionResponse', fields={
- 'result': BooleanField(),
- }),
+ inline_serializer(name='PermissionResponse', fields={
+ 'result': BooleanField(),
+ }),
400:
- OpenApiResponse(
- description="Please pass a permission name in the 'permission' parameter"
- ),
+ OpenApiResponse(
+ description="Please pass a permission name in the 'permission' parameter"
+ ),
},
)
def get(request):
@@ -230,7 +229,7 @@ class RequiredApplicationVersionView(viewsets.ViewSet):
Returns the minimum required version of flutter app to access this server
such as 1.4.2 or 3.0.0
"""
- permission_classes = (AllowAny, )
+ permission_classes = (AllowAny,)
@staticmethod
@extend_schema(
@@ -250,7 +249,7 @@ class UserAPILoginView(viewsets.ViewSet):
Note that it is recommended to use token authorization instead.
"""
- permission_classes = (AllowAny, )
+ permission_classes = (AllowAny,)
queryset = User.objects.all()
serializer_class = UserApiSerializer
throttle_scope = 'login'
@@ -271,10 +270,10 @@ class UserAPILoginView(viewsets.ViewSet):
parameters=[],
responses={
status.HTTP_200_OK:
- inline_serializer(
- name='loginSerializer',
- fields={'token': CharField()},
- ),
+ inline_serializer(
+ name='loginSerializer',
+ fields={'token': CharField()},
+ ),
}
)
def post(self, request):
@@ -307,7 +306,7 @@ class UserAPIRegistrationViewSet(viewsets.ViewSet):
"""
API endpoint
"""
- permission_classes = (AllowRegisterUser, )
+ permission_classes = (AllowRegisterUser,)
serializer_class = UserRegistrationSerializer
def get_queryset(self):
@@ -320,10 +319,10 @@ class UserAPIRegistrationViewSet(viewsets.ViewSet):
parameters=[],
responses={
status.HTTP_200_OK:
- inline_serializer(
- name='loginSerializer',
- fields={'token': CharField()},
- ),
+ inline_serializer(
+ name='loginSerializer',
+ fields={'token': CharField()},
+ ),
}
)
def post(self, request):
@@ -370,7 +369,7 @@ class DaysOfWeekViewSet(viewsets.ReadOnlyModelViewSet):
queryset = DaysOfWeek.objects.all()
serializer_class = DaysOfWeekSerializer
ordering_fields = '__all__'
- filterset_fields = ('day_of_week', )
+ filterset_fields = ('day_of_week',)
class LicenseViewSet(viewsets.ReadOnlyModelViewSet):
@@ -394,14 +393,14 @@ class RepetitionUnitViewSet(viewsets.ReadOnlyModelViewSet):
queryset = RepetitionUnit.objects.all()
serializer_class = RepetitionUnitSerializer
ordering_fields = '__all__'
- filterset_fields = ('name', )
+ filterset_fields = ('name',)
-class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
+class RoutineWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):
"""
API endpoint for weight units objects
"""
queryset = WeightUnit.objects.all()
- serializer_class = WeightUnitSerializer
+ serializer_class = RoutineWeightUnitSerializer
ordering_fields = '__all__'
- filterset_fields = ('name', )
+ filterset_fields = ('name',)
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 61ee28e6b..11a918d0c 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -24,7 +24,6 @@ from datetime import timedelta
from wger import get_version
from wger.utils.constants import DOWNLOAD_INGREDIENT_WGER
-
"""
This file contains the global settings that don't usually need to be changed.
For a full list of options, visit:
@@ -151,7 +150,6 @@ AUTHENTICATION_BACKENDS = (
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- # 'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'wger.utils.context_processor.processor',
@@ -172,8 +170,7 @@ TEMPLATES = [
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
],
- 'debug':
- False
+ 'debug': False
},
},
]
@@ -256,7 +253,7 @@ AVAILABLE_LANGUAGES = (
LANGUAGE_CODE = 'en'
# All translation files are in one place
-LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'), )
+LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'),)
# Primary keys are AutoFields
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
@@ -456,6 +453,10 @@ REST_FRAMEWORK = {
# Api docs
SPECTACULAR_SETTINGS = {
'TITLE': 'wger',
+ 'SERVERS': [
+ {'url': '/', 'description': 'This server'},
+ {'url': 'https://wger.de', 'description': 'The "official" upstream wger instance'},
+ ],
'DESCRIPTION': 'Self hosted FLOSS workout and fitness tracker',
'VERSION': get_version(),
'SERVE_INCLUDE_SCHEMA': True,
@@ -463,6 +464,7 @@ SPECTACULAR_SETTINGS = {
'SWAGGER_UI_DIST': 'SIDECAR',
'SWAGGER_UI_FAVICON_HREF': 'SIDECAR',
'REDOC_DIST': 'SIDECAR',
+ 'COMPONENT_SPLIT_REQUEST': True
}
#
@@ -485,7 +487,7 @@ CORS_URLS_REGEX = r'^/api/.*$'
#
# Ignore these URLs if they cause 404
#
-IGNORABLE_404_URLS = (re.compile(r'^/favicon\.ico$'), )
+IGNORABLE_404_URLS = (re.compile(r'^/favicon\.ico$'),)
#
# Password rules
diff --git a/wger/urls.py b/wger/urls.py
index 774c55763..fbe5c1099 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -53,7 +53,6 @@ from wger.nutrition.sitemap import NutritionSitemap
from wger.utils.generic_views import TextTemplateView
from wger.weight.api import views as weight_api_views
-
# admin.autodiscover()
#
@@ -94,7 +93,7 @@ router.register(
basename='setting-repetition-unit'
)
router.register(
- r'setting-weightunit', core_api_views.WeightUnitViewSet, basename='setting-weight-unit'
+ r'setting-weightunit', core_api_views.RoutineWeightUnitViewSet, basename='setting-weight-unit'
)
# Exercises app