feat(api): sessions加is_del过滤+filehelper置顶标记,accounts加avatar(raw_json提取)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
浅念
2026-08-25 15:44:54 +08:00
parent c21758dfb2
commit d3d7146887
5 changed files with 140 additions and 6 deletions
@@ -103,6 +103,10 @@ async def list_accounts(
* WeChat: account_id=wx_id, nickname=nick_name, user_id, user_name, phone,
contacts_num, group_num, is_on_job, raw_json (verbatim upstream record).
* WhatsApp: account_id=uid (+ same projection).
``avatar`` is extracted from ``raw_json.headImageUrl`` (WeChat wxUser/list
records carry it; WhatsApp businessSalesList records have no avatar key,
so they naturally resolve to ``None`` — same key logic for both channels).
"""
wechat_q = sa.select(
WechatAccount.wx_id.label("account_id"),
@@ -171,6 +175,9 @@ async def list_accounts(
contacts_num=row.contacts_num,
group_num=row.group_num,
is_on_job=row.is_on_job,
# 头像从原始记录提取(对齐云客员工聊天窗口左侧头像,2026-08-25):
# WeChat headImageUrl;WA 原始记录无该键 -> None
avatar=(row.raw_json or {}).get("headImageUrl"),
raw_json=row.raw_json,
)
for row in rows
+24 -6
View File
@@ -64,13 +64,21 @@ async def _group_rows(session: AsyncSession, owner: str, channel: str, today_sta
async def _meta(session: AsyncSession, owner: str, channel: str, friend_ids: list[str], room_ids: list[str]):
friends: dict[str, tuple[str, str | None]] = {}
"""查 customer/chat_group 表合并昵称/头像;好友行额外带 delete_flag(is_del 过滤用)。
friends 值为 ``(name, avatar, delete_flag)``;群无删除标记,groups 值仍为
``(name, avatar)``。
"""
friends: dict[str, tuple[str, str | None, int | None]] = {}
if friend_ids:
for fid, remark, nick, real, avatar in (await session.execute(
sa.select(Customer.friend_id, Customer.friend_remark, Customer.friend_nickname, Customer.real_name, Customer.head_image_url)
for fid, remark, nick, real, avatar, delete_flag in (await session.execute(
sa.select(
Customer.friend_id, Customer.friend_remark, Customer.friend_nickname,
Customer.real_name, Customer.head_image_url, Customer.delete_flag,
)
.where(Customer.channel == channel, Customer.owner_account_id == owner, Customer.friend_id.in_(friend_ids))
)).all():
friends[fid] = (remark or nick or real or fid, avatar)
friends[fid] = (remark or nick or real or fid, avatar, delete_flag)
groups: dict[str, tuple[str, str | None]] = {}
if room_ids:
for rid, name, avatar in (await session.execute(
@@ -86,8 +94,15 @@ async def list_sessions(
session: SessionDep,
owner_account_id: Annotated[str, Query(min_length=1)],
channel: Annotated[str, Query()] = "wechat",
is_del: Annotated[int | None, Query()] = None,
) -> SessionListOut:
"""账号会话列表:好友(talker_id,room_id 空)+ 群(room_id),按 last_chat_time desc。"""
"""账号会话列表:好友(talker_id,room_id 空)+ 群(room_id),按 last_chat_time desc。
``is_del`` 可选过滤(对齐云客员工聊天窗口「删除好友」开关):按 customer.delete_flag
在 Python 侧过滤——0=未删(NULL 视为 0),1=已删;无 customer 行的 talker(如
filehelper 等系统账号)视作未删保留;群会话不受该过滤影响。不传时行为不变。
``pinned``:filehelper 会话置顶标记(对齐云客置顶区),其余好友/群恒 False。
"""
today_start = _today_start_ms()
f_rows = await _friend_rows(session, owner_account_id, channel, today_start)
g_rows = await _group_rows(session, owner_account_id, channel, today_start)
@@ -96,8 +111,11 @@ async def list_sessions(
)
sessions: list[SessionOut] = []
for r in f_rows:
name, avatar = fnames.get(r.talker_id, (r.talker_id, None))
name, avatar, delete_flag = fnames.get(r.talker_id, (r.talker_id, None, None))
if is_del is not None and (delete_flag or 0) != is_del:
continue
sessions.append(SessionOut(type="friend", talker_id=r.talker_id, name=name, avatar=avatar,
pinned=(r.talker_id == "filehelper"),
today_count=int(r.today_count or 0), last_chat_time=r.last_chat_time))
for r in g_rows:
name, avatar = gnames.get(r.room_id, (r.room_id, None))