X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Fimpls%2Fprivate_message.rs;h=fb1d4b905656662ba925c8431acc2b3e596728f8;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=735c775e00fe3fe55457e52329e8319fded12555;hpb=9e0fa99c695df5d1c5e615d6f5de2b9d4bc91205;p=lemmy.git diff --git a/crates/db_schema/src/impls/private_message.rs b/crates/db_schema/src/impls/private_message.rs index 735c775e..fb1d4b90 100644 --- a/crates/db_schema/src/impls/private_message.rs +++ b/crates/db_schema/src/impls/private_message.rs @@ -1,91 +1,67 @@ use crate::{ - naive_now, newtypes::{DbUrl, PersonId, PrivateMessageId}, - source::private_message::*, - traits::{Crud, DeleteableOrRemoveable}, + schema::private_message::dsl::{ap_id, private_message, read, recipient_id}, + source::private_message::{PrivateMessage, PrivateMessageInsertForm, PrivateMessageUpdateForm}, + traits::Crud, + utils::{get_conn, DbPool}, }; -use diesel::{dsl::*, result::Error, *}; -use lemmy_utils::LemmyError; +use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl}; +use diesel_async::RunQueryDsl; +use lemmy_utils::error::LemmyError; use url::Url; +#[async_trait] impl Crud for PrivateMessage { - type Form = PrivateMessageForm; + type InsertForm = PrivateMessageInsertForm; + type UpdateForm = PrivateMessageUpdateForm; type IdType = PrivateMessageId; - fn read(conn: &PgConnection, private_message_id: PrivateMessageId) -> Result { - use crate::schema::private_message::dsl::*; - private_message.find(private_message_id).first::(conn) + async fn read( + pool: &mut DbPool<'_>, + private_message_id: PrivateMessageId, + ) -> Result { + let conn = &mut get_conn(pool).await?; + private_message + .find(private_message_id) + .first::(conn) + .await } - fn create(conn: &PgConnection, private_message_form: &PrivateMessageForm) -> Result { - use crate::schema::private_message::dsl::*; + async fn create(pool: &mut DbPool<'_>, form: &Self::InsertForm) -> Result { + let conn = &mut get_conn(pool).await?; insert_into(private_message) - .values(private_message_form) + .values(form) + .on_conflict(ap_id) + .do_update() + .set(form) .get_result::(conn) + .await } - fn update( - conn: &PgConnection, + async fn update( + pool: &mut DbPool<'_>, private_message_id: PrivateMessageId, - private_message_form: &PrivateMessageForm, + form: &Self::UpdateForm, ) -> Result { - use crate::schema::private_message::dsl::*; + let conn = &mut get_conn(pool).await?; diesel::update(private_message.find(private_message_id)) - .set(private_message_form) + .set(form) .get_result::(conn) + .await + } + async fn delete(pool: &mut DbPool<'_>, pm_id: Self::IdType) -> Result { + let conn = &mut get_conn(pool).await?; + diesel::delete(private_message.find(pm_id)) + .execute(conn) + .await } } impl PrivateMessage { - pub fn update_ap_id( - conn: &PgConnection, - private_message_id: PrivateMessageId, - apub_id: DbUrl, - ) -> Result { - use crate::schema::private_message::dsl::*; - - diesel::update(private_message.find(private_message_id)) - .set(ap_id.eq(apub_id)) - .get_result::(conn) - } - - pub fn update_content( - conn: &PgConnection, - private_message_id: PrivateMessageId, - new_content: &str, - ) -> Result { - use crate::schema::private_message::dsl::*; - diesel::update(private_message.find(private_message_id)) - .set((content.eq(new_content), updated.eq(naive_now()))) - .get_result::(conn) - } - - pub fn update_deleted( - conn: &PgConnection, - private_message_id: PrivateMessageId, - new_deleted: bool, - ) -> Result { - use crate::schema::private_message::dsl::*; - diesel::update(private_message.find(private_message_id)) - .set(deleted.eq(new_deleted)) - .get_result::(conn) - } - - pub fn update_read( - conn: &PgConnection, - private_message_id: PrivateMessageId, - new_read: bool, - ) -> Result { - use crate::schema::private_message::dsl::*; - diesel::update(private_message.find(private_message_id)) - .set(read.eq(new_read)) - .get_result::(conn) - } - - pub fn mark_all_as_read( - conn: &PgConnection, + pub async fn mark_all_as_read( + pool: &mut DbPool<'_>, for_recipient_id: PersonId, ) -> Result, Error> { - use crate::schema::private_message::dsl::*; + let conn = &mut get_conn(pool).await?; diesel::update( private_message .filter(recipient_id.eq(for_recipient_id)) @@ -93,80 +69,77 @@ impl PrivateMessage { ) .set(read.eq(true)) .get_results::(conn) + .await } - pub fn upsert( - conn: &PgConnection, - private_message_form: &PrivateMessageForm, - ) -> Result { - use crate::schema::private_message::dsl::*; - insert_into(private_message) - .values(private_message_form) - .on_conflict(ap_id) - .do_update() - .set(private_message_form) - .get_result::(conn) - } - - pub fn read_from_apub_id( - conn: &PgConnection, + pub async fn read_from_apub_id( + pool: &mut DbPool<'_>, object_id: Url, ) -> Result, LemmyError> { - use crate::schema::private_message::dsl::*; + let conn = &mut get_conn(pool).await?; let object_id: DbUrl = object_id.into(); Ok( private_message .filter(ap_id.eq(object_id)) .first::(conn) + .await .ok() .map(Into::into), ) } } -impl DeleteableOrRemoveable for PrivateMessage { - fn blank_out_deleted_or_removed_info(mut self) -> Self { - self.content = "".into(); - self - } -} - #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use crate::{ - establish_unpooled_connection, - source::{person::*, private_message::*}, + source::{ + instance::Instance, + person::{Person, PersonInsertForm}, + private_message::{PrivateMessage, PrivateMessageInsertForm, PrivateMessageUpdateForm}, + }, traits::Crud, + 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 creator_form = PersonForm { - name: "creator_pm".into(), - ..PersonForm::default() - }; + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); - let inserted_creator = Person::create(&conn, &creator_form).unwrap(); + let creator_form = PersonInsertForm::builder() + .name("creator_pm".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let recipient_form = PersonForm { - name: "recipient_pm".into(), - ..PersonForm::default() - }; + let inserted_creator = Person::create(pool, &creator_form).await.unwrap(); - let inserted_recipient = Person::create(&conn, &recipient_form).unwrap(); + let recipient_form = PersonInsertForm::builder() + .name("recipient_pm".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let private_message_form = PrivateMessageForm { - content: "A test private message".into(), - creator_id: inserted_creator.id, - recipient_id: inserted_recipient.id, - ..PrivateMessageForm::default() - }; + let inserted_recipient = Person::create(pool, &recipient_form).await.unwrap(); + + let private_message_form = PrivateMessageInsertForm::builder() + .content("A test private message".into()) + .creator_id(inserted_creator.id) + .recipient_id(inserted_recipient.id) + .build(); - let inserted_private_message = PrivateMessage::create(&conn, &private_message_form).unwrap(); + let inserted_private_message = PrivateMessage::create(pool, &private_message_form) + .await + .unwrap(); let expected_private_message = PrivateMessage { id: inserted_private_message.id, @@ -177,19 +150,44 @@ mod tests { read: false, updated: None, published: inserted_private_message.published, - ap_id: inserted_private_message.ap_id.to_owned(), + ap_id: inserted_private_message.ap_id.clone(), local: true, }; - let read_private_message = PrivateMessage::read(&conn, inserted_private_message.id).unwrap(); - let updated_private_message = - PrivateMessage::update(&conn, inserted_private_message.id, &private_message_form).unwrap(); - let deleted_private_message = - PrivateMessage::update_deleted(&conn, inserted_private_message.id, true).unwrap(); - let marked_read_private_message = - PrivateMessage::update_read(&conn, inserted_private_message.id, true).unwrap(); - Person::delete(&conn, inserted_creator.id).unwrap(); - Person::delete(&conn, inserted_recipient.id).unwrap(); + let read_private_message = PrivateMessage::read(pool, inserted_private_message.id) + .await + .unwrap(); + + let private_message_update_form = PrivateMessageUpdateForm::builder() + .content(Some("A test private message".into())) + .build(); + let updated_private_message = PrivateMessage::update( + pool, + inserted_private_message.id, + &private_message_update_form, + ) + .await + .unwrap(); + + let deleted_private_message = PrivateMessage::update( + pool, + inserted_private_message.id, + &PrivateMessageUpdateForm::builder() + .deleted(Some(true)) + .build(), + ) + .await + .unwrap(); + let marked_read_private_message = PrivateMessage::update( + pool, + inserted_private_message.id, + &PrivateMessageUpdateForm::builder().read(Some(true)).build(), + ) + .await + .unwrap(); + Person::delete(pool, inserted_creator.id).await.unwrap(); + Person::delete(pool, inserted_recipient.id).await.unwrap(); + Instance::delete(pool, inserted_instance.id).await.unwrap(); assert_eq!(expected_private_message, read_private_message); assert_eq!(expected_private_message, updated_private_message);