X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Fimpls%2Fperson_mention.rs;h=27c04217e0f1e0e42871fe9535471d695986f935;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=e83de1feb4dd7ae54e68f6905b4e707d39bd6d9b;hpb=235cc8b22897bfb3e71ba3dbd725d36863fea8ba;p=lemmy.git diff --git a/crates/db_schema/src/impls/person_mention.rs b/crates/db_schema/src/impls/person_mention.rs index e83de1fe..27c04217 100644 --- a/crates/db_schema/src/impls/person_mention.rs +++ b/crates/db_schema/src/impls/person_mention.rs @@ -1,24 +1,31 @@ use crate::{ newtypes::{CommentId, PersonId, PersonMentionId}, - source::person_mention::*, + schema::person_mention::dsl::{comment_id, person_mention, read, recipient_id}, + source::person_mention::{PersonMention, PersonMentionInsertForm, PersonMentionUpdateForm}, traits::Crud, + utils::{get_conn, DbPool}, }; -use diesel::{dsl::*, result::Error, *}; +use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl}; +use diesel_async::RunQueryDsl; +#[async_trait] impl Crud for PersonMention { type InsertForm = PersonMentionInsertForm; type UpdateForm = PersonMentionUpdateForm; type IdType = PersonMentionId; - fn read(conn: &mut PgConnection, person_mention_id: PersonMentionId) -> Result { - use crate::schema::person_mention::dsl::*; - person_mention.find(person_mention_id).first::(conn) + async fn read(pool: &mut DbPool<'_>, person_mention_id: PersonMentionId) -> Result { + let conn = &mut get_conn(pool).await?; + person_mention + .find(person_mention_id) + .first::(conn) + .await } - fn create( - conn: &mut PgConnection, + async fn create( + pool: &mut DbPool<'_>, person_mention_form: &Self::InsertForm, ) -> Result { - use crate::schema::person_mention::dsl::*; + let conn = &mut get_conn(pool).await?; // since the return here isnt utilized, we dont need to do an update // but get_result doesnt return the existing row here insert_into(person_mention) @@ -27,26 +34,28 @@ impl Crud for PersonMention { .do_update() .set(person_mention_form) .get_result::(conn) + .await } - fn update( - conn: &mut PgConnection, + async fn update( + pool: &mut DbPool<'_>, person_mention_id: PersonMentionId, person_mention_form: &Self::UpdateForm, ) -> Result { - use crate::schema::person_mention::dsl::*; + let conn = &mut get_conn(pool).await?; diesel::update(person_mention.find(person_mention_id)) .set(person_mention_form) .get_result::(conn) + .await } } impl PersonMention { - pub fn mark_all_as_read( - conn: &mut PgConnection, + pub async fn mark_all_as_read( + pool: &mut DbPool<'_>, for_recipient_id: PersonId, ) -> Result, Error> { - use crate::schema::person_mention::dsl::*; + let conn = &mut get_conn(pool).await?; diesel::update( person_mention .filter(recipient_id.eq(for_recipient_id)) @@ -54,43 +63,51 @@ impl PersonMention { ) .set(read.eq(true)) .get_results::(conn) + .await } - pub fn read_by_comment_and_person( - conn: &mut PgConnection, + pub async fn read_by_comment_and_person( + pool: &mut DbPool<'_>, for_comment_id: CommentId, for_recipient_id: PersonId, ) -> Result { - use crate::schema::person_mention::dsl::*; + let conn = &mut get_conn(pool).await?; person_mention .filter(comment_id.eq(for_comment_id)) .filter(recipient_id.eq(for_recipient_id)) .first::(conn) + .await } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use crate::{ source::{ - comment::*, + comment::{Comment, CommentInsertForm}, community::{Community, CommunityInsertForm}, instance::Instance, - person::*, - person_mention::*, - post::*, + person::{Person, PersonInsertForm}, + person_mention::{PersonMention, PersonMentionInsertForm, PersonMentionUpdateForm}, + post::{Post, PostInsertForm}, }, traits::Crud, - utils::establish_unpooled_connection, + utils::build_db_pool_for_tests, }; use serial_test::serial; - #[test] + #[tokio::test] #[serial] - fn test_crud() { - let conn = &mut establish_unpooled_connection(); + async fn test_crud() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); - let inserted_instance = Instance::create(conn, "my_domain.tld").unwrap(); + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); let new_person = PersonInsertForm::builder() .name("terrylake".into()) @@ -98,7 +115,7 @@ mod tests { .instance_id(inserted_instance.id) .build(); - let inserted_person = Person::create(conn, &new_person).unwrap(); + let inserted_person = Person::create(pool, &new_person).await.unwrap(); let recipient_form = PersonInsertForm::builder() .name("terrylakes recipient".into()) @@ -106,7 +123,7 @@ mod tests { .instance_id(inserted_instance.id) .build(); - let inserted_recipient = Person::create(conn, &recipient_form).unwrap(); + let inserted_recipient = Person::create(pool, &recipient_form).await.unwrap(); let new_community = CommunityInsertForm::builder() .name("test community lake".to_string()) @@ -115,7 +132,7 @@ mod tests { .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(); let new_post = PostInsertForm::builder() .name("A test post".into()) @@ -123,7 +140,7 @@ mod tests { .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(); let comment_form = CommentInsertForm::builder() .content("A test comment".into()) @@ -131,7 +148,7 @@ mod tests { .post_id(inserted_post.id) .build(); - let inserted_comment = Comment::create(conn, &comment_form, None).unwrap(); + let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap(); let person_mention_form = PersonMentionInsertForm { recipient_id: inserted_recipient.id, @@ -139,7 +156,9 @@ mod tests { read: None, }; - let inserted_mention = PersonMention::create(conn, &person_mention_form).unwrap(); + let inserted_mention = PersonMention::create(pool, &person_mention_form) + .await + .unwrap(); let expected_mention = PersonMention { id: inserted_mention.id, @@ -149,17 +168,23 @@ mod tests { published: inserted_mention.published, }; - let read_mention = PersonMention::read(conn, inserted_mention.id).unwrap(); + let read_mention = PersonMention::read(pool, inserted_mention.id) + .await + .unwrap(); let person_mention_update_form = PersonMentionUpdateForm { read: Some(false) }; let updated_mention = - PersonMention::update(conn, inserted_mention.id, &person_mention_update_form).unwrap(); - Comment::delete(conn, inserted_comment.id).unwrap(); - Post::delete(conn, inserted_post.id).unwrap(); - Community::delete(conn, inserted_community.id).unwrap(); - Person::delete(conn, inserted_person.id).unwrap(); - Person::delete(conn, inserted_recipient.id).unwrap(); - Instance::delete(conn, inserted_instance.id).unwrap(); + PersonMention::update(pool, inserted_mention.id, &person_mention_update_form) + .await + .unwrap(); + Comment::delete(pool, inserted_comment.id).await.unwrap(); + Post::delete(pool, inserted_post.id).await.unwrap(); + Community::delete(pool, inserted_community.id) + .await + .unwrap(); + Person::delete(pool, inserted_person.id).await.unwrap(); + Person::delete(pool, inserted_recipient.id).await.unwrap(); + Instance::delete(pool, inserted_instance.id).await.unwrap(); assert_eq!(expected_mention, read_mention); assert_eq!(expected_mention, inserted_mention);