浅念
6ac47a1203
Replicates the Customer all-fields pattern across the remaining three entities. Backend now exposes `raw_json` on MessageOut / StaffOut / AccountOut so the frontend can render every 云客 source field without a second endpoint. Each entity gains a Chinese-label field utility + an el-drawer surfacing all fields (structured-first, raw_json fallback, unknown keys under 其他). Backend: - schemas.py: add `raw_json: dict | None` to MessageOut / StaffOut / AccountOut. MessageOut/StaffOut pick the column up via from_attributes; AccountOut is built explicitly in the router, which now threads `raw_json` through from both WechatAccount and WhatsappAccount rows. - tests: new raw_json serialization tests for messages, staff, accounts (assert populated dict round-trips verbatim + NULL serializes as null). Frontend (yunkes/): - New utils: messageFields.ts, staffFields.ts, accountFields.ts — each with a 中文 label map, ordered groups, structured-column preference, and an 其他 fallback for unknown raw_json keys. - Message: clicking a chat bubble opens an all-fields drawer (referMsg renders as pretty-printed JSON). Image preview + file download links stopPropagation so their own interactions still work. - Staff: row click → drawer; columns relabeled (员工ID, 销售手机). - Accounts: new AccountList.vue at /accounts with a 账号 nav item, unified WeChat/WhatsApp table (渠道/账号ID/昵称/微信号/归属员工/好友数/ 群数/收发/在职/最后更新), channel filter, pagination, row-click drawer. - api: add Account type + getAccounts(); add raw_json to Message/Staff. Co-Authored-By: Claude <noreply@anthropic.com>
363 lines
11 KiB
Python
363 lines
11 KiB
Python
"""Tests for GET /api/messages — chat timeline.
|
|
|
|
Seeds 3 messages (2 for talker t_a across times 1000/3000, 1 for talker t_b at
|
|
2000) and asserts filters (channel, owner, talker, time window) + ordering
|
|
(``timestamp asc``) + pagination.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.db.models import Message
|
|
|
|
|
|
async def _seed(session: AsyncSession) -> None:
|
|
session.add_all(
|
|
[
|
|
Message(
|
|
msg_id="m1",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id="t_a",
|
|
room_id=None,
|
|
text="hello",
|
|
timestamp=1000,
|
|
is_send=True,
|
|
type="text",
|
|
type_raw=1,
|
|
),
|
|
Message(
|
|
msg_id="m2",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id="t_b",
|
|
room_id=None,
|
|
text="hi",
|
|
timestamp=2000,
|
|
is_send=False,
|
|
type="text",
|
|
type_raw=1,
|
|
),
|
|
Message(
|
|
msg_id="m3",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id="t_a",
|
|
room_id=None,
|
|
text="bye",
|
|
timestamp=3000,
|
|
is_send=True,
|
|
type="text",
|
|
type_raw=1,
|
|
),
|
|
]
|
|
)
|
|
await session.commit()
|
|
|
|
|
|
async def test_default_page_returns_all_ordered_asc(make_client):
|
|
"""No filters -> 3 rows ordered by ``timestamp asc`` (timeline order)."""
|
|
client = await make_client(_seed)
|
|
r = await client.get("/api/messages")
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["total"] == 3
|
|
assert len(body["items"]) == 3
|
|
assert [it["msg_id"] for it in body["items"]] == ["m1", "m2", "m3"]
|
|
for key in (
|
|
"msg_id",
|
|
"channel",
|
|
"owner_account_id",
|
|
"talker_id",
|
|
"room_id",
|
|
"is_send",
|
|
"type",
|
|
"type_raw",
|
|
"text",
|
|
"file_url",
|
|
"sender_name",
|
|
"sender_head_url",
|
|
"timestamp",
|
|
"raw_json",
|
|
):
|
|
assert key in body["items"][0]
|
|
|
|
|
|
async def test_raw_json_serializes_verbatim(make_client):
|
|
"""``raw_json`` round-trips the verbatim upstream message record.
|
|
|
|
The seeded messages omit ``raw_json`` (NULL); this test seeds one with a
|
|
populated blob and asserts every camelCase key is preserved verbatim while
|
|
the existing rows still serialize as ``null``.
|
|
"""
|
|
|
|
async def seed(session: AsyncSession) -> None:
|
|
await _seed(session)
|
|
session.add(
|
|
Message(
|
|
msg_id="m_raw",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id="t_a",
|
|
room_id=None,
|
|
type="image",
|
|
type_raw=3,
|
|
timestamp=5000,
|
|
raw_json={
|
|
"msgSvrId": "m_raw",
|
|
"type": 3,
|
|
"file": "https://oss/full.jpg",
|
|
"fileTh": "https://oss/th.jpg",
|
|
"fileHd": "https://oss/hd.jpg",
|
|
"md5": "abc123",
|
|
"md5Th": "th123",
|
|
"md5Hd": "hd123",
|
|
"duration": 0,
|
|
"talker": "t_a",
|
|
"oriTalker": "t_a",
|
|
"name": "Alice",
|
|
"headUrl": "https://oss/alice.jpg",
|
|
"wechatId": "wx_owner_1",
|
|
"roomid": "",
|
|
"isSend": 1,
|
|
"paymsgid": "",
|
|
"referMsg": {"text": "原文"},
|
|
},
|
|
)
|
|
)
|
|
await session.commit()
|
|
|
|
client = await make_client(seed)
|
|
r = await client.get("/api/messages", params={"talker_id": "t_a"})
|
|
assert r.status_code == 200
|
|
by_id = {it["msg_id"]: it for it in r.json()["items"]}
|
|
|
|
raw = by_id["m_raw"]["raw_json"]
|
|
assert raw == {
|
|
"msgSvrId": "m_raw",
|
|
"type": 3,
|
|
"file": "https://oss/full.jpg",
|
|
"fileTh": "https://oss/th.jpg",
|
|
"fileHd": "https://oss/hd.jpg",
|
|
"md5": "abc123",
|
|
"md5Th": "th123",
|
|
"md5Hd": "hd123",
|
|
"duration": 0,
|
|
"talker": "t_a",
|
|
"oriTalker": "t_a",
|
|
"name": "Alice",
|
|
"headUrl": "https://oss/alice.jpg",
|
|
"wechatId": "wx_owner_1",
|
|
"roomid": "",
|
|
"isSend": 1,
|
|
"paymsgid": "",
|
|
"referMsg": {"text": "原文"},
|
|
}
|
|
|
|
# Seeded messages without raw_json serialize as JSON null.
|
|
assert by_id["m1"]["raw_json"] is None
|
|
|
|
|
|
async def test_filter_by_talker_id(make_client):
|
|
"""``?talker_id=t_a`` -> 2 messages for that 1:1 conversation."""
|
|
client = await make_client(_seed)
|
|
r = await client.get("/api/messages", params={"talker_id": "t_a"})
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["total"] == 2
|
|
assert {it["msg_id"] for it in body["items"]} == {"m1", "m3"}
|
|
|
|
|
|
async def test_filter_by_owner_account_id(make_client):
|
|
"""``?owner_account_id=wx_owner_1`` -> all 3 (all owned by this account)."""
|
|
client = await make_client(_seed)
|
|
r = await client.get("/api/messages", params={"owner_account_id": "wx_owner_1"})
|
|
assert r.status_code == 200
|
|
assert r.json()["total"] == 3
|
|
|
|
|
|
async def test_filter_by_owner_account_id_no_match(make_client):
|
|
"""A non-existent owner account -> 0 rows."""
|
|
client = await make_client(_seed)
|
|
r = await client.get("/api/messages", params={"owner_account_id": "nobody"})
|
|
assert r.status_code == 200
|
|
assert r.json()["total"] == 0
|
|
|
|
|
|
async def test_time_window_filter(make_client):
|
|
"""``?start=1500&end=2500`` -> only m2 (timestamp 2000)."""
|
|
client = await make_client(_seed)
|
|
r = await client.get(
|
|
"/api/messages", params={"start": 1500, "end": 2500}
|
|
)
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["total"] == 1
|
|
assert body["items"][0]["msg_id"] == "m2"
|
|
|
|
|
|
async def test_time_window_combined_with_talker(make_client):
|
|
"""``talker_id=t_a & start=1500`` -> only m3 (t_a's later message)."""
|
|
client = await make_client(_seed)
|
|
r = await client.get(
|
|
"/api/messages", params={"talker_id": "t_a", "start": 1500}
|
|
)
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["total"] == 1
|
|
assert body["items"][0]["msg_id"] == "m3"
|
|
|
|
|
|
async def test_channel_filter(make_client):
|
|
"""``?channel=whatsapp`` -> 0 (all seeded are wechat)."""
|
|
client = await make_client(_seed)
|
|
r = await client.get("/api/messages", params={"channel": "whatsapp"})
|
|
assert r.status_code == 200
|
|
assert r.json()["total"] == 0
|
|
|
|
|
|
async def test_pagination_page_size_one(make_client):
|
|
"""``page_size=1&page=1`` -> 1 item, total still 3; page 2 -> next item."""
|
|
client = await make_client(_seed)
|
|
r1 = await client.get(
|
|
"/api/messages", params={"page": 1, "page_size": 1}
|
|
)
|
|
b1 = r1.json()
|
|
assert b1["total"] == 3
|
|
assert len(b1["items"]) == 1
|
|
assert b1["items"][0]["msg_id"] == "m1"
|
|
|
|
r2 = await client.get(
|
|
"/api/messages", params={"page": 2, "page_size": 1}
|
|
)
|
|
b2 = r2.json()
|
|
assert len(b2["items"]) == 1
|
|
assert b2["items"][0]["msg_id"] == "m2"
|
|
|
|
|
|
async def test_group_chat_filter_by_room_id(make_client):
|
|
"""``?room_id=room_x`` -> only the group message."""
|
|
async def seed(session: AsyncSession) -> None:
|
|
await _seed(session)
|
|
session.add(
|
|
Message(
|
|
msg_id="m4",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id=None,
|
|
room_id="room_x",
|
|
text="group hi",
|
|
timestamp=4000,
|
|
type="text",
|
|
type_raw=1,
|
|
)
|
|
)
|
|
await session.commit()
|
|
|
|
client = await make_client(seed)
|
|
r = await client.get("/api/messages", params={"room_id": "room_x"})
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["total"] == 1
|
|
assert body["items"][0]["msg_id"] == "m4"
|
|
|
|
|
|
async def test_media_fields_serialize(make_client):
|
|
"""Image thumbnail/HD URLs, voice duration/transcription, md5, room_id and
|
|
sender avatar round-trip through MessageOut so the timeline can render
|
|
media + group messages without a second call.
|
|
"""
|
|
|
|
async def seed(session: AsyncSession) -> None:
|
|
session.add_all(
|
|
[
|
|
Message(
|
|
msg_id="img1",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id="t_a",
|
|
room_id=None,
|
|
type="image",
|
|
type_raw=3,
|
|
timestamp=1000,
|
|
file_url="https://oss/full.jpg",
|
|
file_th_url="https://oss/th.jpg",
|
|
file_hd_url="https://oss/hd.jpg",
|
|
md5="abc123",
|
|
sender_name="Alice",
|
|
sender_head_url="https://oss/alice.jpg",
|
|
),
|
|
Message(
|
|
msg_id="voice1",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id=None,
|
|
room_id="room_x",
|
|
type="voice",
|
|
type_raw=34,
|
|
timestamp=2000,
|
|
duration=12,
|
|
transcription_text="hello there",
|
|
sender_name="Bob",
|
|
sender_head_url="https://oss/bob.jpg",
|
|
),
|
|
]
|
|
)
|
|
await session.commit()
|
|
|
|
client = await make_client(seed)
|
|
r = await client.get("/api/messages", params={"owner_account_id": "wx_owner_1"})
|
|
assert r.status_code == 200
|
|
body = r.json()
|
|
assert body["total"] == 2
|
|
by_id = {it["msg_id"]: it for it in body["items"]}
|
|
|
|
img = by_id["img1"]
|
|
assert img["file_th_url"] == "https://oss/th.jpg"
|
|
assert img["file_hd_url"] == "https://oss/hd.jpg"
|
|
assert img["md5"] == "abc123"
|
|
assert img["room_id"] is None
|
|
assert img["sender_head_url"] == "https://oss/alice.jpg"
|
|
|
|
voice = by_id["voice1"]
|
|
assert voice["duration"] == 12
|
|
assert voice["transcription_text"] == "hello there"
|
|
assert voice["room_id"] == "room_x"
|
|
assert voice["sender_head_url"] == "https://oss/bob.jpg"
|
|
|
|
|
|
async def test_media_fields_default_none_when_unset(make_client):
|
|
"""A text message with no media columns set serializes the new keys as None."""
|
|
|
|
async def seed(session: AsyncSession) -> None:
|
|
session.add(
|
|
Message(
|
|
msg_id="t1",
|
|
channel="wechat",
|
|
owner_account_id="wx_owner_1",
|
|
talker_id="t_a",
|
|
type="text",
|
|
type_raw=1,
|
|
timestamp=1000,
|
|
text="plain",
|
|
)
|
|
)
|
|
await session.commit()
|
|
|
|
client = await make_client(seed)
|
|
r = await client.get("/api/messages")
|
|
assert r.status_code == 200
|
|
it = r.json()["items"][0]
|
|
for key in (
|
|
"file_th_url",
|
|
"file_hd_url",
|
|
"duration",
|
|
"transcription_text",
|
|
"md5",
|
|
"room_id",
|
|
"sender_head_url",
|
|
):
|
|
assert key in it
|
|
assert it[key] is None
|