♻️ refactor(api): 统一模块导入路径

- 修改代码中不一致的模块导入路径，使用统一的 app.models 路径
- 删除冗余和重复的导入语句
- 添加新的 item_model.py 模块并移动相关功能【模块重构】

♻️ refactor(test): 更新测试模块的导入路径

- 将测试模块中的导入路径与业务模块保持一致【模块重构】

Author: lucien277

backend/app/api/deps.py

@@ -13,8 +13,7 @@
 from app.core import security
 from app.core.config import settings
 from app.core.db import engine
-from app.model.users import User
-from app.models import TokenPayload
+from app.models import TokenPayload, User
 
 
 reusable_oauth2 = OAuth2PasswordBearer(

backend/app/api/routes/items.py

@@ -3,11 +3,9 @@
 
 from fastapi import APIRouter
 
-
 from app.api.deps import CurrentUser, SessionDep
-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
+from app.models import ItemCreate, ItemPublic, ItemsPublic, ItemUpdate, Message
 
 router = APIRouter(prefix="/items", tags=["items"])
 

backend/app/api/routes/login.py

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

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 backend.app.model.user_model import User, UserPublic
+from app.models import User, UserPublic
 
 router = APIRouter(tags=["private"], prefix="/private")
 

backend/app/api/routes/users.py

@@ -9,7 +9,9 @@
     get_current_active_superuser,
 )
 from app.core.config import settings
-from backend.app.model.user_model import (
+from app.service.user_service import UserService
+from app.models import (
+    Message,
     UpdatePassword,
     UserCreate,
     UserPublic,
@@ -18,8 +20,6 @@
     UserUpdate,
     UserUpdateMe,
 )
-from app.models import Message
-from app.service.user_service import UserService
 from app.utils import generate_new_account_email, send_email
 
 router = APIRouter(prefix="/users", tags=["users"])

backend/app/core/db.py

@@ -1,9 +1,8 @@
 from sqlmodel import Session, create_engine, select
 
-
 from app.core.config import settings
-from backend.app.model.user_model import User, UserCreate
 from app.service.user_service import UserService
+from app.models import User, UserCreate
 
 engine = create_engine(str(settings.SQLALCHEMY_DATABASE_URI))
 

backend/app/model/item_model.py

@@ -0,0 +1,53 @@
+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 Item, ItemCreate, ItemUpdate
+
+
+class ItemModel:
+    def __init__(self, session: Session):
+        self.session = session
+
+    def create(self, item_create: ItemCreate, owner_id: uuid.UUID) -> Item:
+        db_obj = Item.model_validate(
+            item_create,
+            update={"owner_id": owner_id},
+        )
+        self.session.add(db_obj)
+        self.session.commit()
+        self.session.refresh(db_obj)
+        return db_obj
+
+    def update(self, db_item: Item, item_in: ItemUpdate) -> Item:
+        item_data = item_in.model_dump(exclude_unset=True)
+        db_item.sqlmodel_update(item_data)
+        self.session.add(db_item)
+        self.session.commit()
+        self.session.refresh(db_item)
+        return db_item
+
+    def get_by_id(self, item_id: str) -> "Item | None":
+        statement = select(Item).where(Item.id == uuid.UUID(item_id))
+        return self.session.exec(statement).first()
+
+    def get_items(self, skip: int = 0, limit: int = 100, owner_id: uuid.UUID | None = None) -> dict:
+        query = select(Item)
+        if owner_id:
+            query = query.where(Item.owner_id == owner_id)
+            
+        count_statement = select(func.count()).select_from(query.subquery())
+        count = self.session.exec(count_statement).one()
+        
+        query = query.offset(skip).limit(limit)
+        items = self.session.exec(query).all()
+        return {"data": items, "count": count}
+
+    def delete_item(self, item_id: str) -> None:
+        item = self.get_by_id(item_id)
+        if item:
+            self.session.delete(item)
+            self.session.commit()

backend/app/model/items_model.py

@@ -13,7 +13,7 @@ def __init__(self, session: Session):
         self.session = session
 
     def create(cls, user_create: UserCreate) -> "User":
-        db_obj = cls.model_validate(
+        db_obj = User.model_validate(
             user_create,
             update={"hashed_password": get_password_hash(user_create.password)},
         )

backend/app/model/user_model.py

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