Fix #112: Expose level progress percentage in profile API response #127
File diff suppressed because one or more lines are too long
@ -46,6 +46,7 @@ from devplacepy.utils import (
|
|||||||
track_action,
|
track_action,
|
||||||
build_achievements,
|
build_achievements,
|
||||||
)
|
)
|
||||||
|
from devplacepy.utils.rewards import LEVEL_XP
|
||||||
from devplacepy.responses import respond, action_result, wants_json
|
from devplacepy.responses import respond, action_result, wants_json
|
||||||
from devplacepy.schemas import ProfileOut
|
from devplacepy.schemas import ProfileOut
|
||||||
from devplacepy.avatar import avatar_url, avatar_seed
|
from devplacepy.avatar import avatar_url, avatar_seed
|
||||||
@ -380,6 +381,10 @@ async def profile_page(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
xp = profile_user.get("xp") or 0
|
||||||
|
xp_progress_pct = xp % LEVEL_XP
|
||||||
|
xp_next_level = ((xp // LEVEL_XP) + 1) * LEVEL_XP
|
||||||
|
|
||||||
return respond(
|
return respond(
|
||||||
request,
|
request,
|
||||||
"profile.html",
|
"profile.html",
|
||||||
@ -439,6 +444,8 @@ async def profile_page(
|
|||||||
"awards_pagination": awards_pagination,
|
"awards_pagination": awards_pagination,
|
||||||
"awards_count": awards_count,
|
"awards_count": awards_count,
|
||||||
"prominent_award": prominent_award,
|
"prominent_award": prominent_award,
|
||||||
|
"xp_progress_pct": xp_progress_pct,
|
||||||
|
"xp_next_level": xp_next_level,
|
||||||
"can_give_award": can_give,
|
"can_give_award": can_give,
|
||||||
},
|
},
|
||||||
model=ProfileOut,
|
model=ProfileOut,
|
||||||
|
|||||||
@ -80,6 +80,8 @@ class ProfileOut(_Out):
|
|||||||
awards_count: int = 0
|
awards_count: int = 0
|
||||||
prominent_award: Optional[AwardOut] = None
|
prominent_award: Optional[AwardOut] = None
|
||||||
can_give_award: bool = False
|
can_give_award: bool = False
|
||||||
|
xp_progress_pct: Optional[int] = None
|
||||||
|
xp_next_level: Optional[int] = None
|
||||||
|
|
||||||
|
|
||||||
class TelegramPairOut(_Out):
|
class TelegramPairOut(_Out):
|
||||||
|
|||||||
@ -267,6 +267,37 @@ def test_activity_comment_card_renders_overlay_link(app_server):
|
|||||||
assert f'class="card-link" href="/posts/{post_slug}#comment-{comment_uid}"' in r.text
|
assert f'class="card-link" href="/posts/{post_slug}#comment-{comment_uid}"' in r.text
|
||||||
|
|
||||||
|
|
||||||
|
def test_profile_json_contains_xp_progress(app_server):
|
||||||
|
from devplacepy.database import get_table, refresh_snapshot
|
||||||
|
import time
|
||||||
|
|
||||||
|
name = f"xp{int(time.time() * 1000)}"
|
||||||
|
session = requests.Session()
|
||||||
|
session.post(
|
||||||
|
f"{BASE_URL}/auth/signup",
|
||||||
|
data={
|
||||||
|
"username": name,
|
||||||
|
"email": f"{name}@t.dev",
|
||||||
|
"password": "secret123",
|
||||||
|
"confirm_password": "secret123",
|
||||||
|
},
|
||||||
|
allow_redirects=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
user = get_table("users").find_one(username=name)
|
||||||
|
assert user is not None
|
||||||
|
get_table("users").update({"uid": user["uid"], "xp": 250}, ["uid"])
|
||||||
|
refresh_snapshot()
|
||||||
|
|
||||||
|
r = session.get(
|
||||||
|
f"{BASE_URL}/profile/{name}", headers={"Accept": "application/json"}
|
||||||
|
)
|
||||||
|
assert r.status_code == 200, f"status {r.status_code}: {r.text[:200]}"
|
||||||
|
body = r.json()
|
||||||
|
assert body["xp_progress_pct"] == 50
|
||||||
|
assert body["xp_next_level"] == 300
|
||||||
|
|
||||||
|
|
||||||
def test_profile_json_exposes_online_presence(app_server):
|
def test_profile_json_exposes_online_presence(app_server):
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user