2019-03-06 01:00:01 +00:00
|
|
|
extern crate diesel;
|
|
|
|
use schema::{comment, comment_like};
|
|
|
|
use diesel::*;
|
|
|
|
use diesel::result::Error;
|
2019-03-26 18:00:18 +00:00
|
|
|
use serde::{Deserialize, Serialize};
|
2019-03-06 01:00:01 +00:00
|
|
|
use {Crud, Likeable};
|
2019-03-26 18:00:18 +00:00
|
|
|
use actions::post::Post;
|
2019-03-06 01:00:01 +00:00
|
|
|
|
2019-03-21 01:22:31 +00:00
|
|
|
// WITH RECURSIVE MyTree AS (
|
|
|
|
// SELECT * FROM comment WHERE parent_id IS NULL
|
|
|
|
// UNION ALL
|
|
|
|
// SELECT m.* FROM comment AS m JOIN MyTree AS t ON m.parent_id = t.id
|
|
|
|
// )
|
|
|
|
// SELECT * FROM MyTree;
|
|
|
|
|
2019-03-26 18:00:18 +00:00
|
|
|
#[derive(Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Deserialize)]
|
|
|
|
#[belongs_to(Post)]
|
2019-03-06 01:00:01 +00:00
|
|
|
#[table_name="comment"]
|
|
|
|
pub struct Comment {
|
|
|
|
pub id: i32,
|
|
|
|
pub content: String,
|
|
|
|
pub attributed_to: String,
|
|
|
|
pub post_id: i32,
|
|
|
|
pub parent_id: Option<i32>,
|
|
|
|
pub published: chrono::NaiveDateTime,
|
|
|
|
pub updated: Option<chrono::NaiveDateTime>
|
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
2019-03-06 01:00:01 +00:00
|
|
|
#[table_name="comment"]
|
2019-03-23 01:42:57 +00:00
|
|
|
pub struct CommentForm {
|
|
|
|
pub content: String,
|
|
|
|
pub attributed_to: String,
|
|
|
|
pub post_id: i32,
|
|
|
|
pub parent_id: Option<i32>,
|
|
|
|
pub updated: Option<chrono::NaiveDateTime>
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
|
2019-03-28 19:32:08 +00:00
|
|
|
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug, Clone)]
|
2019-03-06 01:00:01 +00:00
|
|
|
#[belongs_to(Comment)]
|
|
|
|
#[table_name = "comment_like"]
|
|
|
|
pub struct CommentLike {
|
|
|
|
pub id: i32,
|
|
|
|
pub comment_id: i32,
|
2019-03-28 19:32:08 +00:00
|
|
|
pub post_id: i32,
|
2019-03-06 01:00:01 +00:00
|
|
|
pub fedi_user_id: String,
|
|
|
|
pub score: i16,
|
|
|
|
pub published: chrono::NaiveDateTime,
|
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
#[derive(Insertable, AsChangeset, Clone)]
|
2019-03-06 01:00:01 +00:00
|
|
|
#[table_name="comment_like"]
|
2019-03-23 01:42:57 +00:00
|
|
|
pub struct CommentLikeForm {
|
|
|
|
pub comment_id: i32,
|
2019-03-28 19:32:08 +00:00
|
|
|
pub post_id: i32,
|
2019-03-23 01:42:57 +00:00
|
|
|
pub fedi_user_id: String,
|
|
|
|
pub score: i16
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
impl Crud<CommentForm> for Comment {
|
|
|
|
fn read(conn: &PgConnection, comment_id: i32) -> Result<Self, Error> {
|
2019-03-06 01:00:01 +00:00
|
|
|
use schema::comment::dsl::*;
|
|
|
|
comment.find(comment_id)
|
2019-03-23 01:42:57 +00:00
|
|
|
.first::<Self>(conn)
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
fn delete(conn: &PgConnection, comment_id: i32) -> Result<usize, Error> {
|
2019-03-06 01:00:01 +00:00
|
|
|
use schema::comment::dsl::*;
|
|
|
|
diesel::delete(comment.find(comment_id))
|
|
|
|
.execute(conn)
|
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
fn create(conn: &PgConnection, comment_form: &CommentForm) -> Result<Self, Error> {
|
2019-03-06 01:00:01 +00:00
|
|
|
use schema::comment::dsl::*;
|
2019-03-28 19:32:08 +00:00
|
|
|
insert_into(comment)
|
|
|
|
.values(comment_form)
|
|
|
|
.get_result::<Self>(conn)
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
fn update(conn: &PgConnection, comment_id: i32, comment_form: &CommentForm) -> Result<Self, Error> {
|
2019-03-06 01:00:01 +00:00
|
|
|
use schema::comment::dsl::*;
|
|
|
|
diesel::update(comment.find(comment_id))
|
|
|
|
.set(comment_form)
|
2019-03-23 01:42:57 +00:00
|
|
|
.get_result::<Self>(conn)
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
impl Likeable <CommentLikeForm> for CommentLike {
|
2019-03-28 19:32:08 +00:00
|
|
|
fn read(conn: &PgConnection, comment_id_from: i32) -> Result<Vec<Self>, Error> {
|
|
|
|
use schema::comment_like::dsl::*;
|
|
|
|
comment_like
|
|
|
|
.filter(comment_id.eq(comment_id_from))
|
|
|
|
.load::<Self>(conn)
|
|
|
|
}
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
fn like(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result<Self, Error> {
|
2019-03-06 01:00:01 +00:00
|
|
|
use schema::comment_like::dsl::*;
|
|
|
|
insert_into(comment_like)
|
|
|
|
.values(comment_like_form)
|
2019-03-23 01:42:57 +00:00
|
|
|
.get_result::<Self>(conn)
|
2019-03-06 01:00:01 +00:00
|
|
|
}
|
2019-03-23 01:42:57 +00:00
|
|
|
fn remove(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result<usize, Error> {
|
2019-03-06 01:00:01 +00:00
|
|
|
use schema::comment_like::dsl::*;
|
|
|
|
diesel::delete(comment_like
|
2019-03-28 19:32:08 +00:00
|
|
|
.filter(comment_id.eq(comment_like_form.comment_id))
|
|
|
|
.filter(fedi_user_id.eq(&comment_like_form.fedi_user_id)))
|
2019-03-06 01:00:01 +00:00
|
|
|
.execute(conn)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-28 19:32:08 +00:00
|
|
|
impl CommentLike {
|
|
|
|
pub fn from_post(conn: &PgConnection, post_id_from: i32) -> Result<Vec<Self>, Error> {
|
|
|
|
use schema::comment_like::dsl::*;
|
|
|
|
comment_like
|
|
|
|
.filter(post_id.eq(post_id_from))
|
|
|
|
.load::<Self>(conn)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2019-03-26 18:00:18 +00:00
|
|
|
impl Comment {
|
2019-03-28 19:32:08 +00:00
|
|
|
fn from_post(conn: &PgConnection, post_id_from: i32) -> Result<Vec<Self>, Error> {
|
|
|
|
use schema::comment::dsl::*;
|
|
|
|
comment
|
|
|
|
.filter(post_id.eq(post_id_from))
|
|
|
|
.order_by(published.desc())
|
2019-03-26 18:00:18 +00:00
|
|
|
.load::<Self>(conn)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-28 19:32:08 +00:00
|
|
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
|
|
|
pub struct CommentView {
|
|
|
|
pub id: i32,
|
|
|
|
pub content: String,
|
|
|
|
pub attributed_to: String,
|
|
|
|
pub post_id: i32,
|
|
|
|
pub parent_id: Option<i32>,
|
|
|
|
pub published: chrono::NaiveDateTime,
|
|
|
|
pub updated: Option<chrono::NaiveDateTime>,
|
|
|
|
pub score: i32,
|
|
|
|
pub upvotes: i32,
|
|
|
|
pub downvotes: i32,
|
|
|
|
pub my_vote: Option<i16>
|
|
|
|
}
|
|
|
|
|
|
|
|
impl CommentView {
|
2019-03-28 19:53:29 +00:00
|
|
|
pub fn from_comment(comment: &Comment, likes: &Vec<CommentLike>, fedi_user_id: &Option<String>) -> Self {
|
2019-03-28 19:32:08 +00:00
|
|
|
let mut upvotes: i32 = 0;
|
|
|
|
let mut downvotes: i32 = 0;
|
|
|
|
let mut my_vote: Option<i16> = Some(0);
|
|
|
|
|
|
|
|
for like in likes.iter() {
|
|
|
|
if like.score == 1 {
|
2019-03-31 00:08:07 +00:00
|
|
|
upvotes += 1;
|
2019-03-28 19:32:08 +00:00
|
|
|
} else if like.score == -1 {
|
|
|
|
downvotes += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if let Some(user) = fedi_user_id {
|
|
|
|
if like.fedi_user_id == *user {
|
|
|
|
my_vote = Some(like.score);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
let score: i32 = upvotes - downvotes;
|
|
|
|
|
|
|
|
CommentView {
|
|
|
|
id: comment.id,
|
|
|
|
content: comment.content.to_owned(),
|
|
|
|
parent_id: comment.parent_id,
|
|
|
|
post_id: comment.post_id,
|
|
|
|
attributed_to: comment.attributed_to.to_owned(),
|
|
|
|
published: comment.published,
|
2019-03-29 04:56:23 +00:00
|
|
|
updated: comment.updated,
|
2019-03-28 19:32:08 +00:00
|
|
|
upvotes: upvotes,
|
|
|
|
score: score,
|
|
|
|
downvotes: downvotes,
|
|
|
|
my_vote: my_vote
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn read(conn: &PgConnection, comment_id: i32, fedi_user_id: &Option<String>) -> Self {
|
|
|
|
let comment = Comment::read(&conn, comment_id).unwrap();
|
|
|
|
let likes = CommentLike::read(&conn, comment_id).unwrap();
|
|
|
|
Self::from_comment(&comment, &likes, fedi_user_id)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn from_post(conn: &PgConnection, post_id: i32, fedi_user_id: &Option<String>) -> Vec<Self> {
|
|
|
|
let comments = Comment::from_post(&conn, post_id).unwrap();
|
|
|
|
let post_comment_likes = CommentLike::from_post(&conn, post_id).unwrap();
|
|
|
|
|
|
|
|
let mut views = Vec::new();
|
|
|
|
for comment in comments.iter() {
|
|
|
|
let comment_likes: Vec<CommentLike> = post_comment_likes
|
|
|
|
.iter()
|
|
|
|
.filter(|like| comment.id == like.comment_id)
|
|
|
|
.cloned()
|
|
|
|
.collect();
|
|
|
|
let comment_view = CommentView::from_comment(&comment, &comment_likes, fedi_user_id);
|
|
|
|
views.push(comment_view);
|
|
|
|
};
|
|
|
|
|
|
|
|
views
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-03-06 01:00:01 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use establish_connection;
|
|
|
|
use super::*;
|
|
|
|
use actions::post::*;
|
2019-03-26 18:00:18 +00:00
|
|
|
use actions::community::*;
|
2019-03-06 01:00:01 +00:00
|
|
|
use Crud;
|
|
|
|
#[test]
|
|
|
|
fn test_crud() {
|
|
|
|
let conn = establish_connection();
|
2019-03-26 18:00:18 +00:00
|
|
|
|
|
|
|
let new_community = CommunityForm {
|
|
|
|
name: "test community".to_string(),
|
|
|
|
updated: None
|
|
|
|
};
|
|
|
|
|
|
|
|
let inserted_community = Community::create(&conn, &new_community).unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
let new_post = PostForm {
|
|
|
|
name: "A test post".into(),
|
2019-03-26 18:00:18 +00:00
|
|
|
url: None,
|
|
|
|
body: None,
|
2019-03-06 01:00:01 +00:00
|
|
|
attributed_to: "test_user.com".into(),
|
2019-03-26 18:00:18 +00:00
|
|
|
community_id: inserted_community.id,
|
2019-03-06 01:00:01 +00:00
|
|
|
updated: None
|
|
|
|
};
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
let inserted_post = Post::create(&conn, &new_post).unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
let comment_form = CommentForm {
|
|
|
|
content: "A test comment".into(),
|
|
|
|
attributed_to: "test_user.com".into(),
|
2019-03-23 01:42:57 +00:00
|
|
|
post_id: inserted_post.id,
|
2019-03-06 01:00:01 +00:00
|
|
|
parent_id: None,
|
|
|
|
updated: None
|
|
|
|
};
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
let expected_comment = Comment {
|
|
|
|
id: inserted_comment.id,
|
|
|
|
content: "A test comment".into(),
|
|
|
|
attributed_to: "test_user.com".into(),
|
|
|
|
post_id: inserted_post.id,
|
|
|
|
parent_id: None,
|
|
|
|
published: inserted_comment.published,
|
|
|
|
updated: None
|
|
|
|
};
|
|
|
|
|
|
|
|
let child_comment_form = CommentForm {
|
|
|
|
content: "A child comment".into(),
|
|
|
|
attributed_to: "test_user.com".into(),
|
2019-03-23 01:42:57 +00:00
|
|
|
post_id: inserted_post.id,
|
|
|
|
parent_id: Some(inserted_comment.id),
|
2019-03-06 01:00:01 +00:00
|
|
|
updated: None
|
|
|
|
};
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
let inserted_child_comment = Comment::create(&conn, &child_comment_form).unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
let comment_like_form = CommentLikeForm {
|
2019-03-23 01:42:57 +00:00
|
|
|
comment_id: inserted_comment.id,
|
2019-03-28 19:32:08 +00:00
|
|
|
post_id: inserted_post.id,
|
2019-03-06 01:00:01 +00:00
|
|
|
fedi_user_id: "test".into(),
|
2019-03-23 01:42:57 +00:00
|
|
|
score: 1
|
2019-03-06 01:00:01 +00:00
|
|
|
};
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
let inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
let expected_comment_like = CommentLike {
|
|
|
|
id: inserted_comment_like.id,
|
|
|
|
comment_id: inserted_comment.id,
|
2019-03-28 19:32:08 +00:00
|
|
|
post_id: inserted_post.id,
|
2019-03-06 01:00:01 +00:00
|
|
|
fedi_user_id: "test".into(),
|
|
|
|
published: inserted_comment_like.published,
|
|
|
|
score: 1
|
|
|
|
};
|
|
|
|
|
2019-03-23 01:42:57 +00:00
|
|
|
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, &comment_like_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();
|
2019-03-26 18:00:18 +00:00
|
|
|
Community::delete(&conn, inserted_community.id).unwrap();
|
2019-03-06 01:00:01 +00:00
|
|
|
|
|
|
|
assert_eq!(expected_comment, read_comment);
|
|
|
|
assert_eq!(expected_comment, inserted_comment);
|
|
|
|
assert_eq!(expected_comment, updated_comment);
|
|
|
|
assert_eq!(expected_comment_like, inserted_comment_like);
|
|
|
|
assert_eq!(expected_comment.id, inserted_child_comment.parent_id.unwrap());
|
|
|
|
assert_eq!(1, like_removed);
|
|
|
|
assert_eq!(1, num_deleted);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|