Merge branch 'fix-users-api' into 'master'

Fix Transkribus endpoint names and add tags to job endpoints

See merge request !1103

arkindex/project/api_v1.py

@@ -97,12 +97,12 @@ from arkindex.users.api import (
     PasswordReset,
     PasswordResetConfirm,
     ProvidersList,
-    UpdateUserTranskribus,
     UserCreate,
     UserEmailLogin,
     UserEmailVerification,
     UserMemberships,
     UserRetrieve,
+    UserTranskribus,
 )
 
 # Cache the OpenAPI schema view for a day
@@ -247,7 +247,7 @@ api = [
     path('user/token/', UserEmailVerification.as_view(), name='user-token'),
     path('user/password-reset/', PasswordReset.as_view(), name='password-reset'),
     path('user/password-reset/confirm/', PasswordResetConfirm.as_view(), name='password-reset-confirm'),
-    path('user/transkribus/', UpdateUserTranskribus.as_view(), name='user-transkribus'),
+    path('user/transkribus/', UserTranskribus.as_view(), name='user-transkribus'),
 
     # Rights management
     path('groups/', GroupsList.as_view(), name='groups-list'),

arkindex/users/api.py

@@ -47,8 +47,8 @@ from arkindex.users.serializers import (
     OAuthRetrySerializer,
     PasswordResetConfirmSerializer,
     PasswordResetSerializer,
-    UpdateUserTranskribusSerializer,
     UserSerializer,
+    UserTranskribusSerializer,
 )
 
 logger = logging.getLogger(__name__)
@@ -341,13 +341,13 @@ class PasswordResetConfirm(CreateAPIView):
     }
 
 
-class UpdateUserTranskribus(UpdateAPIView):
+class UserTranskribus(UpdateAPIView):
     """
     Update and validate Transkribus account
     Only the user's email is stored in our database
     """
     permission_classes = (IsVerified, )
-    serializer_class = UpdateUserTranskribusSerializer
+    serializer_class = UserTranskribusSerializer
     openapi_overrides = {
         'tags': ['users'],
     }
@@ -474,6 +474,9 @@ class JobList(ListAPIView):
     """
     List asynchronous jobs linked to the current user.
     """
+    openapi_overrides = {
+        'tags': ['jobs']
+    }
     permission_classes = (IsVerified, )
     serializer_class = JobSerializer
     pagination_class = None
@@ -488,6 +491,9 @@ class JobRetrieve(RetrieveDestroyAPIView):
     """
     Retrieve a single job by ID.
     """
+    openapi_overrides = {
+        'tags': ['jobs']
+    }
     permission_classes = (IsVerified, )
     serializer_class = JobSerializer
 

arkindex/users/serializers.py

@@ -187,7 +187,7 @@ class PasswordResetConfirmSerializer(serializers.Serializer):
         user.save()
 
 
-class UpdateUserTranskribusSerializer(serializers.Serializer):
+class UserTranskribusSerializer(serializers.Serializer):
     """
     A serializer that allows to verify Transkribus credentials
     and to save the Transkribus email