use crate::{
newtypes::{CommentId, CommentReplyId, PersonId},
- source::comment_reply::*,
+ 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::*, result::Error, *};
+use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
+use diesel_async::RunQueryDsl;
+#[async_trait]
impl Crud for CommentReply {
- type Form = CommentReplyForm;
+ type InsertForm = CommentReplyInsertForm;
+ type UpdateForm = CommentReplyUpdateForm;
type IdType = CommentReplyId;
- fn read(conn: &PgConnection, comment_reply_id: CommentReplyId) -> Result<Self, Error> {
- use crate::schema::comment_reply::dsl::*;
- comment_reply.find(comment_reply_id).first::<Self>(conn)
+ async fn read(pool: &mut DbPool<'_>, comment_reply_id: CommentReplyId) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
+ comment_reply
+ .find(comment_reply_id)
+ .first::<Self>(conn)
+ .await
}
- fn create(conn: &PgConnection, comment_reply_form: &CommentReplyForm) -> Result<Self, Error> {
- use crate::schema::comment_reply::dsl::*;
+ 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)
.do_update()
.set(comment_reply_form)
.get_result::<Self>(conn)
+ .await
}
- fn update(
- conn: &PgConnection,
+ async fn update(
+ pool: &mut DbPool<'_>,
comment_reply_id: CommentReplyId,
- comment_reply_form: &CommentReplyForm,
+ comment_reply_form: &Self::UpdateForm,
) -> Result<Self, Error> {
- use crate::schema::comment_reply::dsl::*;
+ 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 fn update_read(
- conn: &PgConnection,
- comment_reply_id: CommentReplyId,
- new_read: bool,
- ) -> Result<CommentReply, Error> {
- use crate::schema::comment_reply::dsl::*;
- diesel::update(comment_reply.find(comment_reply_id))
- .set(read.eq(new_read))
- .get_result::<Self>(conn)
- }
-
- pub fn mark_all_as_read(
- conn: &PgConnection,
+ pub async fn mark_all_as_read(
+ pool: &mut DbPool<'_>,
for_recipient_id: PersonId,
) -> Result<Vec<CommentReply>, Error> {
- use crate::schema::comment_reply::dsl::*;
+ let conn = &mut get_conn(pool).await?;
diesel::update(
comment_reply
.filter(recipient_id.eq(for_recipient_id))
)
.set(read.eq(true))
.get_results::<Self>(conn)
+ .await
}
- pub fn read_by_comment(conn: &PgConnection, for_comment_id: CommentId) -> Result<Self, Error> {
- use crate::schema::comment_reply::dsl::*;
+ 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_reply::*,
- community::{Community, CommunityForm},
- person::*,
- post::*,
+ comment::{Comment, CommentInsertForm},
+ comment_reply::{CommentReply, CommentReplyInsertForm, CommentReplyUpdateForm},
+ community::{Community, CommunityInsertForm},
+ instance::Instance,
+ person::{Person, PersonInsertForm},
+ 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 = 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: "terrylake".into(),
- public_key: Some("pubkey".to_string()),
- ..PersonForm::default()
- };
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .unwrap();
- let inserted_person = Person::create(&conn, &new_person).unwrap();
+ let new_person = PersonInsertForm::builder()
+ .name("terrylake".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
- let recipient_form = PersonForm {
- name: "terrylakes recipient".into(),
- public_key: Some("pubkey".to_string()),
- ..PersonForm::default()
- };
+ let inserted_person = Person::create(pool, &new_person).await.unwrap();
- let inserted_recipient = Person::create(&conn, &recipient_form).unwrap();
+ let recipient_form = PersonInsertForm::builder()
+ .name("terrylakes recipient".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
- let new_community = CommunityForm {
- name: "test community lake".to_string(),
- title: "nada".to_owned(),
- public_key: Some("pubkey".to_string()),
- ..CommunityForm::default()
- };
+ let inserted_recipient = Person::create(pool, &recipient_form).await.unwrap();
- let inserted_community = Community::create(&conn, &new_community).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 new_post = PostForm {
- name: "A test post".into(),
- creator_id: inserted_person.id,
- community_id: inserted_community.id,
- ..PostForm::default()
- };
+ let inserted_community = Community::create(pool, &new_community).await.unwrap();
- let inserted_post = Post::create(&conn, &new_post).unwrap();
+ let new_post = PostInsertForm::builder()
+ .name("A test post".into())
+ .creator_id(inserted_person.id)
+ .community_id(inserted_community.id)
+ .build();
- let comment_form = CommentForm {
- content: "A test comment".into(),
- creator_id: inserted_person.id,
- post_id: inserted_post.id,
- ..CommentForm::default()
- };
+ 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(&conn, &comment_form, None).unwrap();
+ let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
- let comment_reply_form = CommentReplyForm {
+ let comment_reply_form = CommentReplyInsertForm {
recipient_id: inserted_recipient.id,
comment_id: inserted_comment.id,
read: None,
};
- let inserted_reply = CommentReply::create(&conn, &comment_reply_form).unwrap();
+ let inserted_reply = CommentReply::create(pool, &comment_reply_form)
+ .await
+ .unwrap();
let expected_reply = CommentReply {
id: inserted_reply.id,
published: inserted_reply.published,
};
- let read_reply = CommentReply::read(&conn, inserted_reply.id).unwrap();
- let updated_reply =
- CommentReply::update(&conn, inserted_reply.id, &comment_reply_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();
+ 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);
projects / lemmy.git / blobdiff