批次5:inventory服务下沉收口 + Pydantic v2 / datetime弃用清零
- inventory业务层下沉(薄路由+service orchestration模式): - customer/supplier/warehouse -> master_data_service - material_routes(价格历史/趋势/供应商关联)-> material_service - product_routes(CRUD/BOM/from-task跨模块桥接)-> product_service - dashboard_routes(首页统计/低库存预警)-> dashboard_service - inventory侧新增service回归覆盖(dashboard 2 / master_data 10 / material 10 / product 14),含跨模块桥接测试种子 - Pydantic v2弃用清零:全仓14处 class Config 全部迁移到 model_config = ConfigDict(from_attributes=True)(含 shared auth) - datetime.utcnow() 弃用清零:auth_service 3处统一改 datetime.now(timezone.utc) - 同步文档:STATUS / ROADMAP / TECH_DEBT(D12清偿)/ AGENTS 代码地图 测试基线:126 passed, 4 skipped(无deprecation warning) Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
+32
-2
@@ -20,9 +20,10 @@ from inventory.api import inventory_router
|
||||
from shared.models.base import Base
|
||||
from shared.models.identity import User
|
||||
from inventory.models import Customer, Warehouse, Supplier, Product, ProductMaterial, Inventory, MaterialSupplier, SalesOrder, SalesOrderItem
|
||||
from moldinsight.models import STPFile, ProcessingTask
|
||||
import moldinsight.models # noqa: F401 # 全量注册:create_all 需含 moldinsight 表(stp_files 等)
|
||||
from shared.database.database import get_db_session
|
||||
from shared.services.auth_service import get_current_active_user
|
||||
from shared.services.auth_service import get_current_active_user, get_current_admin_user
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
@@ -133,7 +134,30 @@ async def seeded_db(async_engine):
|
||||
lead_time=7,
|
||||
)
|
||||
|
||||
session.add_all([user, customer, supplier, warehouse, material, finished, finished_no_bom, bom, inv, ms])
|
||||
stp_file = STPFile(
|
||||
id=1,
|
||||
original_filename="demo-mold.stp",
|
||||
object_key="uploads/demo.stp",
|
||||
storage_bucket="test-bucket",
|
||||
file_size=123,
|
||||
file_hash="hash-demo-1",
|
||||
mime_type="application/step",
|
||||
user_id=user.id,
|
||||
volume=1000.0,
|
||||
surface_area=200.0,
|
||||
product_weight=50.0,
|
||||
)
|
||||
task = ProcessingTask(
|
||||
id=1,
|
||||
task_id="task-demo-1",
|
||||
status="completed",
|
||||
task_type="stp_parsing",
|
||||
progress=100,
|
||||
current_step="done",
|
||||
stp_file_id=stp_file.id,
|
||||
)
|
||||
|
||||
session.add_all([user, customer, supplier, warehouse, material, finished, finished_no_bom, bom, inv, ms, stp_file, task])
|
||||
await session.commit()
|
||||
|
||||
async with session_factory() as session:
|
||||
@@ -156,8 +180,14 @@ async def client(async_engine, seeded_db):
|
||||
result = await session.execute(select(User).where(User.username == "tester"))
|
||||
return result.scalar_one()
|
||||
|
||||
async def override_get_current_admin_user():
|
||||
async with session_factory() as session:
|
||||
result = await session.execute(select(User).where(User.username == "tester"))
|
||||
return result.scalar_one()
|
||||
|
||||
test_app.dependency_overrides[get_db_session] = override_get_db_session
|
||||
test_app.dependency_overrides[get_current_active_user] = override_get_current_active_user
|
||||
test_app.dependency_overrides[get_current_admin_user] = override_get_current_admin_user
|
||||
|
||||
transport = ASGITransport(app=test_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://test") as ac:
|
||||
|
||||
Reference in New Issue
Block a user