From 8cf238d442a3e466e835a935fcc267f59527abd4 Mon Sep 17 00:00:00 2001
From: florimondmanca <florimond.manca@gmail.com>
Date: Tue, 11 Sep 2018 22:26:35 +0200
Subject: [PATCH] remove unused fields on user model
---
tests/test_users/test_user.py | 16 -------------
users/admin.py | 3 +--
users/factory.py | 5 -----
users/migrations/0002_auto_20180911_2223.py | 25 +++++++++++++++++++++
users/models.py | 16 -------------
users/serializers.py | 4 +---
6 files changed, 27 insertions(+), 42 deletions(-)
create mode 100644 users/migrations/0002_auto_20180911_2223.py
diff --git a/tests/test_users/test_user.py b/tests/test_users/test_user.py
index d7ff66b..d51091b 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 1e45228..3f51c65 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 3901957..b197e55 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 0000000..5d9ec40
--- /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 5125af7..5831b58 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 2a294e1..8064360 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'},
--
GitLab