Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/local_model/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class User(models.Model):
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id")
email = models.EmailField(unique=True, null=True, blank=True, verbose_name="邮箱", db_index=True)
phone = models.CharField(max_length=20, verbose_name="电话", default="", db_index=True)
nick_name = models.CharField(max_length=150, verbose_name="昵称", unique=True, db_index=True)
nick_name = models.CharField(max_length=150, verbose_name="昵称", db_index=True)
username = models.CharField(max_length=150, unique=True, verbose_name="用户名", db_index=True)
password = models.CharField(max_length=150, verbose_name="密码")
role = models.CharField(max_length=150, verbose_name="角色")
Expand Down
2 changes: 1 addition & 1 deletion apps/users/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class User(models.Model):
id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id")
email = models.EmailField(unique=True, null=True, blank=True, verbose_name="邮箱", db_index=True)
phone = models.CharField(max_length=20, verbose_name="电话", default="", db_index=True)
nick_name = models.CharField(max_length=150, verbose_name="昵称", unique=True, db_index=True)
nick_name = models.CharField(max_length=150, verbose_name="昵称", db_index=True)
username = models.CharField(max_length=150, unique=True, verbose_name="用户名", db_index=True)
password = models.CharField(max_length=150, verbose_name="密码")
role = models.CharField(max_length=150, verbose_name="角色")
Expand Down
11 changes: 1 addition & 10 deletions apps/users/serializers/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,12 @@ def is_valid(self, *, raise_exception=True):
def _check_unique_username_and_email(self):
username = self.data.get('username')
email = self.data.get('email')
nick_name = self.data.get('nick_name')
user = User.objects.filter(Q(username=username) | Q(email=email) | Q(nick_name=nick_name)).first()
user = User.objects.filter(Q(username=username) | Q(email=email)).first()
if user:
if user.email == email:
raise ExceptionCodeConstants.EMAIL_IS_EXIST.value.to_app_api_exception()
if user.username == username:
raise ExceptionCodeConstants.USERNAME_IS_EXIST.value.to_app_api_exception()
if user.nick_name == nick_name:
raise ExceptionCodeConstants.NICKNAME_IS_EXIST.value.to_app_api_exception()

class Query(serializers.Serializer):
username = serializers.CharField(
Expand Down Expand Up @@ -411,12 +408,6 @@ class UserEditInstance(serializers.Serializer):
def is_valid(self, *, user_id=None, raise_exception=False):
super().is_valid(raise_exception=True)
self._check_unique_email(user_id)
self._check_unique_nick_name(user_id)

def _check_unique_nick_name(self, user_id):
nick_name = self.data.get('nick_name')
if nick_name and User.objects.filter(nick_name=nick_name).exclude(id=user_id).exists():
raise AppApiException(1008, _('Nickname is already in use'))

def _check_unique_email(self, user_id):
email = self.data.get('email')
Expand Down
Loading