diff --git a/tests/test_users/test_user.py b/tests/test_users/test_user.py index d7ff66b53d4b84f2adce276effd620b35de90565..d51091b3f4010d02077cdb099d2e44fed710d563 100644 --- a/tests/test_users/test_user.py +++ b/tests/test_users/test_user.py @@ -56,22 +56,6 @@ class UserModelTest(ModelTestCase): 'blank': False, 'null': False, }, - 'date_of_birth': { - 'verbose_name': 'date de naissance', - 'blank': True, - 'null': True, - }, - 'gender': { - 'verbose_name': 'sexe', - 'max_length': 1, - 'choices': (('M', 'Homme'), ('F', 'Femme')), - 'blank': True, - }, - 'phone_number': { - 'verbose_name': 'téléphone', - 'blank': True, - 'null': True, - }, 'profile_type': { 'verbose_name': 'type de profil', 'blank': False, diff --git a/users/admin.py b/users/admin.py index 1e452282829b122d2f4c56ce184e7a4afa70669c..3f51c65ad568e7d053c76f4d802bafec4a3b7fdc 100644 --- a/users/admin.py +++ b/users/admin.py @@ -40,8 +40,7 @@ class CustomUserAdmin(UserAdmin): fieldsets = ( (None, {'fields': ('email', 'password')}), (_('Personal info'), {'fields': ( - 'first_name', 'last_name', 'date_of_birth', 'gender', - 'phone_number', + 'first_name', 'last_name', )}), (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions')}), diff --git a/users/factory.py b/users/factory.py index 3901957bd09c9970116cb598069b19c6114dff0b..b197e55f088bb9b1901794aaad9f16272576836c 100644 --- a/users/factory.py +++ b/users/factory.py @@ -34,11 +34,6 @@ class UserFactory(factory.DjangoModelFactory): # this is a default, override by passing `profile_type='...'` in create() profile_type = None - date_of_birth = factory.Faker('date_this_century', - before_today=True, after_today=False, - locale='fr') - phone_number = factory.Faker('phone_number', locale='fr') - gender = factory.Iterator([User.MALE, User.FEMALE]) @classmethod def _create(cls, model_class, *args, **kwargs): diff --git a/users/migrations/0002_auto_20180911_2223.py b/users/migrations/0002_auto_20180911_2223.py new file mode 100644 index 0000000000000000000000000000000000000000..5d9ec40a8222ef98ab5782f8315997d3598f4a4d --- /dev/null +++ b/users/migrations/0002_auto_20180911_2223.py @@ -0,0 +1,25 @@ +# Generated by Django 2.1.1 on 2018-09-11 20:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='user', + name='date_of_birth', + ), + migrations.RemoveField( + model_name='user', + name='gender', + ), + migrations.RemoveField( + model_name='user', + name='phone_number', + ), + ] diff --git a/users/models.py b/users/models.py index 5125af71812b220785bc8312c929f44112734188..5831b586d9625d97d83d98dbe253194213829956 100644 --- a/users/models.py +++ b/users/models.py @@ -65,22 +65,6 @@ class User(AbstractUser): objects = UserManager() - date_of_birth = models.DateField(blank=True, null=True, - verbose_name='date de naissance') - - MALE = 'M' - FEMALE = 'F' - GENDER_CHOICES = ( - (MALE, 'Homme'), - (FEMALE, 'Femme'), - ) - gender = models.CharField('sexe', blank=True, null=True, - max_length=1, choices=GENDER_CHOICES) - - # TODO add a proper phone number validator - phone_number = models.CharField('téléphone', - max_length=20, null=True, blank=True) - # type of profile of the user PROFILE_STUDENT = 0 PROFILE_TUTOR = 1 diff --git a/users/serializers.py b/users/serializers.py index 2a294e195df3aadbf5a889a934349dd3f763b99d..80643603a550e2cded1e7c675d45a21aff9f60b0 100644 --- a/users/serializers.py +++ b/users/serializers.py @@ -12,9 +12,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer): class Meta: # noqa model = User fields = ('id', 'email', 'profile_type', - 'first_name', 'last_name', - 'gender', - 'phone_number', 'date_of_birth', 'url',) + 'first_name', 'last_name', 'url',) extra_kwargs = { 'email': {'read_only': True}, 'url': {'view_name': 'api:user-detail'},