Update the nickname field creation logic (#196)

* Update the nickname field creation logic

* fix nickname field transfer

Author: wu-clan

backend/app/schemas/user.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import random
 from datetime import datetime
 
 from email_validator import validate_email, EmailNotValidError
@@ -22,7 +21,7 @@ class AuthLogin(Auth):
 
 
 class RegisterUser(Auth):
-    nickname: str = Field(f'用户{random.randrange(10000, 99999)}')
+    nickname: str | None = None
     email: str = Field(..., example='user@example.com')
 
     @validator('email')
@@ -37,7 +36,7 @@ def email_validate(cls, v):
 class AddUser(Auth):
     dept_id: int
     roles: list[int]
-    nickname: str = Field(f'用户{random.randrange(10000, 99999)}')
+    nickname: str | None = None
     email: str = Field(..., example='user@example.com')
 
     @validator('email')

backend/app/services/user_service.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import random
+
 from fastapi import Request
 from sqlalchemy import Select
 
@@ -23,9 +25,10 @@ async def register(*, obj: RegisterUser) -> None:
             username = await UserDao.get_by_username(db, obj.username)
             if username:
                 raise errors.ForbiddenError(msg='该用户名已注册')
+            obj.nickname = obj.nickname if obj.nickname else f'用户{random.randrange(10000, 99999)}'
             nickname = await UserDao.get_by_nickname(db, obj.nickname)
             if nickname:
-                raise errors.ForbiddenError(msg='该昵称已注册')
+                raise errors.ForbiddenError(msg='昵称已注册')
             email = await UserDao.check_email(db, obj.email)
             if email:
                 raise errors.ForbiddenError(msg='该邮箱已注册')
@@ -36,10 +39,11 @@ async def add(*, obj: AddUser) -> None:
         async with async_db_session.begin() as db:
             username = await UserDao.get_by_username(db, obj.username)
             if username:
-                raise errors.ForbiddenError(msg='该用户名已注册')
+                raise errors.ForbiddenError(msg='此用户名已注册')
+            obj.nickname = obj.nickname if obj.nickname else f'用户{random.randrange(10000, 99999)}'
             nickname = await UserDao.get_by_nickname(db, obj.nickname)
             if nickname:
-                raise errors.ForbiddenError(msg='该昵称已注册')
+                raise errors.ForbiddenError(msg='昵称已注册')
             dept = await DeptDao.get(db, obj.dept_id)
             if not dept:
                 raise errors.NotFoundError(msg='部门不存在')