Update: [main] 디스코드 알림 개선 - footer 제거 및 워크북 진행도 표시
All checks were successful
baekjoon-bot-cicd / build_push_deploy (push) Successful in 5m40s

워크북 모드에서 (k/n) 진행도를 타이틀에 표시하고, 양쪽 모드 모두 하단 정기 알림 footer 제거

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
sm4640
2026-03-30 15:32:17 +09:00
parent 0076eefda2
commit 76f604a094
2 changed files with 17 additions and 8 deletions

7
app.py
View File

@@ -86,7 +86,7 @@ async def today(
if not wid: if not wid:
return JSONResponse(status_code=400, content={"error": "workbook_id is required for workbook mode"}) return JSONResponse(status_code=400, content={"error": "workbook_id is required for workbook mode"})
pid, title, level = await pick_from_workbook(db, wid, pick=workbook_pick) pid, title, level, current_idx, total_cnt = await pick_from_workbook(db, wid, pick=workbook_pick)
if not pid: if not pid:
return JSONResponse(status_code=409, content={"error": "no_more_problems_in_workbook", "workbook_id": wid}) return JSONResponse(status_code=409, content={"error": "no_more_problems_in_workbook", "workbook_id": wid})
@@ -94,9 +94,10 @@ async def today(
solved_url = f"https://solved.ac/problems/id/{pid}" solved_url = f"https://solved.ac/problems/id/{pid}"
level_text = f"Lv. {level}" if level is not None else "Lv. ?" level_text = f"Lv. {level}" if level is not None else "Lv. ?"
progress_text = f"({current_idx}/{total_cnt})" if current_idx and total_cnt else ""
discord_payload = { discord_payload = {
"embeds": [{ "embeds": [{
"title": "🔔 오늘의 백준 추천 문제 (문제집)", "title": f"🔔 오늘의 백준 추천 문제 (문제집) {progress_text}",
"description": ( "description": (
f"**{pid}번: {title}**\n" f"**{pid}번: {title}**\n"
f"난이도: **{level_text}**\n" f"난이도: **{level_text}**\n"
@@ -106,7 +107,6 @@ async def today(
{"name": "문제 링크", "value": f"[바로가기]({problem_url})", "inline": True}, {"name": "문제 링크", "value": f"[바로가기]({problem_url})", "inline": True},
{"name": "해설/정보", "value": f"[Solved.ac]({solved_url})", "inline": True}, {"name": "해설/정보", "value": f"[Solved.ac]({solved_url})", "inline": True},
], ],
"footer": {"text": "매일 오전 10시 정기 알림 (n8n)"}
}] }]
} }
@@ -155,7 +155,6 @@ async def today(
{"name": "문제 링크", "value": f"[바로가기]({problem_url})", "inline": True}, {"name": "문제 링크", "value": f"[바로가기]({problem_url})", "inline": True},
{"name": "해설/정보", "value": f"[Solved.ac]({solved_url})", "inline": True}, {"name": "해설/정보", "value": f"[Solved.ac]({solved_url})", "inline": True},
], ],
"footer": {"text": "매일 오전 10시 정기 알림 (n8n)"}
}] }]
} }

View File

@@ -7,7 +7,7 @@ async def pick_from_workbook(
db: AsyncSession, db: AsyncSession,
workbook_id: int, workbook_id: int,
pick: str = "random", # random | level_asc pick: str = "random", # random | level_asc
) -> Tuple[Optional[int], Optional[str], Optional[int]]: ) -> Tuple[Optional[int], Optional[str], Optional[int], Optional[int], Optional[int]]:
""" """
workbook_id에서 아직 보내지 않은 문제 1개 선택 + workbook_sends 기록까지 원샷. workbook_id에서 아직 보내지 않은 문제 1개 선택 + workbook_sends 기록까지 원샷.
pick: pick:
@@ -46,17 +46,27 @@ async def pick_from_workbook(
FROM candidate FROM candidate
ON CONFLICT DO NOTHING ON CONFLICT DO NOTHING
RETURNING problem_id RETURNING problem_id
),
total AS (
SELECT COUNT(*) AS cnt FROM workbook_problems WHERE workbook_id = :wid
),
sent AS (
SELECT COUNT(*) AS cnt FROM workbook_sends WHERE workbook_id = :wid
) )
SELECT problem_id, title, level SELECT candidate.problem_id, candidate.title, candidate.level,
(SELECT cnt FROM sent) + 1 AS current_idx,
(SELECT cnt FROM total) AS total_cnt
FROM candidate; FROM candidate;
""" """
row = (await db.execute(text(sql), {"wid": workbook_id})).first() row = (await db.execute(text(sql), {"wid": workbook_id})).first()
if not row: if not row:
return None, None, None return None, None, None, None, None
await db.commit() await db.commit()
pid = int(row[0]) pid = int(row[0])
title = str(row[1]) title = str(row[1])
level = int(row[2]) if row[2] is not None else None level = int(row[2]) if row[2] is not None else None
return pid, title, level current_idx = int(row[3])
total_cnt = int(row[4])
return pid, title, level, current_idx, total_cnt