Merge pull request #89 from silverlogic/baseapp-auth-add-phonenumber-field

baseapp-auth: add phone_number field to User model

Author: pt-tsl

baseapp-auth/baseapp_auth/admin.py

@@ -42,7 +42,7 @@ class AbstractUserAdmin(UserAdmin):
                 ),
             },
         ),
-        (_("Profile"), {"fields": (("first_name", "last_name"),)}),
+        (_("Profile"), {"fields": (("first_name", "last_name", "phone_number"),)}),
     )
     add_fieldsets = (
         (
@@ -66,7 +66,7 @@ class AbstractUserAdmin(UserAdmin):
         "is_password_expired",
     )
     list_filter = ("date_joined", "is_superuser", "is_active")
-    search_fields = ("first_name", "last_name", "email")
+    search_fields = ("first_name", "last_name", "email", "phone_number")
     ordering = ("id",)
     filter_horizontal = ()
     actions = ["force_expire_password"]

baseapp-auth/baseapp_auth/models.py

@@ -6,6 +6,7 @@
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from model_utils.models import TimeStampedModel
+from phonenumber_field.modelfields import PhoneNumberField
 
 from .managers import UserManager
 
@@ -28,6 +29,7 @@ class AbstractUser(PermissionsMixin, AbstractBaseUser):
     # Profile
     first_name = models.CharField(max_length=100, blank=True)
     last_name = models.CharField(max_length=100, blank=True)
+    phone_number = PhoneNumberField(blank=True, null=True, unique=True)
 
     is_active = models.BooleanField(
         _("active"),

baseapp-auth/baseapp_auth/rest_framework/users/serializers.py

@@ -35,6 +35,7 @@ class Meta:
             "avatar",
             "first_name",
             "last_name",
+            "phone_number",
         )
         private_fields = (
             "email",

baseapp-auth/baseapp_auth/tests/integration/test_users.py

@@ -56,6 +56,7 @@ def test_object_keys_for_own_user(self, user_client):
             "avatar",
             "first_name",
             "last_name",
+            "phone_number",
         }
         actual = set(r.data.keys())
         assert expected == actual
@@ -64,7 +65,7 @@ def test_object_keys_for_other_user(self, user_client):
         user = UserFactory()
         r = user_client.get(self.reverse(kwargs={"pk": user.pk}))
         h.responseOk(r)
-        expected = {"id", "avatar", "first_name", "last_name"}
+        expected = {"id", "avatar", "first_name", "last_name", "phone_number"}
         actual = set(r.data.keys())
         assert expected == actual
 

baseapp-auth/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = baseapp_auth
-version = 0.2.6
+version = 0.2.7
 description = BaseApp Auth
 long_description = file: README.md
 url = https://github.com/silverlogic/baseapp-backend
@@ -20,6 +20,7 @@ install_requires =
     django-constance[database] >= 2.9.1
     django-jinja >= 2.10.0
     django-model-utils >= 4.3.1
+    django-phonenumber-field >= 7.0.2
     baseapp-django-trench >= 0.4.4
     baseapp-core >= 0.2.6
     djangorestframework >= 3.14.0

baseapp-auth/testproject/testapp/migrations/0008_user_phone_number.py

@@ -0,0 +1,19 @@
+import phonenumber_field.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("testapp", "0007_user_groups_user_is_staff_user_user_permissions"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="phone_number",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                blank=True, max_length=128, null=True, region=None, unique=True
+            ),
+        ),
+    ]

baseapp-comments/testproject/testapp/migrations/0008_user_phone_number.py

@@ -0,0 +1,19 @@
+import phonenumber_field.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("testapp", "0007_user_groups_user_is_staff_user_user_permissions"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="phone_number",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                blank=True, max_length=128, null=True, region=None, unique=True
+            ),
+        ),
+    ]

baseapp-follows/testproject/testapp/migrations/0004_user_phone_number.py

@@ -0,0 +1,19 @@
+import phonenumber_field.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("testapp", "0003_user_groups_user_is_staff_user_user_permissions"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="phone_number",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                blank=True, max_length=128, null=True, region=None, unique=True
+            ),
+        ),
+    ]

baseapp-notifications/testproject/testapp/migrations/0008_user_phone_number.py

@@ -0,0 +1,19 @@
+import phonenumber_field.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("testapp", "0007_user_groups_user_is_staff_user_user_permissions"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="phone_number",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                blank=True, max_length=128, null=True, region=None, unique=True
+            ),
+        ),
+    ]

baseapp-pages/testproject/testapp/migrations/0008_user_phone_number.py

@@ -0,0 +1,19 @@
+import phonenumber_field.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("testapp", "0007_user_groups_user_is_staff_user_user_permissions"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="phone_number",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                blank=True, max_length=128, null=True, region=None, unique=True
+            ),
+        ),
+    ]