11use crate :: { extractors:: Auth , Error , Result , State , DB } ;
2- use axum:: { extract:: { State as StateE , Path } , routing:: get, Json , Router } ;
2+ use axum:: {
3+ extract:: { Path , State as StateE } ,
4+ routing:: get,
5+ Json , Router ,
6+ } ;
37use chrono:: { NaiveDateTime , Utc } ;
48use serde:: Serialize ;
59
@@ -93,7 +97,11 @@ async fn calculate_score_history(
9397 Ok ( history)
9498}
9599
96- async fn leaderboard ( db : & DB , event_start_time : NaiveDateTime , division : Option < String > ) -> Result < Vec < LeaderboardEntry > > {
100+ async fn leaderboard (
101+ db : & DB ,
102+ event_start_time : NaiveDateTime ,
103+ division : Option < String > ,
104+ ) -> Result < Vec < LeaderboardEntry > > {
97105 let db_entries = sqlx:: query_as!(
98106 DbLeaderboardEntry ,
99107 r#"
@@ -163,19 +171,25 @@ async fn leaderboard(db: &DB, event_start_time: NaiveDateTime, division: Option<
163171 Ok ( leaderboard_entries)
164172}
165173
166- async fn get_lb ( StateE ( state) : StateE < State > ,
174+ async fn get_lb (
175+ StateE ( state) : StateE < State > ,
167176 division : Option < Path < String > > ,
168177) -> Result < Json < Vec < LeaderboardEntry > > > {
169178 if Utc :: now ( ) . naive_utc ( ) < state. event . start_time {
170179 return Err ( Error :: EventNotStarted ( state. event . start_time . clone ( ) ) ) ;
171180 }
172181
173182 let division = division. map ( |x| x. 0 ) ;
174- if division != None && state. event . divisions . get ( division. as_ref ( ) . unwrap ( ) ) . is_none ( ) {
183+ if division != None
184+ && state
185+ . event
186+ . divisions
187+ . get ( division. as_ref ( ) . unwrap ( ) )
188+ . is_none ( )
189+ {
175190 return Err ( Error :: NotFoundDivision ) ;
176191 }
177-
178-
192+
179193 return leaderboard ( & state. db , state. event . start_time , division)
180194 . await
181195 . map ( Json ) ;
@@ -184,5 +198,5 @@ async fn get_lb(StateE(state): StateE<State>,
184198pub fn router ( ) -> Router < crate :: State > {
185199 Router :: new ( )
186200 . route ( "/" , get ( get_lb) )
187- . route ( "/{division}" , get ( get_lb) )
201+ . route ( "/{division}" , get ( get_lb) )
188202}
0 commit comments