♻️ refactor(items): 将物品路由逻辑迁移至服务层

- 新增ItemService处理所有物品相关业务逻辑
- 重构路由函数调用服务层方法
- 移除直接数据库操作实现关注点分离

🗑️ chore(crud): 删除遗留的CRUD模块

- 迁移所有CRUD功能至对应的服务类
- 清理不再使用的遗留代码

💄 style(code): 调整代码格式和导入顺序

- 统一模型文件的导入顺序
- 格式化长参数列表为更易读的多行格式
- 移除未使用的导入依赖

Author: lucien277

backend/app/api/routes/items.py

@@ -1,12 +1,13 @@
 import uuid
 from typing import Any
 
-from fastapi import APIRouter, HTTPException
-from sqlmodel import func, select
+from fastapi import APIRouter
+
 
 from app.api.deps import CurrentUser, SessionDep
-from app.models import TokenPayload
-from app.model.users import User
+from app.model.items import ItemCreate, ItemPublic, ItemsPublic, ItemUpdate
+from app.model.users import Message
+from app.service.item_service import ItemService
 
 router = APIRouter(prefix="/items", tags=["items"])
 
@@ -18,42 +19,25 @@ def read_items(
     """
     Retrieve items.
     """
-
-    if current_user.is_superuser:
-        count_statement = select(func.count()).select_from(Item)
-        count = session.exec(count_statement).one()
-        statement = select(Item).offset(skip).limit(limit)
-        items = session.exec(statement).all()
-    else:
-        count_statement = (
-            select(func.count())
-            .select_from(Item)
-            .where(Item.owner_id == current_user.id)
-        )
-        count = session.exec(count_statement).one()
-        statement = (
-            select(Item)
-            .where(Item.owner_id == current_user.id)
-            .offset(skip)
-            .limit(limit)
-        )
-        items = session.exec(statement).all()
-
-    return ItemsPublic(data=items, count=count)
+    item_service = ItemService(session)
+    result = item_service.read_items(
+        owner_id=current_user.id,
+        is_superuser=current_user.is_superuser,
+        skip=skip,
+        limit=limit,
+    )
+    return ItemsPublic(data=result["data"], count=result["count"])
 
 
 @router.get("/{id}", response_model=ItemPublic)
 def read_item(session: SessionDep, current_user: CurrentUser, id: uuid.UUID) -> Any:
     """
     Get item by ID.
     """
-    item = session.get(Item, id)
-    if not item:
-        raise HTTPException(status_code=404, detail="Item not found")
-    if not current_user.is_superuser and (item.owner_id != current_user.id):
-        raise HTTPException(status_code=400, detail="Not enough permissions")
-    return item
-
+    item_service = ItemService(session)
+    return item_service.read_item(
+        item_id=id, owner_id=current_user.id, is_superuser=current_user.is_superuser
+    )
 
 @router.post("/", response_model=ItemPublic)
 def create_item(
@@ -62,11 +46,8 @@ def create_item(
     """
     Create new item.
     """
-    item = Item.model_validate(item_in, update={"owner_id": current_user.id})
-    session.add(item)
-    session.commit()
-    session.refresh(item)
-    return item
+    item_service = ItemService(session)
+    return item_service.create_item(item_in, current_user.id)
 
 
 @router.put("/{id}", response_model=ItemPublic)
@@ -80,17 +61,13 @@ def update_item(
     """
     Update an item.
     """
-    item = session.get(Item, id)
-    if not item:
-        raise HTTPException(status_code=404, detail="Item not found")
-    if not current_user.is_superuser and (item.owner_id != current_user.id):
-        raise HTTPException(status_code=400, detail="Not enough permissions")
-    update_dict = item_in.model_dump(exclude_unset=True)
-    item.sqlmodel_update(update_dict)
-    session.add(item)
-    session.commit()
-    session.refresh(item)
-    return item
+    item_service = ItemService(session)
+    return item_service.update_item(
+        item_id=id,
+        item_in=item_in,
+        owner_id=current_user.id,
+        is_superuser=current_user.is_superuser,
+    )
 
 
 @router.delete("/{id}")
@@ -100,11 +77,7 @@ def delete_item(
     """
     Delete an item.
     """
-    item = session.get(Item, id)
-    if not item:
-        raise HTTPException(status_code=404, detail="Item not found")
-    if not current_user.is_superuser and (item.owner_id != current_user.id):
-        raise HTTPException(status_code=400, detail="Not enough permissions")
-    session.delete(item)
-    session.commit()
-    return Message(message="Item deleted successfully")
+    item_service = ItemService(session)
+    item_service.delete_item(
+        item_id=id, owner_id=current_user.id, is_superuser=current_user.is_superuser
+    )

backend/app/crud.py

@@ -1,8 +1,7 @@
 import uuid
 from typing import Any
 
-from sqlmodel import Field, Relationship, SQLModel, Session, select, func
-from fastapi import HTTPException
+from sqlmodel import Field, Relationship, Session, SQLModel, func, select
 
 from app.model.users import User
 
@@ -33,7 +32,9 @@ class Item(ItemBase, table=True):
     owner: User | None = Relationship(back_populates="items")
 
     @classmethod
-    def create(cls, session: Session, item_in: ItemCreate, owner_id: uuid.UUID) -> "Item":
+    def create(
+        cls, session: Session, item_in: ItemCreate, owner_id: uuid.UUID
+    ) -> "Item":
         db_item = cls.model_validate(item_in, update={"owner_id": owner_id})
         session.add(db_item)
         session.commit()
@@ -42,7 +43,12 @@ def create(cls, session: Session, item_in: ItemCreate, owner_id: uuid.UUID) -> "
 
     @classmethod
     def get_items(
-        cls, session: Session, owner_id: uuid.UUID, is_superuser: bool, skip: int = 0, limit: int = 100
+        cls,
+        session: Session,
+        owner_id: uuid.UUID,
+        is_superuser: bool,
+        skip: int = 0,
+        limit: int = 100,
     ) -> Any:
         if is_superuser:
             count_statement = select(func.count()).select_from(cls)
@@ -51,16 +57,11 @@ def get_items(
             items = session.exec(statement).all()
         else:
             count_statement = (
-                select(func.count())
-                .select_from(cls)
-                .where(cls.owner_id == owner_id)
+                select(func.count()).select_from(cls).where(cls.owner_id == owner_id)
             )
             count = session.exec(count_statement).one()
             statement = (
-                select(cls)
-                .where(cls.owner_id == owner_id)
-                .offset(skip)
-                .limit(limit)
+                select(cls).where(cls.owner_id == owner_id).offset(skip).limit(limit)
             )
             items = session.exec(statement).all()
         return {"data": items, "count": count}

backend/app/model/items.py

@@ -1,9 +1,10 @@
 from fastapi.testclient import TestClient
 from sqlmodel import Session
 
-from app.service.user_service import UserService
+
 from app.core.config import settings
 from app.model.users import User, UserCreate, UserUpdate
+from app.service.user_service import UserService
 from app.tests.utils.utils import random_email, random_lower_string