diff --git a/apps/account/models.py b/apps/account/models.py index 2f8c97cc..13943878 100644 --- a/apps/account/models.py +++ b/apps/account/models.py @@ -94,6 +94,8 @@ class User(AbstractUser): unconfirmed_email = models.EmailField(_('unconfirmed email'), blank=True, null=True, default=None) email_confirmed = models.BooleanField(_('email status'), default=False) newsletter = models.NullBooleanField(default=True) + old_id = models.IntegerField(null=True, blank=True, default=None) + EMAIL_FIELD = 'email' USERNAME_FIELD = 'username' diff --git a/apps/transfer/serializers/account.py b/apps/transfer/serializers/account.py index 123b374b..5b0e1369 100644 --- a/apps/transfer/serializers/account.py +++ b/apps/transfer/serializers/account.py @@ -6,17 +6,20 @@ class UserSerializer(serializers.ModelSerializer): nickname = serializers.CharField() email = serializers.CharField() confirmed_at = serializers.DateTimeField() + id = serializers.CharField() class Meta: model = User fields = ( + "id", "nickname", "email", "confirmed_at" ) def validate(self, data): + data["old_id"] = data.pop("id") data["username"] = self.get_username(data) data["email_confirmed"] = self.get_email_confirmed(data) data.pop("nickname")