diff --git a/apps/account/models.py b/apps/account/models.py index cf883acd..ee4d5d9d 100644 --- a/apps/account/models.py +++ b/apps/account/models.py @@ -181,13 +181,6 @@ class User(ImageMixin, AbstractUser): 'domain_uri': settings.DOMAIN_URI, 'site_name': settings.SITE_NAME}) - @property - def fullname(self): - fullname = [] - if self.first_name: fullname.append(self.first_name) - if self.last_name: fullname.append(self.last_name) - return ' '.join(fullname) - class ResetPasswordTokenQuerySet(models.QuerySet): """Reset password token query set""" diff --git a/apps/account/serializers/common.py b/apps/account/serializers/common.py index 9de2c3d0..58481960 100644 --- a/apps/account/serializers/common.py +++ b/apps/account/serializers/common.py @@ -14,7 +14,7 @@ class UserSerializer(serializers.ModelSerializer): """User serializer.""" # RESPONSE email_confirmed = serializers.BooleanField(read_only=True) - fullname = serializers.SerializerMethodField() + fullname = serializers.CharField(source='get_full_name') # REQUEST username = serializers.CharField(required=False) @@ -39,10 +39,6 @@ class UserSerializer(serializers.ModelSerializer): 'newsletter', ] - def get_fullname(self, obj): - """Get user full name""" - return obj.fullname - def validate_email(self, value): """Validate email value""" if value == self.instance.email: