Merge remote-tracking branch 'origin/feature/auto-username' into develop
This commit is contained in:
commit
d2c03b0f37
|
|
@ -18,6 +18,7 @@ from utils.tokens import GMRefreshToken
|
||||||
# Serializers
|
# Serializers
|
||||||
class SignupSerializer(serializers.ModelSerializer):
|
class SignupSerializer(serializers.ModelSerializer):
|
||||||
"""Signup serializer serializer mixin"""
|
"""Signup serializer serializer mixin"""
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = account_models.User
|
model = account_models.User
|
||||||
fields = (
|
fields = (
|
||||||
|
|
@ -35,11 +36,18 @@ class SignupSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
def validate_username(self, value):
|
def validate_username(self, value):
|
||||||
"""Custom username validation"""
|
"""Custom username validation"""
|
||||||
|
if value:
|
||||||
valid = utils_methods.username_validator(username=value)
|
valid = utils_methods.username_validator(username=value)
|
||||||
if not valid:
|
if not valid:
|
||||||
raise utils_exceptions.NotValidUsernameError()
|
raise utils_exceptions.NotValidUsernameError()
|
||||||
if account_models.User.objects.filter(username__iexact=value).exists():
|
if account_models.User.objects.filter(username__iexact=value).exists():
|
||||||
raise serializers.ValidationError()
|
raise serializers.ValidationError()
|
||||||
|
|
||||||
|
else:
|
||||||
|
value = utils_methods.username_random()
|
||||||
|
while account_models.User.objects.filter(username__iexact=value).exists():
|
||||||
|
value = utils_methods.username_random()
|
||||||
|
|
||||||
return value
|
return value
|
||||||
|
|
||||||
def validate_email(self, value):
|
def validate_email(self, value):
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,14 @@ def username_validator(username: str) -> bool:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def username_random():
|
||||||
|
"""Generate random username"""
|
||||||
|
return '{letters}{digits}'.format(
|
||||||
|
letters=''.join([random.choice(string.ascii_lowercase) for _ in range(5)]),
|
||||||
|
digits=random.randrange(100, 1000)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def image_path(instance, filename):
|
def image_path(instance, filename):
|
||||||
"""Determine avatar path method."""
|
"""Determine avatar path method."""
|
||||||
filename = '%s.jpeg' % generate_code()
|
filename = '%s.jpeg' % generate_code()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user