nonapode/county-sprints
Watch
1
0
Fork
You've already forked county-sprints
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync: show the target athlete's name, not the session's own

Browse source 
/sync/{athlete_id} always rendered 'Sync: <session.display_name>',
even when athlete_id (now possibly a foreign athlete, see the
previous 'allow syncing athletes other than the current session'
change) differed from the session's own athlete. The header now
uses the display name of the athlete actually being browsed
(resolved via local_athlete, which already existed for import-status
lookups and now also returns display_name), falling back to the raw
Intervals.icu athlete id if that athlete has never logged in
locally and so has no local display name to show.
This commit is contained in:
Claude 2026-08-13 09:46:34 +00:00 • committed by Jonas Rabenstein
commit a0fe9c88ce
1 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/main.rs
View file

@ -249,14 +249,22 @@ async fn sync_athlete(
/*
* athlete_id is whichever athlete the session's access token is
* pointed at, which is not necessarily the session's own athlete
* (see require_authenticated_session). Import status and the default
* "oldest" bound are tracked per local athlete row, so both are
* resolved against athlete_id, not the session.
* (see require_authenticated_session). Import status, the default
* "oldest" bound, and the display name shown on this page are all
* tracked per local athlete row, so they're resolved against
* athlete_id, not the session.
*/
let target_athlete_id = local_athlete_id(&state.db, &athlete_id)
let target_athlete = local_athlete(&state.db, &athlete_id)
.await
.map_err(http_error)?;
let target_athlete_id = target_athlete.as_ref().map(|(id, _)| *id);
let target_display_name = target_athlete
.as_ref()
.map(|(_, name)| name.clone())
.unwrap_or_else(|| athlete_id.clone());
/*
* Default:
*
@ -446,7 +454,7 @@ input[type="datetime-local"] {
html.push_str(&format!(
"<h1>Sync: {}</h1>",
html::escape(&session.display_name)
html::escape(&target_display_name)
));
html.push_str(
@ -796,9 +804,10 @@ async fn sync_import_visible(
let client = IntervalsClient::with_api_key(state.config.clone(), session.access_token.clone());
let target_athlete_id = local_athlete_id(&state.db, &athlete_id)
let target_athlete_id = local_athlete(&state.db, &athlete_id)
.await
.map_err(http_error)?;
.map_err(http_error)?
.map(|(id, _)| id);
let activities = client
.activities(
@ -898,15 +907,16 @@ async fn activity_exists(db: &PgPool, athlete_id: i64, activity_id: &str) -> Res
Ok(row.try_get("exists")?)
}
/// Resolves the local database id for an Intervals.icu athlete id, if that
/// athlete has ever logged in locally (via OAuth or an API key). Used when
/// browsing/importing an athlete other than the current session, since
/// import status and "last synced" bookkeeping is tracked per local
/// athlete row, not per session.
async fn local_athlete_id(db: &PgPool, intervals_athlete_id: &str) -> Result<Option<i64>> {
/// Resolves the local database id and display name for an Intervals.icu
/// athlete id, if that athlete has ever logged in locally (via OAuth or an
/// API key). Used when browsing/importing an athlete other than the
/// current session, since import status, "last synced" bookkeeping, and
/// the athlete's display name are tracked per local athlete row, not per
/// session.
async fn local_athlete(db: &PgPool, intervals_athlete_id: &str) -> Result<Option<(i64, String)>> {
let row = sqlx::query(
r#"
SELECT id
SELECT id, display_name
FROM athletes
WHERE intervals_athlete_id = $1
"#,
@ -917,7 +927,7 @@ async fn local_athlete_id(db: &PgPool, intervals_athlete_id: &str) -> Result<Opt
use sqlx::Row;
Ok(row.map(|row| row.get("id")))
Ok(row.map(|row| (row.get("id"), row.get("display_name"))))
}
fn activity_start_time(activity: &Value) -> Option<DateTime<Utc>> {