重构

account/migrations/0004_auto_20160925_1649.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-09-25 08:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0003_auto_20160925_1402'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='language',
+            field=models.CharField(blank=True, max_length=32, null=True),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='major',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+        migrations.AddField(
+            model_name='userprofile',
+            name='time_zone',
+            field=models.CharField(blank=True, max_length=32, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='auth_token',
+            field=models.CharField(max_length=40, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=254, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='open_api_appkey',
+            field=models.CharField(max_length=35, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='real_name',
+            field=models.CharField(max_length=30, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='reset_password_token',
+            field=models.CharField(max_length=40, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='reset_password_token_create_time',
+            field=models.DateTimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='tfa_token',
+            field=models.CharField(max_length=40, null=True),
+        ),
+    ]

account/models.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+from __future__ import unicode_literals
 from django.contrib.auth.models import AbstractBaseUser
 from django.db import models
 from jsonfield import JSONField
@@ -33,8 +34,8 @@ class UserManager(models.Manager):
 
 class User(AbstractBaseUser):
     username = models.CharField(max_length=30, unique=True)
-    real_name = models.CharField(max_length=30, blank=True, null=True)
-    email = models.EmailField(max_length=254, blank=True, null=True)
+    real_name = models.CharField(max_length=30, null=True)
+    email = models.EmailField(max_length=254, null=True)
     create_time = models.DateTimeField(auto_now_add=True, null=True)
     # One of UserType
     admin_type = models.IntegerField(default=0)
@@ -43,15 +44,15 @@ class User(AbstractBaseUser):
     # Store user problem solution status with json string format
     # {"problems": {1: ProblemSolutionStatus.ACCEPTED}, "contest_problems": {20: ProblemSolutionStatus.PENDING)}
     problems_status = JSONField(default={})
-    reset_password_token = models.CharField(max_length=40, blank=True, null=True)
-    reset_password_token_create_time = models.DateTimeField(blank=True, null=True)
+    reset_password_token = models.CharField(max_length=40, null=True)
+    reset_password_token_create_time = models.DateTimeField(null=True)
     # SSO auth token
-    auth_token = models.CharField(max_length=40, blank=True, null=True)
+    auth_token = models.CharField(max_length=40, null=True)
     two_factor_auth = models.BooleanField(default=False)
-    tfa_token = models.CharField(max_length=40, blank=True, null=True)
+    tfa_token = models.CharField(max_length=40, null=True)
     # open api key
     open_api = models.BooleanField(default=False)
-    open_api_appkey = models.CharField(max_length=35, blank=True, null=True)
+    open_api_appkey = models.CharField(max_length=35, null=True)
     is_disabled = models.BooleanField(default=False)
 
     USERNAME_FIELD = 'username'
@@ -80,8 +81,10 @@ class UserProfile(models.Model):
     submission_number = models.IntegerField(default=0)
     phone_number = models.CharField(max_length=15, blank=True, null=True)
     school = models.CharField(max_length=200, blank=True, null=True)
-
+    major = models.CharField(max_length=200, blank=True, null=True)
     student_id = models.CharField(max_length=15, blank=True, null=True)
+    time_zone = models.CharField(max_length=32, blank=True, null=True)
+    language = models.CharField(max_length=32, blank=True, null=True)
 
     def add_accepted_problem_number(self):
         self.accepted_problem_number = models.F("accepted_problem_number") + 1