新增用户注册功能

backend/app/schemas/user.py

@@ -1,54 +1,104 @@
+import re
 import uuid
 from datetime import datetime
 from typing import Literal, Optional
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, EmailStr, Field, field_validator
 
 UserRole = Literal["PM", "CRA", "PV", "IMP", "ADMIN"]
+RegisterRole = Literal["PM", "CRA", "PV", "IMP"]
+UserStatus = Literal["PENDING", "ACTIVE", "REJECTED", "DISABLED"]
+
+PASSWORD_REGEX = re.compile(r"^(?=.*[A-Za-z])(?=.*\d).{8,}$")
 
 
 class UserDisplay(BaseModel):
-  id: uuid.UUID
-  username: str
-  display_name: Optional[str] = None
-
-  model_config = ConfigDict(from_attributes=True)
-
-
-class UserBase(BaseModel):
-    username: str = Field(min_length=1)
+    id: uuid.UUID
+    email: EmailStr
+    full_name: str
     role: UserRole
-    is_active: bool = True
+    avatar_url: Optional[str] = None
+
+    model_config = ConfigDict(from_attributes=True)
 
 
-class UserCreate(BaseModel):
-    username: str = Field(min_length=1)
-    password: str = Field(min_length=1)
+class _PasswordValidator(BaseModel):
+    password: Optional[str] = Field(default=None, min_length=8)
+
+    @field_validator("password")
+    @classmethod
+    def validate_password_strength(cls, v: Optional[str]) -> Optional[str]:
+        if v is None:
+            return v
+        if not PASSWORD_REGEX.match(v):
+            raise ValueError("密码需至少 8 位且包含字母和数字")
+        return v
+
+
+class UserRegisterRequest(_PasswordValidator):
+    password: str = Field(min_length=8)
+    email: EmailStr
+    full_name: str = Field(min_length=1)
+    role: RegisterRole
+    department: str = Field(min_length=1)
+
+
+class UserCreate(_PasswordValidator):
+    password: str = Field(min_length=8)
+    email: EmailStr
+    full_name: str = Field(min_length=1)
     role: UserRole
+    department: str = Field(min_length=1)
+    status: UserStatus = "ACTIVE"
 
 
 class UserRead(BaseModel):
     id: uuid.UUID
+    email: EmailStr
     username: str
+    full_name: str
     role: UserRole
+    department: str
+    status: UserStatus
     is_active: bool
     created_at: datetime
+    approved_at: Optional[datetime] = None
+    approved_by: Optional[uuid.UUID] = None
+    avatar_url: Optional[str] = None
 
     model_config = ConfigDict(from_attributes=True)
 
 
-class UserUpdate(BaseModel):
+class UserUpdate(_PasswordValidator):
+    email: Optional[EmailStr] = None
+    full_name: Optional[str] = None
     role: Optional[UserRole] = None
+    department: Optional[str] = None
+    status: Optional[UserStatus] = None
+    password: Optional[str] = None
     is_active: Optional[bool] = None
-    password: Optional[str] = Field(default=None, min_length=1)
+    avatar_url: Optional[str] = None
 
 
-class UserInDB(UserBase):
-    id: uuid.UUID
-    hashed_password: str
-    created_at: datetime
+class UserResponse(UserRead):
+    pass
 
-    model_config = ConfigDict(from_attributes=True)
+
+class UserAdminReviewRequest(BaseModel):
+    action: Literal["approve", "reject"]
+
+
+class AdminUserListResponse(BaseModel):
+    items: list[UserResponse]
+    total: int
+
+
+class UserSelfUpdate(_PasswordValidator):
+    full_name: Optional[str] = None
+    department: Optional[str] = None
+    password: Optional[str] = None
+    current_password: Optional[str] = None
+    avatar_url: Optional[str] = None
 
 
 class Token(BaseModel):