fix: 贡献统计和共享状态基于真实数据
Some checks failed
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 4s
PR Preview / test (pull_request) Successful in 4s
PR Preview / deploy-preview (pull_request) Successful in 13s
Test / e2e-test (push) Failing after 56s
Some checks failed
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 4s
PR Preview / test (pull_request) Successful in 4s
PR Preview / deploy-preview (pull_request) Successful in 13s
Test / e2e-test (push) Failing after 56s
- 后端返回 adopted_names 和 pending_names 列表 - 共享状态根据实际被采纳/待审核的配方名匹配 - 不再按公共库同名配方误判为已共享 - 共享后实时刷新统计 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1497,19 +1497,27 @@ def list_recipe_reviews(user=Depends(require_role("admin"))):
|
||||
@app.get("/api/me/contribution")
|
||||
def my_contribution(user=Depends(get_current_user)):
|
||||
if not user.get("id"):
|
||||
return {"adopted_count": 0, "shared_count": 0}
|
||||
return {"adopted_count": 0, "shared_count": 0, "adopted_names": [], "pending_names": []}
|
||||
conn = get_db()
|
||||
# adopted_count: recipes adopted from this user (owner changed to admin)
|
||||
adopted = conn.execute(
|
||||
"SELECT COUNT(*) FROM audit_log WHERE action = 'adopt_recipe' AND detail LIKE ?",
|
||||
(f'%"from_user": "{user.get("display_name") or user.get("username")}"%',)
|
||||
).fetchone()[0]
|
||||
# pending: recipes still owned by user in public library (not yet adopted)
|
||||
pending = conn.execute(
|
||||
"SELECT COUNT(*) FROM recipes WHERE owner_id = ?", (user["id"],)
|
||||
).fetchone()[0]
|
||||
display = user.get("display_name") or user.get("username")
|
||||
# adopted: recipes adopted from this user
|
||||
adopted_rows = conn.execute(
|
||||
"SELECT target_name FROM audit_log WHERE action = 'adopt_recipe' AND detail LIKE ?",
|
||||
(f'%"from_user": "{display}"%',)
|
||||
).fetchall()
|
||||
adopted_names = [r["target_name"] for r in adopted_rows if r["target_name"]]
|
||||
# pending: recipes still owned by user in public library
|
||||
pending_rows = conn.execute(
|
||||
"SELECT name FROM recipes WHERE owner_id = ?", (user["id"],)
|
||||
).fetchall()
|
||||
pending_names = [r["name"] for r in pending_rows]
|
||||
conn.close()
|
||||
return {"adopted_count": adopted, "shared_count": adopted + pending}
|
||||
return {
|
||||
"adopted_count": len(adopted_names),
|
||||
"shared_count": len(adopted_names) + len(pending_names),
|
||||
"adopted_names": adopted_names,
|
||||
"pending_names": pending_names,
|
||||
}
|
||||
|
||||
|
||||
# ── Notifications ──────────────────────────────────────
|
||||
|
||||
Reference in New Issue
Block a user