fix user list serializer

core/apps/accounts/serializers/user.py

@@ -66,10 +66,18 @@ class UserCreateSerializer(serializers.Serializer):
         
 
 class UserListSerializer(serializers.ModelSerializer):
-    role = serializers.CharField(source='role.name')
+    role = serializers.SerializerMethodField(method_name='get_role')
     
     class Meta:
         model = User
         fields = [
             'id', 'full_name', 'profile_image', 'phone_number', 'role', 'username', 'is_blocked'
         ]
+    
+    def get_role(self, obj):
+        if obj.role:
+            return {
+                'id': obj.role.id,
+                'role': obj.role.name,
+            }
+        return None

core/apps/accounts/views/user.py

@@ -77,7 +77,7 @@ class UserCreateApiView(generics.GenericAPIView):
 
 class UserListApiView(generics.ListAPIView):
     serializer_class = serializers.UserListSerializer
-    queryset = User.objects.select_related('role')
+    queryset = User.objects.c('role')
     permission_classes = [HasRolePermission]
     required_permissions = ['settings', 'user']
     pagination_class = CustomPageNumberPagination