From 5eaa45363d703f6c12021de709aac6f06a22555d Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 29 Jun 2022 18:28:43 +0200 Subject: [PATCH] Order by total duration in `Db::get_top_users_activity_summary` Co-Authored-By: Max Brunsfeld --- crates/collab/src/db.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs index 09e6245e43..6c4b37870c 100644 --- a/crates/collab/src/db.rs +++ b/crates/collab/src/db.rs @@ -618,7 +618,7 @@ impl Db for PostgresDb { WHERE user_durations.user_id = project_durations.user_id AND user_durations.user_id = users.id - ORDER BY user_id ASC, project_duration DESC + ORDER BY total_duration DESC, user_id ASC "; let mut rows = sqlx::query_as::<_, (UserId, String, ProjectId, i64)>(query) @@ -1625,8 +1625,8 @@ pub mod tests { id: user_1, github_login: "user_1".to_string(), project_activity: vec![ + (project_1, Duration::from_secs(25)), (project_2, Duration::from_secs(30)), - (project_1, Duration::from_secs(25)) ] }, UserActivitySummary {