Replace EmailStr with custom email validation to avoid dependency issues
This commit is contained in:
parent
f34b8ad922
commit
48f0c4364e
@ -1,20 +1,32 @@
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, EmailStr
|
||||
import re
|
||||
from pydantic import BaseModel, field_validator
|
||||
|
||||
from app.models.user import UserRole
|
||||
|
||||
# Remove EmailStr import and use custom validation instead
|
||||
|
||||
|
||||
# Shared properties
|
||||
class UserBase(BaseModel):
|
||||
email: Optional[EmailStr] = None
|
||||
email: Optional[str] = None
|
||||
is_active: Optional[bool] = True
|
||||
role: Optional[UserRole] = None
|
||||
|
||||
@field_validator('email')
|
||||
@classmethod
|
||||
def validate_email(cls, v):
|
||||
if v is None:
|
||||
return v
|
||||
pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
|
||||
if not re.match(pattern, v):
|
||||
raise ValueError('Invalid email format')
|
||||
return v
|
||||
|
||||
|
||||
# Properties to receive via API on creation
|
||||
class UserCreate(UserBase):
|
||||
email: EmailStr
|
||||
email: str
|
||||
password: str
|
||||
role: UserRole = UserRole.USER
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user