Merge pull request #171 from PROCOLLAB-github/feature/name-validation

Валидация имен пользователей

Author: VeryBigSad

tests/constants.py

@@ -1,7 +1,7 @@
 USER_CREATE_DATA = {
     "email": "only_for_test@test.test",
     "password": "very_strong_password",
-    "first_name": "Test",
-    "last_name": "Test",
+    "first_name": "Иван",
+    "last_name": "Иванович",
     "birthday": "2000-01-01",
 }

users/models.py

@@ -16,7 +16,7 @@
     UserAchievementManager,
     LikesOnProjectManager,
 )
-from users.validators import user_birthday_validator
+from users.validators import user_birthday_validator, user_name_validator
 
 
 def get_default_user_type():
@@ -58,8 +58,8 @@ class CustomUser(AbstractUser):
 
     username = None
     email = models.EmailField(unique=True)
-    first_name = models.CharField(max_length=255)
-    last_name = models.CharField(max_length=255)
+    first_name = models.CharField(max_length=255, validators=[user_name_validator])
+    last_name = models.CharField(max_length=255, validators=[user_name_validator])
     password = models.CharField(max_length=255)
     is_active = models.BooleanField(default=False, editable=False)
     user_type = models.PositiveSmallIntegerField(
@@ -71,7 +71,9 @@ class CustomUser(AbstractUser):
         default=0,
         editable=False,
     )
-    patronymic = models.CharField(max_length=255, null=True, blank=True)
+    patronymic = models.CharField(
+        max_length=255, validators=[user_name_validator], null=True, blank=True
+    )
     key_skills = models.CharField(max_length=512, null=True, blank=True)
     avatar = models.URLField(null=True, blank=True)
     birthday = models.DateField(

users/tests.py

@@ -53,8 +53,8 @@ def test_user_update(self):
         response = self.user_detail_view(request, pk=user.pk)
         self.assertEqual(response.status_code, 200)
 
-        request = self.factory.patch(f"auth/users/{user.pk}/", {"first_name": "Test2"})
+        request = self.factory.patch(f"auth/users/{user.pk}/", {"first_name": "Сергей"})
         force_authenticate(request, user=user)
         response = self.user_detail_view(request, pk=user.pk)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data["first_name"], "Test2")
+        self.assertEqual(response.data["first_name"], "Сергей")

users/validators.py

@@ -6,4 +6,22 @@ def user_birthday_validator(birthday):
     """returns true if person > 14 years old"""
     if (timezone.now().date() - birthday).days >= 14 * 365:
         return True
+    # check if person is > 100 years old
+    if (timezone.now().date() - birthday).days >= 100 * 365:
+        raise ValidationError("Человек старше 100 лет")
     raise ValidationError("Человек младше 14 лет")
+
+
+def user_name_validator(name):
+    """returns true if name is valid"""
+    # TODO: add check for vulgar words
+
+    valid_name_chars = "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"
+    for letter in name:
+        if letter.upper() not in valid_name_chars:
+            raise ValidationError(
+                "Имя содержит недопустимые символы. Могут быть только символы киррилического алфавита."
+            )
+    if len(name) < 2:
+        raise ValidationError("Имя слишком короткое")
+    return True