midgard/planetwars.dev
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sort match players to ensure correct ordering

Browse source
This commit is contained in:
Ilion Beyst 2022-07-23 14:47:24 +02:00
parent 5e560b23f8
commit f19a70e710
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
planetwars-server/src/db/matches.rs
View file

@ -97,6 +97,10 @@ pub fn list_matches(conn: &PgConnection) -> QueryResult<Vec<FullMatchData>> {
.on(match_players::bot_version_id.eq(bot_versions::id.nullable())), .on(match_players::bot_version_id.eq(bot_versions::id.nullable())),
) )
.left_join(bots::table.on(bot_versions::bot_id.eq(bots::id.nullable()))) .left_join(bots::table.on(bot_versions::bot_id.eq(bots::id.nullable())))
.order_by((
match_players::match_id.asc(),
match_players::player_id.asc(),
))
.load::<FullMatchPlayerData>(conn)? .load::<FullMatchPlayerData>(conn)?
.grouped_by(&matches); .grouped_by(&matches);
@ -150,6 +154,7 @@ pub fn find_match(id: i32, conn: &PgConnection) -> QueryResult<FullMatchData> {
.on(match_players::bot_version_id.eq(bot_versions::id.nullable())), .on(match_players::bot_version_id.eq(bot_versions::id.nullable())),
) )
.left_join(bots::table.on(bot_versions::bot_id.eq(bots::id.nullable()))) .left_join(bots::table.on(bot_versions::bot_id.eq(bots::id.nullable())))
.order_by(match_players::player_id.asc())
.load::<FullMatchPlayerData>(conn)?; .load::<FullMatchPlayerData>(conn)?;
let res = FullMatchData { let res = FullMatchData {