From cf788334aa8f43851d2cfff5697d4c1dc8cb8358 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Mon, 6 Nov 2023 11:29:30 +0100 Subject: [PATCH] Also order reports by oldest first (ref #4123) (#4129) --- crates/db_views/src/comment_report_view.rs | 4 ++-- crates/db_views/src/post_report_view.rs | 6 +++--- crates/db_views/src/private_message_report_view.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/db_views/src/comment_report_view.rs b/crates/db_views/src/comment_report_view.rs index cded46ac9..e1b182caf 100644 --- a/crates/db_views/src/comment_report_view.rs +++ b/crates/db_views/src/comment_report_view.rs @@ -112,7 +112,7 @@ fn queries<'a>() -> Queries< let (limit, offset) = limit_and_offset(options.page, options.limit)?; query = query - .order_by(comment_report::published.desc()) + .order_by(comment_report::published.asc()) .limit(limit) .offset(offset); @@ -476,8 +476,8 @@ mod tests { assert_eq!( reports, [ + expected_sara_report_view.clone(), expected_jessica_report_view.clone(), - expected_sara_report_view.clone() ] ); diff --git a/crates/db_views/src/post_report_view.rs b/crates/db_views/src/post_report_view.rs index 324023ecf..4e0d896ca 100644 --- a/crates/db_views/src/post_report_view.rs +++ b/crates/db_views/src/post_report_view.rs @@ -90,7 +90,7 @@ fn queries<'a>() -> Queries< let (limit, offset) = limit_and_offset(options.page, options.limit)?; query = query - .order_by(post_report::published.desc()) + .order_by(post_report::published.asc()) .limit(limit) .offset(offset); @@ -337,8 +337,8 @@ mod tests { .await .unwrap(); - assert_eq!(reports[0].creator.id, inserted_jessica.id); - assert_eq!(reports[1].creator.id, inserted_sara.id); + assert_eq!(reports[0].creator.id, inserted_sara.id); + assert_eq!(reports[1].creator.id, inserted_jessica.id); // Make sure the counts are correct let report_count = PostReportView::get_report_count(pool, inserted_timmy.id, false, None) diff --git a/crates/db_views/src/private_message_report_view.rs b/crates/db_views/src/private_message_report_view.rs index 878d79edb..134efc05b 100644 --- a/crates/db_views/src/private_message_report_view.rs +++ b/crates/db_views/src/private_message_report_view.rs @@ -56,7 +56,7 @@ fn queries<'a>() -> Queries< let (limit, offset) = limit_and_offset(options.page, options.limit)?; query - .order_by(private_message::published.desc()) + .order_by(private_message::published.asc()) .limit(limit) .offset(offset) .load::(&mut conn)