phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/auto-username' into develop

Browse Source
This commit is contained in:
dormantman 2020-01-14 21:17:17 +03:00
commit d2c03b0f37
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/authorization/serializers/common.py
View File

@ -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"""
valid = utils_methods.username_validator(username=value) if value:
if not valid: valid = utils_methods.username_validator(username=value)
raise utils_exceptions.NotValidUsernameError() if not valid:
if account_models.User.objects.filter(username__iexact=value).exists(): raise utils_exceptions.NotValidUsernameError()
raise serializers.ValidationError() if account_models.User.objects.filter(username__iexact=value).exists():
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):

10
apps/utils/methods.py
View File

@ -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()
@ -185,4 +193,4 @@ def get_image_meta_by_url(url) -> (int, int, int):
image_raw = requests.get(url) image_raw = requests.get(url)
image = Image.open(BytesIO(image_raw.content)) image = Image.open(BytesIO(image_raw.content))
width, height = image.size width, height = image.size
return int(image_raw.headers.get('content-length')), width, height return int(image_raw.headers.get('content-length')), width, height