X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Fimpls%2Fcomment.rs;h=eca5328de1eb65ff160281af1d7d5dd7f541f742;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=5eaedcb95fa66580e967db36f4d2654c57f63299;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git diff --git a/crates/db_schema/src/impls/comment.rs b/crates/db_schema/src/impls/comment.rs index 5eaedcb9..eca5328d 100644 --- a/crates/db_schema/src/impls/comment.rs +++ b/crates/db_schema/src/impls/comment.rs @@ -17,7 +17,7 @@ use url::Url; impl Comment { pub fn update_ap_id( - conn: &PgConnection, + conn: &mut PgConnection, comment_id: CommentId, apub_id: DbUrl, ) -> Result { @@ -29,7 +29,7 @@ impl Comment { } pub fn permadelete_for_creator( - conn: &PgConnection, + conn: &mut PgConnection, for_creator_id: PersonId, ) -> Result, Error> { use crate::schema::comment::dsl::*; @@ -43,7 +43,7 @@ impl Comment { } pub fn update_deleted( - conn: &PgConnection, + conn: &mut PgConnection, comment_id: CommentId, new_deleted: bool, ) -> Result { @@ -54,7 +54,7 @@ impl Comment { } pub fn update_removed( - conn: &PgConnection, + conn: &mut PgConnection, comment_id: CommentId, new_removed: bool, ) -> Result { @@ -65,7 +65,7 @@ impl Comment { } pub fn update_removed_for_creator( - conn: &PgConnection, + conn: &mut PgConnection, for_creator_id: PersonId, new_removed: bool, ) -> Result, Error> { @@ -76,7 +76,7 @@ impl Comment { } pub fn create( - conn: &PgConnection, + conn: &mut PgConnection, comment_form: &CommentForm, parent_path: Option<&Ltree>, ) -> Result { @@ -141,7 +141,7 @@ where ca.comment_id = c.id", inserted_comment } } - pub fn read_from_apub_id(conn: &PgConnection, object_id: Url) -> Result, Error> { + pub fn read_from_apub_id(conn: &mut PgConnection, object_id: Url) -> Result, Error> { use crate::schema::comment::dsl::*; let object_id: DbUrl = object_id.into(); Ok( @@ -170,23 +170,23 @@ where ca.comment_id = c.id", impl Crud for Comment { type Form = CommentForm; type IdType = CommentId; - fn read(conn: &PgConnection, comment_id: CommentId) -> Result { + fn read(conn: &mut PgConnection, comment_id: CommentId) -> Result { use crate::schema::comment::dsl::*; comment.find(comment_id).first::(conn) } - fn delete(conn: &PgConnection, comment_id: CommentId) -> Result { + fn delete(conn: &mut PgConnection, comment_id: CommentId) -> Result { use crate::schema::comment::dsl::*; diesel::delete(comment.find(comment_id)).execute(conn) } /// This is unimplemented, use [[Comment::create]] - fn create(_conn: &PgConnection, _comment_form: &CommentForm) -> Result { + fn create(_conn: &mut PgConnection, _comment_form: &CommentForm) -> Result { unimplemented!(); } fn update( - conn: &PgConnection, + conn: &mut PgConnection, comment_id: CommentId, comment_form: &CommentForm, ) -> Result { @@ -200,7 +200,7 @@ impl Crud for Comment { impl Likeable for CommentLike { type Form = CommentLikeForm; type IdType = CommentId; - fn like(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result { + fn like(conn: &mut PgConnection, comment_like_form: &CommentLikeForm) -> Result { use crate::schema::comment_like::dsl::*; insert_into(comment_like) .values(comment_like_form) @@ -210,7 +210,7 @@ impl Likeable for CommentLike { .get_result::(conn) } fn remove( - conn: &PgConnection, + conn: &mut PgConnection, person_id: PersonId, comment_id: CommentId, ) -> Result { @@ -226,7 +226,7 @@ impl Likeable for CommentLike { impl Saveable for CommentSaved { type Form = CommentSavedForm; - fn save(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result { + fn save(conn: &mut PgConnection, comment_saved_form: &CommentSavedForm) -> Result { use crate::schema::comment_saved::dsl::*; insert_into(comment_saved) .values(comment_saved_form) @@ -235,7 +235,10 @@ impl Saveable for CommentSaved { .set(comment_saved_form) .get_result::(conn) } - fn unsave(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result { + fn unsave( + conn: &mut PgConnection, + comment_saved_form: &CommentSavedForm, + ) -> Result { use crate::schema::comment_saved::dsl::*; diesel::delete( comment_saved @@ -272,7 +275,7 @@ mod tests { #[test] #[serial] fn test_crud() { - let conn = establish_unpooled_connection(); + let conn = &mut establish_unpooled_connection(); let new_person = PersonForm { name: "terry".into(), @@ -280,7 +283,7 @@ mod tests { ..PersonForm::default() }; - let inserted_person = Person::create(&conn, &new_person).unwrap(); + let inserted_person = Person::create(conn, &new_person).unwrap(); let new_community = CommunityForm { name: "test community".to_string(), @@ -289,7 +292,7 @@ mod tests { ..CommunityForm::default() }; - let inserted_community = Community::create(&conn, &new_community).unwrap(); + let inserted_community = Community::create(conn, &new_community).unwrap(); let new_post = PostForm { name: "A test post".into(), @@ -298,7 +301,7 @@ mod tests { ..PostForm::default() }; - let inserted_post = Post::create(&conn, &new_post).unwrap(); + let inserted_post = Post::create(conn, &new_post).unwrap(); let comment_form = CommentForm { content: "A test comment".into(), @@ -307,7 +310,7 @@ mod tests { ..CommentForm::default() }; - let inserted_comment = Comment::create(&conn, &comment_form, None).unwrap(); + let inserted_comment = Comment::create(conn, &comment_form, None).unwrap(); let expected_comment = Comment { id: inserted_comment.id, @@ -334,7 +337,7 @@ mod tests { }; let inserted_child_comment = - Comment::create(&conn, &child_comment_form, Some(&inserted_comment.path)).unwrap(); + Comment::create(conn, &child_comment_form, Some(&inserted_comment.path)).unwrap(); // Comment Like let comment_like_form = CommentLikeForm { @@ -344,7 +347,7 @@ mod tests { score: 1, }; - let inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap(); + let inserted_comment_like = CommentLike::like(conn, &comment_like_form).unwrap(); let expected_comment_like = CommentLike { id: inserted_comment_like.id, @@ -361,7 +364,7 @@ mod tests { person_id: inserted_person.id, }; - let inserted_comment_saved = CommentSaved::save(&conn, &comment_saved_form).unwrap(); + let inserted_comment_saved = CommentSaved::save(conn, &comment_saved_form).unwrap(); let expected_comment_saved = CommentSaved { id: inserted_comment_saved.id, @@ -370,15 +373,15 @@ mod tests { published: inserted_comment_saved.published, }; - let read_comment = Comment::read(&conn, inserted_comment.id).unwrap(); - let updated_comment = Comment::update(&conn, inserted_comment.id, &comment_form).unwrap(); - let like_removed = CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap(); - let saved_removed = CommentSaved::unsave(&conn, &comment_saved_form).unwrap(); - let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap(); - Comment::delete(&conn, inserted_child_comment.id).unwrap(); - Post::delete(&conn, inserted_post.id).unwrap(); - Community::delete(&conn, inserted_community.id).unwrap(); - Person::delete(&conn, inserted_person.id).unwrap(); + let read_comment = Comment::read(conn, inserted_comment.id).unwrap(); + let updated_comment = Comment::update(conn, inserted_comment.id, &comment_form).unwrap(); + let like_removed = CommentLike::remove(conn, inserted_person.id, inserted_comment.id).unwrap(); + let saved_removed = CommentSaved::unsave(conn, &comment_saved_form).unwrap(); + let num_deleted = Comment::delete(conn, inserted_comment.id).unwrap(); + Comment::delete(conn, inserted_child_comment.id).unwrap(); + Post::delete(conn, inserted_post.id).unwrap(); + Community::delete(conn, inserted_community.id).unwrap(); + Person::delete(conn, inserted_person.id).unwrap(); assert_eq!(expected_comment, read_comment); assert_eq!(expected_comment, inserted_comment);