mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-16 01:14:02 +00:00
91834d0d21
* h * Start doing stuff * Default impl for Crud::read * Simplify Crud::read lifetimes * fmt * Stuff * Stuff * Successfully make default read implementation work * Restore Person::read * Clean up default Crud::read and rename 'query2 * Replace filter with find * Attempt default Crud::create * Change Crud to Crud<'a> (won't compile) * Revert "Change Crud to Crud<'a> (won't compile)" This reverts commit7ed20f5f71
. * Default Crud::delete * Remove Crud::delete definitions that match default * Remove commented Site::read * Insert trait * Revert "Insert trait" This reverts commit9d780c2403
. * Use non-borrowed forms * Revert "Use non-borrowed forms" This reverts commitd2dd442563
. * Revert "Revert "Change Crud to Crud<'a> (won't compile)"" This reverts commit25a27165a8
. * Fix lifetime for everything except Crud::delete * Fix Crud::delete * Add comment about futures * Attempt Crud::create * Attempt separate CrudBounds * Revert "Attempt separate CrudBounds" This reverts commit1b4ca321c3
. * Try to fix Crud::create * Move lifetime parameters to associated types * Revert "Move lifetime parameters to associated types" This reverts commitaf1bc858ce
. * Revert "Try to fix Crud::create" This reverts commiteec238496c
. * Revert "Revert "Attempt separate CrudBounds"" This reverts commit1ec33ce502
. * Revert "Attempt separate CrudBounds" This reverts commit1b4ca321c3
. * Revert "Attempt Crud::create" This reverts commit47e8071b68
. * Revert "Add comment about futures" This reverts commitb266b14653
. * Revert "Fix Crud::delete" This reverts commit3abcce2eec
. * Revert "Fix lifetime for everything except Crud::delete" This reverts commitc1ad7a161b
. * Revert "Revert "Revert "Change Crud to Crud<'a> (won't compile)""" This reverts commit3129cd0fc3
. * Clean up * Update site.rs
183 lines
5.4 KiB
Rust
183 lines
5.4 KiB
Rust
use crate::{
|
|
newtypes::{CommentId, CommentReplyId, PersonId},
|
|
schema::comment_reply::dsl::{comment_id, comment_reply, read, recipient_id},
|
|
source::comment_reply::{CommentReply, CommentReplyInsertForm, CommentReplyUpdateForm},
|
|
traits::Crud,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
#[async_trait]
|
|
impl Crud for CommentReply {
|
|
type InsertForm = CommentReplyInsertForm;
|
|
type UpdateForm = CommentReplyUpdateForm;
|
|
type IdType = CommentReplyId;
|
|
|
|
async fn create(
|
|
pool: &mut DbPool<'_>,
|
|
comment_reply_form: &Self::InsertForm,
|
|
) -> Result<Self, Error> {
|
|
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(comment_reply)
|
|
.values(comment_reply_form)
|
|
.on_conflict((recipient_id, comment_id))
|
|
.do_update()
|
|
.set(comment_reply_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn update(
|
|
pool: &mut DbPool<'_>,
|
|
comment_reply_id: CommentReplyId,
|
|
comment_reply_form: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(comment_reply.find(comment_reply_id))
|
|
.set(comment_reply_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
impl CommentReply {
|
|
pub async fn mark_all_as_read(
|
|
pool: &mut DbPool<'_>,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Vec<CommentReply>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(
|
|
comment_reply
|
|
.filter(recipient_id.eq(for_recipient_id))
|
|
.filter(read.eq(false)),
|
|
)
|
|
.set(read.eq(true))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn read_by_comment(
|
|
pool: &mut DbPool<'_>,
|
|
for_comment_id: CommentId,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
comment_reply
|
|
.filter(comment_id.eq(for_comment_id))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
#![allow(clippy::unwrap_used)]
|
|
#![allow(clippy::indexing_slicing)]
|
|
|
|
use crate::{
|
|
source::{
|
|
comment::{Comment, CommentInsertForm},
|
|
comment_reply::{CommentReply, CommentReplyInsertForm, CommentReplyUpdateForm},
|
|
community::{Community, CommunityInsertForm},
|
|
instance::Instance,
|
|
person::{Person, PersonInsertForm},
|
|
post::{Post, PostInsertForm},
|
|
},
|
|
traits::Crud,
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
|
.await
|
|
.unwrap();
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
.name("terrylake".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
|
|
|
let recipient_form = PersonInsertForm::builder()
|
|
.name("terrylakes recipient".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_recipient = Person::create(pool, &recipient_form).await.unwrap();
|
|
|
|
let new_community = CommunityInsertForm::builder()
|
|
.name("test community lake".to_string())
|
|
.title("nada".to_owned())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
|
|
|
let new_post = PostInsertForm::builder()
|
|
.name("A test post".into())
|
|
.creator_id(inserted_person.id)
|
|
.community_id(inserted_community.id)
|
|
.build();
|
|
|
|
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
|
|
|
let comment_form = CommentInsertForm::builder()
|
|
.content("A test comment".into())
|
|
.creator_id(inserted_person.id)
|
|
.post_id(inserted_post.id)
|
|
.build();
|
|
|
|
let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
|
|
|
|
let comment_reply_form = CommentReplyInsertForm {
|
|
recipient_id: inserted_recipient.id,
|
|
comment_id: inserted_comment.id,
|
|
read: None,
|
|
};
|
|
|
|
let inserted_reply = CommentReply::create(pool, &comment_reply_form)
|
|
.await
|
|
.unwrap();
|
|
|
|
let expected_reply = CommentReply {
|
|
id: inserted_reply.id,
|
|
recipient_id: inserted_reply.recipient_id,
|
|
comment_id: inserted_reply.comment_id,
|
|
read: false,
|
|
published: inserted_reply.published,
|
|
};
|
|
|
|
let read_reply = CommentReply::read(pool, inserted_reply.id).await.unwrap();
|
|
|
|
let comment_reply_update_form = CommentReplyUpdateForm { read: Some(false) };
|
|
let updated_reply = CommentReply::update(pool, inserted_reply.id, &comment_reply_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_reply, read_reply);
|
|
assert_eq!(expected_reply, inserted_reply);
|
|
assert_eq!(expected_reply, updated_reply);
|
|
}
|
|
}
|