feat: 新增路线详情关联管家顾问及相关功能
详细变更如下: - 更新 .gitignore 文件,添加 pnpm-store 忽略规则 - 新增数据库迁移脚本,为 DetailRecord 添加可空的 conciergeAdvisorId 字段用于关联管家顾问 - 完善 Admin 后台玩法详情编辑器,支持选择关联的管家顾问并校验合法性 - 公共 API 支持返回已启用的管家顾问完整数据,不在详情表中冗余存储管家资料 - 小程序端新增详情页联系管家入口、个人页最近浏览历史功能 - 更新所有相关文档与测试用例,修复下拉选择框的 z-index 样式问题
This commit is contained in:
1 parent
e7b8c5bf43
commit
b7a81964c9
34 files changed
+739
-63
No files matched your search
@@ -7,7 +7,7 @@ import pytest
|
||||
from app.auth import require_admin
|
||||
from app.database import get_db
|
||||
from app.main import create_app
|
||||
from app.models import AdminUser, DetailRecord
|
||||
from app.models import AdminUser, ConciergeAdvisor, DetailRecord
|
||||
from app.schemas import DetailCreate
|
||||
|
||||
|
||||
@@ -79,6 +79,7 @@ def make_detail(**overrides):
|
||||
"gallery": ["https://example.test/family-water.jpg"],
|
||||
"isActive": True,
|
||||
"sortOrder": 0,
|
||||
"conciergeAdvisorId": None,
|
||||
"createdAt": datetime(2026, 1, 1),
|
||||
"updatedAt": datetime(2026, 1, 2),
|
||||
}
|
||||
@@ -86,6 +87,23 @@ def make_detail(**overrides):
|
||||
return DetailRecord(**values)
|
||||
|
||||
|
||||
def make_advisor(**overrides):
|
||||
values = {
|
||||
"id": "advisor-amanda",
|
||||
"avatar": "https://example.test/amanda.jpg",
|
||||
"name": "Amanda",
|
||||
"role": "SENIOR TRAVEL ADVISOR",
|
||||
"details": [{"icon": "calendar", "label": "服务经验:8年"}],
|
||||
"qrImage": "https://example.test/amanda-qr.png",
|
||||
"isActive": True,
|
||||
"sortOrder": 0,
|
||||
"createdAt": datetime(2026, 1, 1),
|
||||
"updatedAt": datetime(2026, 1, 2),
|
||||
}
|
||||
values.update(overrides)
|
||||
return ConciergeAdvisor(**values)
|
||||
|
||||
|
||||
def authenticated_app(fake_db):
|
||||
app = create_app()
|
||||
app.dependency_overrides[get_db] = lambda: fake_db
|
||||
@@ -130,6 +148,20 @@ def test_detail_schema_rejects_invalid_gallery_url():
|
||||
)
|
||||
|
||||
|
||||
def test_detail_schema_normalizes_empty_concierge_advisor_id_to_null():
|
||||
detail = DetailCreate(
|
||||
key="family-water",
|
||||
eyebrow="玩法推荐",
|
||||
duration="5天4晚",
|
||||
title="亲子玩水",
|
||||
subtitle="贵州路线",
|
||||
intro="介绍",
|
||||
conciergeAdvisorId=" ",
|
||||
)
|
||||
|
||||
assert detail.conciergeAdvisorId is None
|
||||
|
||||
|
||||
def test_public_detail_returns_frontend_contract_without_auth():
|
||||
fake_db = FakeDb(scalar_values=[make_detail()])
|
||||
app = create_app()
|
||||
@@ -156,10 +188,53 @@ def test_public_detail_returns_frontend_contract_without_auth():
|
||||
"excluded": ["往返大交通"],
|
||||
"notes": ["请准备轻便雨具。"],
|
||||
"gallery": ["https://example.test/family-water.jpg"],
|
||||
"conciergeAdvisor": None,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def test_public_detail_includes_active_concierge_advisor():
|
||||
advisor = make_advisor()
|
||||
fake_db = FakeDb(
|
||||
scalar_values=[make_detail(conciergeAdvisorId=advisor.id)],
|
||||
get_results={(ConciergeAdvisor, advisor.id): advisor},
|
||||
)
|
||||
app = create_app()
|
||||
app.dependency_overrides[get_db] = lambda: fake_db
|
||||
|
||||
try:
|
||||
response = TestClient(app).get("/api/public/details/family-water")
|
||||
finally:
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
assert response.status_code == 200
|
||||
assert response.json()["data"]["conciergeAdvisor"] == {
|
||||
"avatar": advisor.avatar,
|
||||
"name": advisor.name,
|
||||
"role": advisor.role,
|
||||
"details": advisor.details,
|
||||
"qrImage": advisor.qrImage,
|
||||
}
|
||||
|
||||
|
||||
def test_public_detail_hides_inactive_concierge_advisor():
|
||||
advisor = make_advisor(isActive=False)
|
||||
fake_db = FakeDb(
|
||||
scalar_values=[make_detail(conciergeAdvisorId=advisor.id)],
|
||||
get_results={(ConciergeAdvisor, advisor.id): advisor},
|
||||
)
|
||||
app = create_app()
|
||||
app.dependency_overrides[get_db] = lambda: fake_db
|
||||
|
||||
try:
|
||||
response = TestClient(app).get("/api/public/details/family-water")
|
||||
finally:
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
assert response.status_code == 200
|
||||
assert response.json()["data"]["conciergeAdvisor"] is None
|
||||
|
||||
|
||||
def test_public_detail_returns_not_found_for_missing_key():
|
||||
fake_db = FakeDb(scalar_values=[None])
|
||||
app = create_app()
|
||||
@@ -227,3 +302,27 @@ def test_admin_detail_create_normalizes_key_and_appends():
|
||||
assert response.status_code == 201
|
||||
assert response.json()["data"]["key"] == "family-water"
|
||||
assert fake_db.added[0].sortOrder == 3
|
||||
|
||||
|
||||
def test_admin_detail_create_rejects_unknown_concierge_advisor():
|
||||
fake_db = FakeDb(scalar_values=[None, 2])
|
||||
app = authenticated_app(fake_db)
|
||||
|
||||
try:
|
||||
response = TestClient(app).post(
|
||||
"/api/admin/details",
|
||||
json={
|
||||
"key": "family-water",
|
||||
"eyebrow": "玩法推荐",
|
||||
"duration": "5天4晚",
|
||||
"title": "亲子玩水",
|
||||
"subtitle": "贵州路线",
|
||||
"intro": "沿着山地深入探索。",
|
||||
"conciergeAdvisorId": "missing-advisor",
|
||||
},
|
||||
)
|
||||
finally:
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
assert response.status_code == 422
|
||||
assert response.json()["errorCode"] == "DETAIL_CONCIERGE_ADVISOR_INVALID"
|
||||
Reference in new issue
Block a user