mirror of https://github.com/LemmyNet/lemmy
Adding posts and comments.
parent
e8a96999b6
commit
5b38bffb98
@ -1,2 +1,3 @@
|
||||
/target
|
||||
.env
|
||||
.idea
|
||||
|
@ -1,3 +1,2 @@
|
||||
drop table post_like;
|
||||
drop table post_dislike;
|
||||
drop table post;
|
||||
|
@ -0,0 +1,2 @@
|
||||
drop table comment_like;
|
||||
drop table comment;
|
@ -0,0 +1,17 @@
|
||||
create table comment (
|
||||
id serial primary key,
|
||||
content text not null,
|
||||
attributed_to text not null,
|
||||
post_id int references post on update cascade on delete cascade not null,
|
||||
parent_id int references comment on update cascade on delete cascade,
|
||||
published timestamp not null default now(),
|
||||
updated timestamp
|
||||
);
|
||||
|
||||
create table comment_like (
|
||||
id serial primary key,
|
||||
comment_id int references comment on update cascade on delete cascade not null,
|
||||
fedi_user_id text not null,
|
||||
score smallint not null, -- -1, or 1 for dislike, like, no row for no opinion
|
||||
published timestamp not null default now()
|
||||
);
|
@ -0,0 +1,177 @@
|
||||
extern crate diesel;
|
||||
use schema::{comment, comment_like};
|
||||
use diesel::*;
|
||||
use diesel::result::Error;
|
||||
use {Crud, Likeable};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug)]
|
||||
#[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>
|
||||
}
|
||||
|
||||
#[derive(Insertable, AsChangeset, Clone, Copy)]
|
||||
#[table_name="comment"]
|
||||
pub struct CommentForm<'a> {
|
||||
pub content: &'a str,
|
||||
pub attributed_to: &'a str,
|
||||
pub post_id: &'a i32,
|
||||
pub parent_id: Option<&'a i32>,
|
||||
pub updated: Option<&'a chrono::NaiveDateTime>
|
||||
}
|
||||
|
||||
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
||||
#[belongs_to(Comment)]
|
||||
#[table_name = "comment_like"]
|
||||
pub struct CommentLike {
|
||||
pub id: i32,
|
||||
pub comment_id: i32,
|
||||
pub fedi_user_id: String,
|
||||
pub score: i16,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
}
|
||||
|
||||
#[derive(Insertable, AsChangeset, Clone, Copy)]
|
||||
#[table_name="comment_like"]
|
||||
pub struct CommentLikeForm<'a> {
|
||||
pub comment_id: &'a i32,
|
||||
pub fedi_user_id: &'a str,
|
||||
pub score: &'a i16
|
||||
}
|
||||
|
||||
impl<'a> Crud<CommentForm<'a>> for Comment {
|
||||
fn read(conn: &PgConnection, comment_id: i32) -> Comment {
|
||||
use schema::comment::dsl::*;
|
||||
comment.find(comment_id)
|
||||
.first::<Comment>(conn)
|
||||
.expect("Error in query")
|
||||
}
|
||||
|
||||
fn delete(conn: &PgConnection, comment_id: i32) -> usize {
|
||||
use schema::comment::dsl::*;
|
||||
diesel::delete(comment.find(comment_id))
|
||||
.execute(conn)
|
||||
.expect("Error deleting.")
|
||||
}
|
||||
|
||||
fn create(conn: &PgConnection, comment_form: CommentForm) -> Result<Comment, Error> {
|
||||
use schema::comment::dsl::*;
|
||||
insert_into(comment)
|
||||
.values(comment_form)
|
||||
.get_result::<Comment>(conn)
|
||||
}
|
||||
|
||||
fn update(conn: &PgConnection, comment_id: i32, comment_form: CommentForm) -> Comment {
|
||||
use schema::comment::dsl::*;
|
||||
diesel::update(comment.find(comment_id))
|
||||
.set(comment_form)
|
||||
.get_result::<Comment>(conn)
|
||||
.expect(&format!("Unable to find {}", comment_id))
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Likeable <CommentLikeForm<'a>> for CommentLike {
|
||||
fn like(conn: &PgConnection, comment_like_form: CommentLikeForm) -> Result<CommentLike, Error> {
|
||||
use schema::comment_like::dsl::*;
|
||||
insert_into(comment_like)
|
||||
.values(comment_like_form)
|
||||
.get_result::<CommentLike>(conn)
|
||||
}
|
||||
fn remove(conn: &PgConnection, comment_like_form: CommentLikeForm) -> usize {
|
||||
use schema::comment_like::dsl::*;
|
||||
diesel::delete(comment_like
|
||||
.filter(comment_id.eq(comment_like_form.comment_id))
|
||||
.filter(fedi_user_id.eq(comment_like_form.fedi_user_id)))
|
||||
.execute(conn)
|
||||
.expect("Error deleting.")
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use establish_connection;
|
||||
use super::*;
|
||||
use actions::post::*;
|
||||
use Crud;
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_connection();
|
||||
|
||||
let new_post = PostForm {
|
||||
name: "A test post".into(),
|
||||
url: "https://test.com".into(),
|
||||
attributed_to: "test_user.com".into(),
|
||||
updated: None
|
||||
};
|
||||
|
||||
let inserted_post = Post::create(&conn, new_post).unwrap();
|
||||
|
||||
let comment_form = CommentForm {
|
||||
content: "A test comment".into(),
|
||||
attributed_to: "test_user.com".into(),
|
||||
post_id: &inserted_post.id,
|
||||
parent_id: None,
|
||||
updated: None
|
||||
};
|
||||
|
||||
let inserted_comment = Comment::create(&conn, comment_form).unwrap();
|
||||
|
||||
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(),
|
||||
post_id: &inserted_post.id,
|
||||
parent_id: Some(&inserted_comment.id),
|
||||
updated: None
|
||||
};
|
||||
|
||||
let inserted_child_comment = Comment::create(&conn, child_comment_form).unwrap();
|
||||
|
||||
let comment_like_form = CommentLikeForm {
|
||||
comment_id: &inserted_comment.id,
|
||||
fedi_user_id: "test".into(),
|
||||
score: &1
|
||||
};
|
||||
|
||||
let inserted_comment_like = CommentLike::like(&conn, comment_like_form).unwrap();
|
||||
|
||||
let expected_comment_like = CommentLike {
|
||||
id: inserted_comment_like.id,
|
||||
comment_id: inserted_comment.id,
|
||||
fedi_user_id: "test".into(),
|
||||
published: inserted_comment_like.published,
|
||||
score: 1
|
||||
};
|
||||
|
||||
let read_comment = Comment::read(&conn, inserted_comment.id);
|
||||
let updated_comment = Comment::update(&conn, inserted_comment.id, comment_form);
|
||||
let like_removed = CommentLike::remove(&conn, comment_like_form);
|
||||
let num_deleted = Comment::delete(&conn, inserted_comment.id);
|
||||
Comment::delete(&conn, inserted_child_comment.id);
|
||||
Post::delete(&conn, inserted_post.id);
|
||||
|
||||
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);
|
||||
|
||||
}
|
||||
}
|
@ -1,3 +1,4 @@
|
||||
pub mod user;
|
||||
pub mod community;
|
||||
pub mod post;
|
||||
pub mod comment;
|
||||
|
@ -0,0 +1,150 @@
|
||||
extern crate diesel;
|
||||
use schema::{post, post_like};
|
||||
use diesel::*;
|
||||
use diesel::result::Error;
|
||||
use {Crud, Likeable};
|
||||
|
||||
#[derive(Queryable, Identifiable, PartialEq, Debug)]
|
||||
#[table_name="post"]
|
||||
pub struct Post {
|
||||
pub id: i32,
|
||||
pub name: String,
|
||||
pub url: String,
|
||||
pub attributed_to: String,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
pub updated: Option<chrono::NaiveDateTime>
|
||||
}
|
||||
|
||||
#[derive(Insertable, AsChangeset, Clone, Copy)]
|
||||
#[table_name="post"]
|
||||
pub struct PostForm<'a> {
|
||||
pub name: &'a str,
|
||||
pub url: &'a str,
|
||||
pub attributed_to: &'a str,
|
||||
pub updated: Option<&'a chrono::NaiveDateTime>
|
||||
}
|
||||
|
||||
#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
|
||||
#[belongs_to(Post)]
|
||||
#[table_name = "post_like"]
|
||||
pub struct PostLike {
|
||||
pub id: i32,
|
||||
pub post_id: i32,
|
||||
pub fedi_user_id: String,
|
||||
pub score: i16,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
}
|
||||
|
||||
#[derive(Insertable, AsChangeset, Clone, Copy)]
|
||||
#[table_name="post_like"]
|
||||
pub struct PostLikeForm<'a> {
|
||||
pub post_id: &'a i32,
|
||||
pub fedi_user_id: &'a str,
|
||||
pub score: &'a i16
|
||||
}
|
||||
|
||||
impl<'a> Crud<PostForm<'a>> for Post {
|
||||
fn read(conn: &PgConnection, post_id: i32) -> Post {
|
||||
use schema::post::dsl::*;
|
||||
post.find(post_id)
|
||||
.first::<Post>(conn)
|
||||
.expect("Error in query")
|
||||
}
|
||||
|
||||
fn delete(conn: &PgConnection, post_id: i32) -> usize {
|
||||
use schema::post::dsl::*;
|
||||
diesel::delete(post.find(post_id))
|
||||
.execute(conn)
|
||||
.expect("Error deleting.")
|
||||
}
|
||||
|
||||
fn create(conn: &PgConnection, new_post: PostForm) -> Result<Post, Error> {
|
||||
use schema::post::dsl::*;
|
||||
insert_into(post)
|
||||
.values(new_post)
|
||||
.get_result::<Post>(conn)
|
||||
}
|
||||
|
||||
fn update(conn: &PgConnection, post_id: i32, new_post: PostForm) -> Post {
|
||||
use schema::post::dsl::*;
|
||||
diesel::update(post.find(post_id))
|
||||
.set(new_post)
|
||||
.get_result::<Post>(conn)
|
||||
.expect(&format!("Unable to find {}", post_id))
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Likeable <PostLikeForm<'a>> for PostLike {
|
||||
fn like(conn: &PgConnection, post_like_form: PostLikeForm) -> Result<PostLike, Error> {
|
||||
use schema::post_like::dsl::*;
|
||||
insert_into(post_like)
|
||||
.values(post_like_form)
|
||||
.get_result::<PostLike>(conn)
|
||||
}
|
||||
fn remove(conn: &PgConnection, post_like_form: PostLikeForm) -> usize {
|
||||
use schema::post_like::dsl::*;
|
||||
diesel::delete(post_like
|
||||
.filter(post_id.eq(post_like_form.post_id))
|
||||
.filter(fedi_user_id.eq(post_like_form.fedi_user_id)))
|
||||
.execute(conn)
|
||||
.expect("Error deleting.")
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use establish_connection;
|
||||
use super::*;
|
||||
use Crud;
|
||||
#[test]
|
||||
fn test_crud() {
|
||||
let conn = establish_connection();
|
||||
|
||||
let new_post = PostForm {
|
||||
name: "A test post".into(),
|
||||
url: "https://test.com".into(),
|
||||
attributed_to: "test_user.com".into(),
|
||||
updated: None
|
||||
};
|
||||
|
||||
let inserted_post = Post::create(&conn, new_post).unwrap();
|
||||
|
||||
let expected_post = Post {
|
||||
id: inserted_post.id,
|
||||
name: "A test post".into(),
|
||||
url: "https://test.com".into(),
|
||||
attributed_to: "test_user.com".into(),
|
||||
published: inserted_post.published,
|
||||
updated: None
|
||||
};
|
||||
|
||||
let post_like_form = PostLikeForm {
|
||||
post_id: &inserted_post.id,
|
||||
fedi_user_id: "test".into(),
|
||||
score: &1
|
||||
};
|
||||
|
||||
let inserted_post_like = PostLike::like(&conn, post_like_form).unwrap();
|
||||
|
||||
let expected_post_like = PostLike {
|
||||
id: inserted_post_like.id,
|
||||
post_id: inserted_post.id,
|
||||
fedi_user_id: "test".into(),
|
||||
published: inserted_post_like.published,
|
||||
score: 1
|
||||
};
|
||||
|
||||
let read_post = Post::read(&conn, inserted_post.id);
|
||||
let updated_post = Post::update(&conn, inserted_post.id, new_post);
|
||||
let like_removed = PostLike::remove(&conn, post_like_form);
|
||||
let num_deleted = Post::delete(&conn, inserted_post.id);
|
||||
|
||||
assert_eq!(expected_post, read_post);
|
||||
assert_eq!(expected_post, inserted_post);
|
||||
assert_eq!(expected_post, updated_post);
|
||||
assert_eq!(expected_post_like, inserted_post_like);
|
||||
assert_eq!(1, like_removed);
|
||||
assert_eq!(1, num_deleted);
|
||||
|
||||
}
|
||||
}
|
@ -1,80 +0,0 @@
|
||||
table! {
|
||||
community (id) {
|
||||
id -> Int4,
|
||||
name -> Varchar,
|
||||
start_time -> Timestamp,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
community_follower (id) {
|
||||
id -> Int4,
|
||||
fedi_user_id -> Text,
|
||||
community_id -> Nullable<Int4>,
|
||||
start_time -> Timestamp,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
community_user (id) {
|
||||
id -> Int4,
|
||||
fedi_user_id -> Text,
|
||||
community_id -> Nullable<Int4>,
|
||||
start_time -> Timestamp,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
post (id) {
|
||||
id -> Int4,
|
||||
name -> Varchar,
|
||||
url -> Text,
|
||||
attributed_to -> Text,
|
||||
start_time -> Timestamp,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
post_dislike (id) {
|
||||
id -> Int4,
|
||||
fedi_user_id -> Text,
|
||||
post_id -> Nullable<Int4>,
|
||||
start_time -> Timestamp,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
post_like (id) {
|
||||
id -> Int4,
|
||||
fedi_user_id -> Text,
|
||||
post_id -> Nullable<Int4>,
|
||||
start_time -> Timestamp,
|
||||
}
|
||||
}
|
||||
|
||||
table! {
|
||||
user_ (id) {
|
||||
id -> Int4,
|
||||
name -> Varchar,
|
||||
preferred_username -> Nullable<Varchar>,
|
||||
password_encrypted -> Text,
|
||||
email -> Nullable<Text>,
|
||||
icon -> Nullable<Bytea>,
|
||||
start_time -> Timestamp,
|
||||
}
|
||||
}
|
||||
|
||||
joinable!(community_follower -> community (community_id));
|
||||
joinable!(community_user -> community (community_id));
|
||||
joinable!(post_dislike -> post (post_id));
|
||||
joinable!(post_like -> post (post_id));
|
||||
|
||||
allow_tables_to_appear_in_same_query!(
|
||||
community,
|
||||
community_follower,
|
||||
community_user,
|
||||
post,
|
||||
post_dislike,
|
||||
post_like,
|
||||
user_,
|
||||
);
|
Loading…
Reference in New Issue