Skip to content
Snippets Groups Projects
Commit 98153345 authored by florimondmanca's avatar florimondmanca
Browse files

small improvements - could not make user reference its person by attribute...

parent 58813701
Branches
No related tags found
No related merge requests found
......@@ -4,6 +4,8 @@ from rest_framework import serializers
from users.models import User
# TODO find a way to indicate in the user instance what type of person it is
class UserSerializer(serializers.HyperlinkedModelSerializer):
"""Serializer for User.
......@@ -21,10 +23,11 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
instance.save()
return instance
class Meta: # noqa
model = User
fields = ('id', 'url', 'email',
'first_name', 'last_name',
'first_name', 'last_name', 'gender',
'phone_number', 'date_of_birth',)
extra_kwargs = {
'url': {'view_name': 'api:user-detail'},
......
......@@ -56,6 +56,7 @@ class UserAPITest(ModelAPITestCase):
'last_name',
'phone_number',
'date_of_birth',
'gender',
)
for key in keys:
self.assertIn(key, response.data)
......@@ -67,6 +68,7 @@ class UserAPITest(ModelAPITestCase):
'password': 'hello25',
'first_name': 'john',
'last_name': 'doe',
'gender': User.MALE,
'phone_number': '0601020304',
'date_of_birth': '01/01/2000',
}
......
......@@ -13,10 +13,7 @@ from api.serializers.persons import (
# Create your views here.
class TutorViewSet(ListModelMixin,
RetrieveModelMixin,
CreateModelMixin,
viewsets.GenericViewSet):
class TutorViewSet(viewsets.ModelViewSet):
"""API endpoint that allows tutors to be viewed or edited.
retrieve:
......
......@@ -33,15 +33,15 @@ class Person(models.Model):
verbose_name='utilisateur',
null=True)
@property
def full_name(self):
return self.user.get_full_name()
class Meta: # noqa
abstract = True
verbose_name = 'personne'
ordering = ['user__last_name', 'user__first_name']
@property
def full_name(self):
return self.user.get_full_name()
def __str__(self):
return str(self.full_name)
......
"""Users models."""
from django.db import models
from django.shortcuts import reverse
from django.contrib.auth.models import AbstractUser
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment