♻️ refactor(model): 调整模型文件结构及引用路径

- 将用户和条目模型文件重命名为user_model.py与items_model.py
- 更新所有相关模块的模型引用路径以匹配新文件结构
- 移除旧的users.py和items.py模型文件
- 在服务层和测试用例中同步更新模型类导入路径

Author: lucien277

backend/app/api/routes/items.py

@@ -5,8 +5,8 @@
 
 
 from app.api.deps import CurrentUser, SessionDep
-from app.model.items import ItemCreate, ItemPublic, ItemsPublic, ItemUpdate
-from app.model.users import Message
+from backend.app.model.items_model import ItemCreate, ItemPublic, ItemsPublic, ItemUpdate
+from backend.app.model.user_model import Message
 from app.service.item_service import ItemService
 
 router = APIRouter(prefix="/items", tags=["items"])

backend/app/api/routes/login.py

@@ -9,9 +9,9 @@
 from app.core import security
 from app.core.config import settings
 from app.core.security import get_password_hash
-from app.model.users import UserPublic
+from backend.app.model.user_model import UserPublic
 from app.models import Message, NewPassword, Token
-from app.model.users import UserPublic
+from backend.app.model.user_model import UserPublic
 from app.service.user_service import UserService
 from app.utils import (
     generate_password_reset_token,

backend/app/api/routes/private.py

@@ -5,7 +5,7 @@
 
 from app.api.deps import SessionDep
 from app.core.security import get_password_hash
-from app.model.users import User, UserPublic
+from backend.app.model.user_model import User, UserPublic
 
 router = APIRouter(tags=["private"], prefix="/private")
 

backend/app/api/routes/users.py

@@ -9,7 +9,7 @@
     get_current_active_superuser,
 )
 from app.core.config import settings
-from app.model.users import (
+from backend.app.model.user_model import (
     UpdatePassword,
     UserCreate,
     UserPublic,

backend/app/core/db.py

@@ -2,7 +2,7 @@
 
 
 from app.core.config import settings
-from app.model.users import User, UserCreate
+from backend.app.model.user_model import User, UserCreate
 from app.service.user_service import UserService
 
 engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))

backend/app/model/items.py

@@ -0,0 +1,57 @@
+import uuid
+from typing import Any
+
+from sqlalchemy import func
+from sqlmodel import Session, select
+
+from app.core.security import get_password_hash
+from app.types import User, UserCreate, UserUpdate
+
+
+class UserModel:
+    def __init__(self, session: Session):
+        self.session = session
+
+    def create(cls, user_create: UserCreate) -> "User":
+        db_obj = cls.model_validate(
+            user_create,
+            update={"hashed_password": get_password_hash(user_create.password)},
+        )
+        cls.session.add(db_obj)
+        cls.session.commit()
+        cls.session.refresh(db_obj)
+        return db_obj
+
+    def update(cls, db_user: "User", user_in: UserUpdate) -> Any:
+        user_data = user_in.model_dump(exclude_unset=True)
+        extra_data = {}
+        if "password" in user_data:
+            password = user_data["password"]
+            hashed_password = get_password_hash(password)
+            extra_data["hashed_password"] = hashed_password
+        db_user.sqlmodel_update(user_data, update=extra_data)
+        cls.session.add(db_user)
+        cls.session.commit()
+        cls.session.refresh(db_user)
+        return db_user
+
+    def get_by_email(cls, email: str) -> "User | None":
+        statement = select(cls.__class__).where(cls.__class__.email == email)
+        return cls.session.exec(statement).first()
+
+    def get_by_id(cls, user_id: str) -> "User | None":
+        statement = select(cls.__class__).where(cls.__class__.id == uuid.UUID(user_id))
+        return cls.session.exec(statement).first()
+
+    def get_users(cls, skip: int = 0, limit: int = 100) -> dict:
+        count_statement = select(func.count()).select_from(cls.__class__)
+        count = cls.session.exec(count_statement).one()
+        statement = select(cls.__class__).offset(skip).limit(limit)
+        users = cls.session.exec(statement).all()
+        return {"data": users, "count": count}
+
+    def delete_user(cls, user_id: str) -> None:
+        user = cls.get_by_id(user_id)
+        if user:
+            cls.session.delete(user)
+            cls.session.commit()

backend/app/model/items_model.py

@@ -0,0 +1,57 @@
+import uuid
+from typing import Any
+
+from sqlalchemy import func
+from sqlmodel import Session, select
+
+from app.core.security import get_password_hash
+from app.models import User, UserCreate, UserUpdate
+
+
+class UserModel:
+    def __init__(self, session: Session):
+        self.session = session
+
+    def create(cls, user_create: UserCreate) -> "User":
+        db_obj = cls.model_validate(
+            user_create,
+            update={"hashed_password": get_password_hash(user_create.password)},
+        )
+        cls.session.add(db_obj)
+        cls.session.commit()
+        cls.session.refresh(db_obj)
+        return db_obj
+
+    def update(cls, db_user: "User", user_in: UserUpdate) -> Any:
+        user_data = user_in.model_dump(exclude_unset=True)
+        extra_data = {}
+        if "password" in user_data:
+            password = user_data["password"]
+            hashed_password = get_password_hash(password)
+            extra_data["hashed_password"] = hashed_password
+        db_user.sqlmodel_update(user_data, update=extra_data)
+        cls.session.add(db_user)
+        cls.session.commit()
+        cls.session.refresh(db_user)
+        return db_user
+
+    def get_by_email(cls, email: str) -> "User | None":
+        statement = select(cls.__class__).where(cls.__class__.email == email)
+        return cls.session.exec(statement).first()
+
+    def get_by_id(cls, user_id: str) -> "User | None":
+        statement = select(cls.__class__).where(cls.__class__.id == uuid.UUID(user_id))
+        return cls.session.exec(statement).first()
+
+    def get_users(cls, skip: int = 0, limit: int = 100) -> dict:
+        count_statement = select(func.count()).select_from(cls.__class__)
+        count = cls.session.exec(count_statement).one()
+        statement = select(cls.__class__).offset(skip).limit(limit)
+        users = cls.session.exec(statement).all()
+        return {"data": users, "count": count}
+
+    def delete_user(cls, user_id: str) -> None:
+        user = cls.get_by_id(user_id)
+        if user:
+            cls.session.delete(user)
+            cls.session.commit()

backend/app/model/user_model.py

@@ -4,7 +4,7 @@
 from fastapi import HTTPException
 from sqlmodel import Session
 
-from app.model.items import Item, ItemCreate, ItemUpdate
+from backend.app.model.items_model import Item, ItemCreate, ItemUpdate
 from app.models import Message
 
 class ItemService: