Merge pull request #40 from PROCOLLAB-github/dev

Fixed user types route and user achievement serializers

Author: yakser

projects/serializers.py

@@ -14,6 +14,7 @@ class Meta:
             "title",
             "status",
         ]
+        ref_name = "Projects"
 
 
 class ProjectAchievementListSerializer(serializers.ModelSerializer):
@@ -168,3 +169,4 @@ class Meta:
             "status",
             "projects",
         ]
+        ref_name = "Projects"

users/serializers.py

@@ -12,6 +12,7 @@ class Meta:
             "title",
             "status",
         ]
+        ref_name = "Users"
 
 
 class MemberSerializer(serializers.ModelSerializer):
@@ -155,6 +156,7 @@ class Meta:
             "status",
             "user",
         ]
+        ref_name = "Users"
 
 
 class EmailSerializer(serializers.Serializer):

users/urls.py

@@ -7,10 +7,10 @@
     EmailResetPassword,
     ResetPassword,
     SpecialistsList,
-    UserAdditionalRoles,
+    UserAdditionalRolesView,
     UserDetail,
     UserList,
-    UserTypes,
+    UserTypesView,
     VerifyEmail,
 )
 
@@ -21,8 +21,8 @@
         "specialists/", SpecialistsList.as_view()
     ),  # this url actually returns  mentors, experts and investors
     path("users/", UserList.as_view()),
-    path("users/roles/", UserAdditionalRoles.as_view()),
-    path("users/types/", UserTypes.as_view()),
+    path("users/roles/", UserAdditionalRolesView.as_view()),
+    path("users/types/", UserTypesView.as_view()),
     path("users/<int:pk>/", UserDetail.as_view()),
     path("users/reset-password/", EmailResetPassword.as_view()),
     path("users/current/", CurrentUser.as_view()),

users/views.py

@@ -23,7 +23,7 @@
 
 from core.permissions import IsOwnerOrReadOnly
 from core.utils import Email
-from users.helpers import VERBOSE_ROLE_TYPES
+from users.helpers import VERBOSE_ROLE_TYPES, VERBOSE_USER_TYPES
 from users.models import UserAchievement
 from users.permissions import IsAchievementOwnerOrReadOnly
 from users.serializers import (
@@ -77,7 +77,7 @@ def post(self, request, *args, **kwargs):
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
 
-class UserAdditionalRoles(GenericAPIView):
+class UserAdditionalRolesView(GenericAPIView):
     permission_classes = [AllowAny]
 
     def get(self, request, format=None):
@@ -116,12 +116,12 @@ def get(self, request):
         return Response(serializer.data, status=status.HTTP_200_OK)
 
 
-class UserTypes(APIView):
+class UserTypesView(APIView):
     def get(self, request, format=None):
         """
         Return a list of tuples [(id, name), ..] of user types.
         """
-        return Response(User.VERBOSE_USER_TYPES)
+        return Response(VERBOSE_USER_TYPES)
 
 
 class VerifyEmail(GenericAPIView):