mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-15 17:03:59 +00:00
9c3efe32e7
* First pass at adding comment trees. - Extracted comment replies into its own table. - Added ltree column to comment - Added parent_id param to GetComments to fetch a tree branch - No paging / limiting yet * Adding child_count to comment_aggregates. * Adding parent comment update counts * Fix unit tests. * Comment tree paging mostly done. * Fix clippy * Fix drone tests wrong postgres version. * Fix unit tests. * Add back in delete in unit test. * Add postgres upgrade script. * Fixing some PR comments. * Move update ltree into Comment::create * Updating based on comments. * Fix send soft fail.
166 lines
4.8 KiB
Rust
166 lines
4.8 KiB
Rust
use crate::{
|
|
newtypes::{CommentId, CommentReplyId, PersonId},
|
|
source::comment_reply::*,
|
|
traits::Crud,
|
|
};
|
|
use diesel::{dsl::*, result::Error, *};
|
|
|
|
impl Crud for CommentReply {
|
|
type Form = CommentReplyForm;
|
|
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)
|
|
}
|
|
|
|
fn create(conn: &PgConnection, comment_reply_form: &CommentReplyForm) -> Result<Self, Error> {
|
|
use crate::schema::comment_reply::dsl::*;
|
|
// 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)
|
|
}
|
|
|
|
fn update(
|
|
conn: &PgConnection,
|
|
comment_reply_id: CommentReplyId,
|
|
comment_reply_form: &CommentReplyForm,
|
|
) -> Result<Self, Error> {
|
|
use crate::schema::comment_reply::dsl::*;
|
|
diesel::update(comment_reply.find(comment_reply_id))
|
|
.set(comment_reply_form)
|
|
.get_result::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
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,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Vec<CommentReply>, Error> {
|
|
use crate::schema::comment_reply::dsl::*;
|
|
diesel::update(
|
|
comment_reply
|
|
.filter(recipient_id.eq(for_recipient_id))
|
|
.filter(read.eq(false)),
|
|
)
|
|
.set(read.eq(true))
|
|
.get_results::<Self>(conn)
|
|
}
|
|
|
|
pub fn read_by_comment(conn: &PgConnection, for_comment_id: CommentId) -> Result<Self, Error> {
|
|
use crate::schema::comment_reply::dsl::*;
|
|
comment_reply
|
|
.filter(comment_id.eq(for_comment_id))
|
|
.first::<Self>(conn)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
source::{
|
|
comment::*,
|
|
comment_reply::*,
|
|
community::{Community, CommunityForm},
|
|
person::*,
|
|
post::*,
|
|
},
|
|
traits::Crud,
|
|
utils::establish_unpooled_connection,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[test]
|
|
#[serial]
|
|
fn test_crud() {
|
|
let conn = establish_unpooled_connection();
|
|
|
|
let new_person = PersonForm {
|
|
name: "terrylake".into(),
|
|
public_key: Some("pubkey".to_string()),
|
|
..PersonForm::default()
|
|
};
|
|
|
|
let inserted_person = Person::create(&conn, &new_person).unwrap();
|
|
|
|
let recipient_form = PersonForm {
|
|
name: "terrylakes recipient".into(),
|
|
public_key: Some("pubkey".to_string()),
|
|
..PersonForm::default()
|
|
};
|
|
|
|
let inserted_recipient = Person::create(&conn, &recipient_form).unwrap();
|
|
|
|
let new_community = CommunityForm {
|
|
name: "test community lake".to_string(),
|
|
title: "nada".to_owned(),
|
|
public_key: Some("pubkey".to_string()),
|
|
..CommunityForm::default()
|
|
};
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
|
|
|
let new_post = PostForm {
|
|
name: "A test post".into(),
|
|
creator_id: inserted_person.id,
|
|
community_id: inserted_community.id,
|
|
..PostForm::default()
|
|
};
|
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
|
|
|
let comment_form = CommentForm {
|
|
content: "A test comment".into(),
|
|
creator_id: inserted_person.id,
|
|
post_id: inserted_post.id,
|
|
..CommentForm::default()
|
|
};
|
|
|
|
let inserted_comment = Comment::create(&conn, &comment_form, None).unwrap();
|
|
|
|
let comment_reply_form = CommentReplyForm {
|
|
recipient_id: inserted_recipient.id,
|
|
comment_id: inserted_comment.id,
|
|
read: None,
|
|
};
|
|
|
|
let inserted_reply = CommentReply::create(&conn, &comment_reply_form).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(&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();
|
|
|
|
assert_eq!(expected_reply, read_reply);
|
|
assert_eq!(expected_reply, inserted_reply);
|
|
assert_eq!(expected_reply, updated_reply);
|
|
}
|
|
}
|