X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fpost_report_view.rs;h=50b35b1c258bbce2db25ac04c501937c7af90371;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=a8604ea9cdf3ce3b3f65b4df1917b74b13a4a240;hpb=aef9786fa719760e0f25f75d394e000c2d59f0c6;p=lemmy.git diff --git a/crates/db_views/src/post_report_view.rs b/crates/db_views/src/post_report_view.rs index a8604ea9..50b35b1c 100644 --- a/crates/db_views/src/post_report_view.rs +++ b/crates/db_views/src/post_report_view.rs @@ -1,70 +1,60 @@ -use diesel::{result::Error, *}; -use lemmy_db_queries::{ - aggregates::post_aggregates::PostAggregates, - limit_and_offset, - MaybeOptional, - ToSafe, - ViewToVec, +use crate::structs::PostReportView; +use diesel::{ + result::Error, + BoolExpressionMethods, + ExpressionMethods, + JoinOnDsl, + NullableExpressionMethods, + QueryDsl, }; +use diesel_async::RunQueryDsl; use lemmy_db_schema::{ + aggregates::structs::PostAggregates, + newtypes::{CommunityId, PersonId, PostReportId}, schema::{ community, community_moderator, community_person_ban, person, - person_alias_1, - person_alias_2, post, post_aggregates, post_like, post_report, }, source::{ - community::{Community, CommunityPersonBan, CommunitySafe}, - person::{Person, PersonAlias1, PersonAlias2, PersonSafe, PersonSafeAlias1, PersonSafeAlias2}, + community::{Community, CommunityPersonBan}, + person::Person, post::Post, post_report::PostReport, }, - CommunityId, - PersonId, - PostReportId, + traits::JoinView, + utils::{get_conn, limit_and_offset, DbPool}, }; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] -pub struct PostReportView { - pub post_report: PostReport, - pub post: Post, - pub community: CommunitySafe, - pub creator: PersonSafe, - pub post_creator: PersonSafeAlias1, - pub creator_banned_from_community: bool, - pub my_vote: Option, - pub counts: PostAggregates, - pub resolver: Option, -} type PostReportViewTuple = ( PostReport, Post, - CommunitySafe, - PersonSafe, - PersonSafeAlias1, + Community, + Person, + Person, Option, Option, PostAggregates, - Option, + Option, ); impl PostReportView { /// returns the PostReportView for the provided report_id /// /// * `report_id` - the report id to obtain - pub fn read( - conn: &PgConnection, + pub async fn read( + pool: &mut DbPool<'_>, report_id: PostReportId, my_person_id: PersonId, ) -> Result { + let conn = &mut get_conn(pool).await?; + let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2); + let ( post_report, post, @@ -80,7 +70,7 @@ impl PostReportView { .inner_join(post::table) .inner_join(community::table.on(post::community_id.eq(community::id))) .inner_join(person::table.on(post_report::creator_id.eq(person::id))) - .inner_join(person_alias_1::table.on(post::creator_id.eq(person_alias_1::id))) + .inner_join(person_alias_1.on(post::creator_id.eq(person_alias_1.field(person::id)))) .left_join( community_person_ban::table.on( post::community_id @@ -97,22 +87,23 @@ impl PostReportView { ) .inner_join(post_aggregates::table.on(post_report::post_id.eq(post_aggregates::post_id))) .left_join( - person_alias_2::table.on(post_report::resolver_id.eq(person_alias_2::id.nullable())), + person_alias_2.on(post_report::resolver_id.eq(person_alias_2.field(person::id).nullable())), ) .select(( post_report::all_columns, post::all_columns, - Community::safe_columns_tuple(), - Person::safe_columns_tuple(), - PersonAlias1::safe_columns_tuple(), + community::all_columns, + person::all_columns, + person_alias_1.fields(person::all_columns), community_person_ban::all_columns.nullable(), post_like::score.nullable(), post_aggregates::all_columns, - PersonAlias2::safe_columns_tuple().nullable(), + person_alias_2.fields(person::all_columns.nullable()), )) - .first::(conn)?; + .first::(conn) + .await?; - let my_vote = if post_like.is_none() { None } else { post_like }; + let my_vote = post_like; Ok(Self { post_report, @@ -128,87 +119,67 @@ impl PostReportView { } /// returns the current unresolved post report count for the communities you mod - pub fn get_report_count( - conn: &PgConnection, + pub async fn get_report_count( + pool: &mut DbPool<'_>, my_person_id: PersonId, admin: bool, community_id: Option, ) -> Result { - use diesel::dsl::*; + use diesel::dsl::count; + let conn = &mut get_conn(pool).await?; let mut query = post_report::table .inner_join(post::table) - // Test this join - .inner_join( - community_moderator::table.on(community_moderator::community_id.eq(post::community_id)), - ) .filter(post_report::resolved.eq(false)) .into_boxed(); - // If its not an admin, get only the ones you mod - if !admin { - query = query.filter(community_moderator::person_id.eq(my_person_id)); - } - if let Some(community_id) = community_id { query = query.filter(post::community_id.eq(community_id)) } - query.select(count(post_report::id)).first::(conn) + // If its not an admin, get only the ones you mod + if !admin { + query + .inner_join( + community_moderator::table.on( + community_moderator::community_id + .eq(post::community_id) + .and(community_moderator::person_id.eq(my_person_id)), + ), + ) + .select(count(post_report::id)) + .first::(conn) + .await + } else { + query + .select(count(post_report::id)) + .first::(conn) + .await + } } } -pub struct PostReportQueryBuilder<'a> { - conn: &'a PgConnection, - my_person_id: PersonId, - admin: bool, - community_id: Option, - page: Option, - limit: Option, - unresolved_only: Option, +#[derive(Default)] +pub struct PostReportQuery { + pub community_id: Option, + pub page: Option, + pub limit: Option, + pub unresolved_only: Option, } -impl<'a> PostReportQueryBuilder<'a> { - pub fn create(conn: &'a PgConnection, my_person_id: PersonId, admin: bool) -> Self { - PostReportQueryBuilder { - conn, - my_person_id, - admin, - community_id: None, - page: None, - limit: None, - unresolved_only: Some(true), - } - } - - pub fn community_id>(mut self, community_id: T) -> Self { - self.community_id = community_id.get_optional(); - self - } - - pub fn page>(mut self, page: T) -> Self { - self.page = page.get_optional(); - self - } +impl PostReportQuery { + pub async fn list( + self, + pool: &mut DbPool<'_>, + my_person: &Person, + ) -> Result, Error> { + let conn = &mut get_conn(pool).await?; + let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2); - pub fn limit>(mut self, limit: T) -> Self { - self.limit = limit.get_optional(); - self - } - - pub fn unresolved_only>(mut self, unresolved_only: T) -> Self { - self.unresolved_only = unresolved_only.get_optional(); - self - } - - pub fn list(self) -> Result, Error> { let mut query = post_report::table .inner_join(post::table) .inner_join(community::table.on(post::community_id.eq(community::id))) .inner_join(person::table.on(post_report::creator_id.eq(person::id))) - .inner_join(person_alias_1::table.on(post::creator_id.eq(person_alias_1::id))) - .inner_join( - community_moderator::table.on(community_moderator::community_id.eq(post::community_id)), - ) + .inner_join(person_alias_1.on(post::creator_id.eq(person_alias_1.field(person::id)))) .left_join( community_person_ban::table.on( post::community_id @@ -220,31 +191,26 @@ impl<'a> PostReportQueryBuilder<'a> { post_like::table.on( post::id .eq(post_like::post_id) - .and(post_like::person_id.eq(self.my_person_id)), + .and(post_like::person_id.eq(my_person.id)), ), ) .inner_join(post_aggregates::table.on(post_report::post_id.eq(post_aggregates::post_id))) .left_join( - person_alias_2::table.on(post_report::resolver_id.eq(person_alias_2::id.nullable())), + person_alias_2.on(post_report::resolver_id.eq(person_alias_2.field(person::id).nullable())), ) .select(( post_report::all_columns, post::all_columns, - Community::safe_columns_tuple(), - Person::safe_columns_tuple(), - PersonAlias1::safe_columns_tuple(), + community::all_columns, + person::all_columns, + person_alias_1.fields(person::all_columns), community_person_ban::all_columns.nullable(), post_like::score.nullable(), post_aggregates::all_columns, - PersonAlias2::safe_columns_tuple().nullable(), + person_alias_2.fields(person::all_columns.nullable()), )) .into_boxed(); - // If its not an admin, get only the ones you mod - if !self.admin { - query = query.filter(community_moderator::person_id.eq(self.my_person_id)); - } - if let Some(community_id) = self.community_id { query = query.filter(post::community_id.eq(community_id)); } @@ -253,90 +219,113 @@ impl<'a> PostReportQueryBuilder<'a> { query = query.filter(post_report::resolved.eq(false)); } - let (limit, offset) = limit_and_offset(self.page, self.limit); + let (limit, offset) = limit_and_offset(self.page, self.limit)?; - let res = query - .order_by(post_report::published.asc()) + query = query + .order_by(post_report::published.desc()) .limit(limit) - .offset(offset) - .load::(self.conn)?; + .offset(offset); + + // If its not an admin, get only the ones you mod + let res = if !my_person.admin { + query + .inner_join( + community_moderator::table.on( + community_moderator::community_id + .eq(post::community_id) + .and(community_moderator::person_id.eq(my_person.id)), + ), + ) + .load::(conn) + .await? + } else { + query.load::(conn).await? + }; - Ok(PostReportView::from_tuple_to_vec(res)) + Ok(res.into_iter().map(PostReportView::from_tuple).collect()) } } -impl ViewToVec for PostReportView { - type DbTuple = PostReportViewTuple; - fn from_tuple_to_vec(items: Vec) -> Vec { - items - .iter() - .map(|a| Self { - post_report: a.0.to_owned(), - post: a.1.to_owned(), - community: a.2.to_owned(), - creator: a.3.to_owned(), - post_creator: a.4.to_owned(), - creator_banned_from_community: a.5.is_some(), - my_vote: a.6, - counts: a.7.to_owned(), - resolver: a.8.to_owned(), - }) - .collect::>() +impl JoinView for PostReportView { + type JoinTuple = PostReportViewTuple; + fn from_tuple(a: Self::JoinTuple) -> Self { + Self { + post_report: a.0, + post: a.1, + community: a.2, + creator: a.3, + post_creator: a.4, + creator_banned_from_community: a.5.is_some(), + my_vote: a.6, + counts: a.7, + resolver: a.8, + } } } #[cfg(test)] mod tests { - use crate::post_report_view::{PostReportQueryBuilder, PostReportView}; - use lemmy_db_queries::{ - aggregates::post_aggregates::PostAggregates, - establish_unpooled_connection, - Crud, - Joinable, - Reportable, - }; - use lemmy_db_schema::source::{ - community::*, - person::*, - post::*, - post_report::{PostReport, PostReportForm}, + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + + use crate::post_report_view::{PostReportQuery, PostReportView}; + use lemmy_db_schema::{ + aggregates::structs::PostAggregates, + source::{ + community::{Community, CommunityInsertForm, CommunityModerator, CommunityModeratorForm}, + instance::Instance, + person::{Person, PersonInsertForm}, + post::{Post, PostInsertForm}, + post_report::{PostReport, PostReportForm}, + }, + traits::{Crud, Joinable, Reportable}, + utils::build_db_pool_for_tests, }; use serial_test::serial; - #[test] + #[tokio::test] #[serial] - fn test_crud() { - let conn = establish_unpooled_connection(); + async fn test_crud() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); - let new_person = PersonForm { - name: "timmy_prv".into(), - ..PersonForm::default() - }; + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); - let inserted_timmy = Person::create(&conn, &new_person).unwrap(); + let new_person = PersonInsertForm::builder() + .name("timmy_prv".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let new_person_2 = PersonForm { - name: "sara_prv".into(), - ..PersonForm::default() - }; + let inserted_timmy = Person::create(pool, &new_person).await.unwrap(); + + let new_person_2 = PersonInsertForm::builder() + .name("sara_prv".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let inserted_sara = Person::create(&conn, &new_person_2).unwrap(); + let inserted_sara = Person::create(pool, &new_person_2).await.unwrap(); // Add a third person, since new ppl can only report something once. - let new_person_3 = PersonForm { - name: "jessica_prv".into(), - ..PersonForm::default() - }; + let new_person_3 = PersonInsertForm::builder() + .name("jessica_prv".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let inserted_jessica = Person::create(&conn, &new_person_3).unwrap(); + let inserted_jessica = Person::create(pool, &new_person_3).await.unwrap(); - let new_community = CommunityForm { - name: "test community prv".to_string(), - title: "nada".to_owned(), - ..CommunityForm::default() - }; + let new_community = CommunityInsertForm::builder() + .name("test community prv".to_string()) + .title("nada".to_owned()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let inserted_community = Community::create(&conn, &new_community).unwrap(); + let inserted_community = Community::create(pool, &new_community).await.unwrap(); // Make timmy a mod let timmy_moderator_form = CommunityModeratorForm { @@ -344,16 +333,17 @@ mod tests { person_id: inserted_timmy.id, }; - let _inserted_moderator = CommunityModerator::join(&conn, &timmy_moderator_form).unwrap(); + let _inserted_moderator = CommunityModerator::join(pool, &timmy_moderator_form) + .await + .unwrap(); - let new_post = PostForm { - name: "A test post crv".into(), - creator_id: inserted_timmy.id, - community_id: inserted_community.id, - ..PostForm::default() - }; + let new_post = PostInsertForm::builder() + .name("A test post crv".into()) + .creator_id(inserted_timmy.id) + .community_id(inserted_community.id) + .build(); - let inserted_post = Post::create(&conn, &new_post).unwrap(); + let inserted_post = Post::create(pool, &new_post).await.unwrap(); // sara reports let sara_report_form = PostReportForm { @@ -365,7 +355,7 @@ mod tests { reason: "from sara".into(), }; - let inserted_sara_report = PostReport::report(&conn, &sara_report_form).unwrap(); + let inserted_sara_report = PostReport::report(pool, &sara_report_form).await.unwrap(); // jessica reports let jessica_report_form = PostReportForm { @@ -377,37 +367,52 @@ mod tests { reason: "from jessica".into(), }; - let inserted_jessica_report = PostReport::report(&conn, &jessica_report_form).unwrap(); + let inserted_jessica_report = PostReport::report(pool, &jessica_report_form) + .await + .unwrap(); - let agg = PostAggregates::read(&conn, inserted_post.id).unwrap(); + let agg = PostAggregates::read(pool, inserted_post.id).await.unwrap(); let read_jessica_report_view = - PostReportView::read(&conn, inserted_jessica_report.id, inserted_timmy.id).unwrap(); + PostReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id) + .await + .unwrap(); let expected_jessica_report_view = PostReportView { - post_report: inserted_jessica_report.to_owned(), - post: inserted_post.to_owned(), - community: CommunitySafe { + post_report: inserted_jessica_report.clone(), + post: inserted_post.clone(), + community: Community { id: inserted_community.id, name: inserted_community.name, icon: None, removed: false, deleted: false, nsfw: false, - actor_id: inserted_community.actor_id.to_owned(), + actor_id: inserted_community.actor_id.clone(), local: true, title: inserted_community.title, description: None, updated: None, banner: None, + hidden: false, + posting_restricted_to_mods: false, published: inserted_community.published, + instance_id: inserted_instance.id, + private_key: inserted_community.private_key.clone(), + public_key: inserted_community.public_key.clone(), + last_refreshed_at: inserted_community.last_refreshed_at, + followers_url: inserted_community.followers_url.clone(), + inbox_url: inserted_community.inbox_url.clone(), + shared_inbox_url: inserted_community.shared_inbox_url.clone(), + moderators_url: inserted_community.moderators_url.clone(), + featured_url: inserted_community.featured_url.clone(), }, - creator: PersonSafe { + creator: Person { id: inserted_jessica.id, name: inserted_jessica.name, display_name: None, published: inserted_jessica.published, avatar: None, - actor_id: inserted_jessica.actor_id.to_owned(), + actor_id: inserted_jessica.actor_id.clone(), local: true, banned: false, deleted: false, @@ -416,17 +421,22 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_jessica.inbox_url.to_owned(), + inbox_url: inserted_jessica.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, + ban_expires: None, + instance_id: inserted_instance.id, + private_key: inserted_jessica.private_key, + public_key: inserted_jessica.public_key, + last_refreshed_at: inserted_jessica.last_refreshed_at, }, - post_creator: PersonSafeAlias1 { + post_creator: Person { id: inserted_timmy.id, - name: inserted_timmy.name.to_owned(), + name: inserted_timmy.name.clone(), display_name: None, published: inserted_timmy.published, avatar: None, - actor_id: inserted_timmy.actor_id.to_owned(), + actor_id: inserted_timmy.actor_id.clone(), local: true, banned: false, deleted: false, @@ -435,9 +445,14 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_timmy.inbox_url.to_owned(), + inbox_url: inserted_timmy.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, + ban_expires: None, + instance_id: inserted_instance.id, + private_key: inserted_timmy.private_key.clone(), + public_key: inserted_timmy.public_key.clone(), + last_refreshed_at: inserted_timmy.last_refreshed_at, }, creator_banned_from_community: false, my_vote: None, @@ -448,10 +463,13 @@ mod tests { score: 0, upvotes: 0, downvotes: 0, - stickied: false, published: agg.published, newest_comment_time_necro: inserted_post.published, newest_comment_time: inserted_post.published, + featured_community: false, + featured_local: false, + hot_rank: 1728, + hot_rank_active: 1728, }, resolver: None, }; @@ -461,13 +479,13 @@ mod tests { let mut expected_sara_report_view = expected_jessica_report_view.clone(); expected_sara_report_view.post_report = inserted_sara_report; expected_sara_report_view.my_vote = None; - expected_sara_report_view.creator = PersonSafe { + expected_sara_report_view.creator = Person { id: inserted_sara.id, name: inserted_sara.name, display_name: None, published: inserted_sara.published, avatar: None, - actor_id: inserted_sara.actor_id.to_owned(), + actor_id: inserted_sara.actor_id.clone(), local: true, banned: false, deleted: false, @@ -476,33 +494,44 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_sara.inbox_url.to_owned(), + inbox_url: inserted_sara.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, + ban_expires: None, + instance_id: inserted_instance.id, + private_key: inserted_sara.private_key, + public_key: inserted_sara.public_key, + last_refreshed_at: inserted_sara.last_refreshed_at, }; // Do a batch read of timmys reports - let reports = PostReportQueryBuilder::create(&conn, inserted_timmy.id, false) - .list() + let reports = PostReportQuery::default() + .list(pool, &inserted_timmy) + .await .unwrap(); assert_eq!( reports, [ - expected_sara_report_view.to_owned(), - expected_jessica_report_view.to_owned() + expected_jessica_report_view.clone(), + expected_sara_report_view.clone() ] ); // Make sure the counts are correct - let report_count = - PostReportView::get_report_count(&conn, inserted_timmy.id, false, None).unwrap(); + let report_count = PostReportView::get_report_count(pool, inserted_timmy.id, false, None) + .await + .unwrap(); assert_eq!(2, report_count); // Try to resolve the report - PostReport::resolve(&conn, inserted_jessica_report.id, inserted_timmy.id).unwrap(); + PostReport::resolve(pool, inserted_jessica_report.id, inserted_timmy.id) + .await + .unwrap(); let read_jessica_report_view_after_resolve = - PostReportView::read(&conn, inserted_jessica_report.id, inserted_timmy.id).unwrap(); + PostReportView::read(pool, inserted_jessica_report.id, inserted_timmy.id) + .await + .unwrap(); let mut expected_jessica_report_view_after_resolve = expected_jessica_report_view; expected_jessica_report_view_after_resolve @@ -514,13 +543,13 @@ mod tests { expected_jessica_report_view_after_resolve .post_report .updated = read_jessica_report_view_after_resolve.post_report.updated; - expected_jessica_report_view_after_resolve.resolver = Some(PersonSafeAlias2 { + expected_jessica_report_view_after_resolve.resolver = Some(Person { id: inserted_timmy.id, - name: inserted_timmy.name.to_owned(), + name: inserted_timmy.name.clone(), display_name: None, published: inserted_timmy.published, avatar: None, - actor_id: inserted_timmy.actor_id.to_owned(), + actor_id: inserted_timmy.actor_id.clone(), local: true, banned: false, deleted: false, @@ -529,9 +558,14 @@ mod tests { bio: None, banner: None, updated: None, - inbox_url: inserted_timmy.inbox_url.to_owned(), + inbox_url: inserted_timmy.inbox_url.clone(), shared_inbox_url: None, matrix_user_id: None, + ban_expires: None, + instance_id: inserted_instance.id, + private_key: inserted_timmy.private_key.clone(), + public_key: inserted_timmy.public_key.clone(), + last_refreshed_at: inserted_timmy.last_refreshed_at, }); assert_eq!( @@ -541,19 +575,28 @@ mod tests { // Do a batch read of timmys reports // It should only show saras, which is unresolved - let reports_after_resolve = PostReportQueryBuilder::create(&conn, inserted_timmy.id, false) - .list() - .unwrap(); + let reports_after_resolve = PostReportQuery { + unresolved_only: (Some(true)), + ..Default::default() + } + .list(pool, &inserted_timmy) + .await + .unwrap(); assert_eq!(reports_after_resolve[0], expected_sara_report_view); // Make sure the counts are correct let report_count_after_resolved = - PostReportView::get_report_count(&conn, inserted_timmy.id, false, None).unwrap(); + PostReportView::get_report_count(pool, inserted_timmy.id, false, None) + .await + .unwrap(); assert_eq!(1, report_count_after_resolved); - Person::delete(&conn, inserted_timmy.id).unwrap(); - Person::delete(&conn, inserted_sara.id).unwrap(); - Person::delete(&conn, inserted_jessica.id).unwrap(); - Community::delete(&conn, inserted_community.id).unwrap(); + Person::delete(pool, inserted_timmy.id).await.unwrap(); + Person::delete(pool, inserted_sara.id).await.unwrap(); + Person::delete(pool, inserted_jessica.id).await.unwrap(); + Community::delete(pool, inserted_community.id) + .await + .unwrap(); + Instance::delete(pool, inserted_instance.id).await.unwrap(); } }