@@ -95,13 +95,13 @@ async def get_sender_detail(
9595 sender_id : int ,
9696 db : AsyncSession = Depends (get_db ),
9797):
98- 获取发送者详情
98+ """ 获取发送者详情"""
9999 from app .models .message import Message
100100 result = await db .execute (select (Sender ).where (Sender .id == sender_id ))
101101 sender = result .scalar_one_or_none ()
102102 if not sender :
103103 from fastapi import HTTPException
104- raise HTTPException (status_code = 404 , detail = 发送者不存在 )
104+ raise HTTPException (status_code = 404 , detail = " 发送者不存在" )
105105
106106 # 实时统计告警数
107107 alert_count_result = await db .execute (
@@ -118,19 +118,19 @@ async def get_sender_detail(
118118 message_types = {row [0 ]: row [1 ] for row in type_result .all ()}
119119
120120 return {
121- id : sender .id ,
122- user_id : sender .user_id ,
123- username : sender .username ,
124- first_name : sender .first_name ,
125- last_name : sender .last_name ,
126- phone : sender .phone ,
127- is_bot : sender .is_bot ,
128- is_verified : sender .is_verified ,
129- is_premium : sender .is_premium ,
130- message_count : sender .message_count ,
131- alert_count : alert_count ,
132- message_types : message_types ,
133- created_at : sender .created_at .isoformat () if sender .created_at else None ,
121+ "id" : sender .id ,
122+ " user_id" : sender .user_id ,
123+ " username" : sender .username ,
124+ " first_name" : sender .first_name ,
125+ " last_name" : sender .last_name ,
126+ " phone" : sender .phone ,
127+ " is_bot" : sender .is_bot ,
128+ " is_verified" : sender .is_verified ,
129+ " is_premium" : sender .is_premium ,
130+ " message_count" : sender .message_count ,
131+ " alert_count" : alert_count ,
132+ " message_types" : message_types ,
133+ " created_at" : sender .created_at .isoformat () if sender .created_at else None ,
134134 }
135135
136136
@@ -141,15 +141,15 @@ async def get_sender_messages(
141141 page_size : int = Query (20 , ge = 1 , le = 100 ),
142142 db : AsyncSession = Depends (get_db ),
143143):
144- 获取发送者的消息历史
144+ """ 获取发送者的消息历史"""
145145 from app .models .message import Message
146146 from app .models .conversation import Conversation
147147
148148 # 验证发送者存在
149149 sender_result = await db .execute (select (Sender ).where (Sender .id == sender_id ))
150150 if not sender_result .scalar_one_or_none ():
151151 from fastapi import HTTPException
152- raise HTTPException (status_code = 404 , detail = 发送者不存在 )
152+ raise HTTPException (status_code = 404 , detail = " 发送者不存在" )
153153
154154 # 总数
155155 count_result = await db .execute (
@@ -172,23 +172,23 @@ async def get_sender_messages(
172172 items = []
173173 for msg , conv_title in rows :
174174 items .append ({
175- id : msg .id ,
176- conversation_id : msg .conversation_id ,
177- conversation_title : conv_title ,
178- message_type : msg .message_type ,
179- text : msg .text ,
180- caption : msg .caption ,
181- date : msg .date .isoformat () if msg .date else None ,
182- views : msg .views ,
183- forwards : msg .forwards ,
184- has_media : msg .has_media ,
185- is_reply : msg .is_reply ,
175+ "id" : msg .id ,
176+ " conversation_id" : msg .conversation_id ,
177+ " conversation_title" : conv_title ,
178+ " message_type" : msg .message_type ,
179+ " text" : msg .text ,
180+ " caption" : msg .caption ,
181+ " date" : msg .date .isoformat () if msg .date else None ,
182+ " views" : msg .views ,
183+ " forwards" : msg .forwards ,
184+ " has_media" : msg .has_media ,
185+ " is_reply" : msg .is_reply ,
186186 })
187187
188188 return {
189- items : items ,
190- total : total ,
191- page : page ,
192- page_size : page_size ,
193- total_pages : (total + page_size - 1 ) // page_size if total else 0 ,
189+ " items" : items ,
190+ " total" : total ,
191+ " page" : page ,
192+ " page_size" : page_size ,
193+ " total_pages" : (total + page_size - 1 ) // page_size if total else 0 ,
194194 }
0 commit comments