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

Add old_id to account_user

Browse Source
This commit is contained in:
littlewolf 2019-10-29 11:30:33 +03:00
parent 7613ece6f8
commit 72c6545a34
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/account/models.py
View File

@ -94,6 +94,8 @@ class User(AbstractUser):
unconfirmed_email = models.EmailField(_('unconfirmed email'), blank=True, null=True, default=None) unconfirmed_email = models.EmailField(_('unconfirmed email'), blank=True, null=True, default=None)
email_confirmed = models.BooleanField(_('email status'), default=False) email_confirmed = models.BooleanField(_('email status'), default=False)
newsletter = models.NullBooleanField(default=True) newsletter = models.NullBooleanField(default=True)
old_id = models.IntegerField(null=True, blank=True, default=None)
EMAIL_FIELD = 'email' EMAIL_FIELD = 'email'
USERNAME_FIELD = 'username' USERNAME_FIELD = 'username'

3
apps/transfer/serializers/account.py
View File

@ -6,17 +6,20 @@ class UserSerializer(serializers.ModelSerializer):
nickname = serializers.CharField() nickname = serializers.CharField()
email = serializers.CharField() email = serializers.CharField()
confirmed_at = serializers.DateTimeField() confirmed_at = serializers.DateTimeField()
id = serializers.CharField()
class Meta: class Meta:
model = User model = User
fields = ( fields = (
"id",
"nickname", "nickname",
"email", "email",
"confirmed_at" "confirmed_at"
) )
def validate(self, data): def validate(self, data):
data["old_id"] = data.pop("id")
data["username"] = self.get_username(data) data["username"] = self.get_username(data)
data["email_confirmed"] = self.get_email_confirmed(data) data["email_confirmed"] = self.get_email_confirmed(data)
data.pop("nickname") data.pop("nickname")