|
|
|
@ -1,4 +1,5 @@
|
|
|
|
|
use super::*;
|
|
|
|
|
use diesel::pg::Pg;
|
|
|
|
|
|
|
|
|
|
// The faked schema since diesel doesn't do views
|
|
|
|
|
table! {
|
|
|
|
@ -53,48 +54,138 @@ pub struct CommentView {
|
|
|
|
|
pub saved: Option<bool>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl CommentView {
|
|
|
|
|
pub fn list(
|
|
|
|
|
conn: &PgConnection,
|
|
|
|
|
sort: &SortType,
|
|
|
|
|
for_post_id: Option<i32>,
|
|
|
|
|
for_creator_id: Option<i32>,
|
|
|
|
|
search_term: Option<String>,
|
|
|
|
|
my_user_id: Option<i32>,
|
|
|
|
|
saved_only: bool,
|
|
|
|
|
page: Option<i64>,
|
|
|
|
|
limit: Option<i64>,
|
|
|
|
|
) -> Result<Vec<Self>, Error> {
|
|
|
|
|
pub struct CommentQueryBuilder<'a> {
|
|
|
|
|
conn: &'a PgConnection,
|
|
|
|
|
query: super::comment_view::comment_view::BoxedQuery<'a, Pg>,
|
|
|
|
|
sort: &'a SortType,
|
|
|
|
|
for_post_id: Option<i32>,
|
|
|
|
|
for_creator_id: Option<i32>,
|
|
|
|
|
search_term: Option<String>,
|
|
|
|
|
my_user_id: Option<i32>,
|
|
|
|
|
saved_only: bool,
|
|
|
|
|
page: Option<i64>,
|
|
|
|
|
limit: Option<i64>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<'a> CommentQueryBuilder<'a> {
|
|
|
|
|
pub fn create(conn: &'a PgConnection) -> Self {
|
|
|
|
|
use super::comment_view::comment_view::dsl::*;
|
|
|
|
|
|
|
|
|
|
let (limit, offset) = limit_and_offset(page, limit);
|
|
|
|
|
let query = comment_view.into_boxed();
|
|
|
|
|
|
|
|
|
|
CommentQueryBuilder {
|
|
|
|
|
conn,
|
|
|
|
|
query,
|
|
|
|
|
sort: &SortType::New,
|
|
|
|
|
for_post_id: None,
|
|
|
|
|
for_creator_id: None,
|
|
|
|
|
search_term: None,
|
|
|
|
|
my_user_id: None,
|
|
|
|
|
saved_only: false,
|
|
|
|
|
page: None,
|
|
|
|
|
limit: None,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let mut query = comment_view.into_boxed();
|
|
|
|
|
pub fn sort(mut self, sort: &'a SortType) -> Self {
|
|
|
|
|
self.sort = sort;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn for_post_id(mut self, for_post_id: i32) -> Self {
|
|
|
|
|
self.for_post_id = Some(for_post_id);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn for_post_id_optional(mut self, for_post_id: Option<i32>) -> Self {
|
|
|
|
|
self.for_post_id = for_post_id;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn for_creator_id(mut self, for_creator_id: i32) -> Self {
|
|
|
|
|
self.for_creator_id = Some(for_creator_id);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn for_creator_id_optional(mut self, for_creator_id: Option<i32>) -> Self {
|
|
|
|
|
self.for_creator_id = for_creator_id;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn search_term(mut self, search_term: String) -> Self {
|
|
|
|
|
self.search_term = Some(search_term);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn search_term_optional(mut self, search_term: Option<String>) -> Self {
|
|
|
|
|
self.search_term = search_term;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn my_user_id(mut self, my_user_id: i32) -> Self {
|
|
|
|
|
self.my_user_id = Some(my_user_id);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn my_user_id_optional(mut self, my_user_id: Option<i32>) -> Self {
|
|
|
|
|
self.my_user_id = my_user_id;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn saved_only(mut self, saved_only: bool) -> Self {
|
|
|
|
|
self.saved_only = saved_only;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn page(mut self, page: i64) -> Self {
|
|
|
|
|
self.page = Some(page);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn page_optional(mut self, page: Option<i64>) -> Self {
|
|
|
|
|
self.page = page;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn limit(mut self, limit: i64) -> Self {
|
|
|
|
|
self.limit = Some(limit);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn limit_optional(mut self, limit: Option<i64>) -> Self {
|
|
|
|
|
self.limit = limit;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn list(self) -> Result<Vec<CommentView>, Error> {
|
|
|
|
|
use super::comment_view::comment_view::dsl::*;
|
|
|
|
|
|
|
|
|
|
let mut query = self.query;
|
|
|
|
|
|
|
|
|
|
// The view lets you pass a null user_id, if you're not logged in
|
|
|
|
|
if let Some(my_user_id) = my_user_id {
|
|
|
|
|
if let Some(my_user_id) = self.my_user_id {
|
|
|
|
|
query = query.filter(user_id.eq(my_user_id));
|
|
|
|
|
} else {
|
|
|
|
|
query = query.filter(user_id.is_null());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Some(for_creator_id) = for_creator_id {
|
|
|
|
|
if let Some(for_creator_id) = self.for_creator_id {
|
|
|
|
|
query = query.filter(creator_id.eq(for_creator_id));
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if let Some(for_post_id) = for_post_id {
|
|
|
|
|
if let Some(for_post_id) = self.for_post_id {
|
|
|
|
|
query = query.filter(post_id.eq(for_post_id));
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if let Some(search_term) = search_term {
|
|
|
|
|
if let Some(search_term) = self.search_term {
|
|
|
|
|
query = query.filter(content.ilike(fuzzy_search(&search_term)));
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if saved_only {
|
|
|
|
|
if self.saved_only {
|
|
|
|
|
query = query.filter(saved.eq(true));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
query = match sort {
|
|
|
|
|
query = match self.sort {
|
|
|
|
|
// SortType::Hot => query.order(hot_rank.desc(), published.desc()),
|
|
|
|
|
SortType::New => query.order_by(published.desc()),
|
|
|
|
|
SortType::TopAll => query.order_by(score.desc()),
|
|
|
|
@ -113,10 +204,17 @@ impl CommentView {
|
|
|
|
|
_ => query.order_by(published.desc()),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let (limit, offset) = limit_and_offset(self.page, self.limit);
|
|
|
|
|
|
|
|
|
|
// Note: deleted and removed comments are done on the front side
|
|
|
|
|
query.limit(limit).offset(offset).load::<Self>(conn)
|
|
|
|
|
query
|
|
|
|
|
.limit(limit)
|
|
|
|
|
.offset(offset)
|
|
|
|
|
.load::<CommentView>(self.conn)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl CommentView {
|
|
|
|
|
pub fn read(
|
|
|
|
|
conn: &PgConnection,
|
|
|
|
|
from_comment_id: i32,
|
|
|
|
@ -196,30 +294,77 @@ pub struct ReplyView {
|
|
|
|
|
pub recipient_id: i32,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl ReplyView {
|
|
|
|
|
pub fn get_replies(
|
|
|
|
|
conn: &PgConnection,
|
|
|
|
|
for_user_id: i32,
|
|
|
|
|
sort: &SortType,
|
|
|
|
|
unread_only: bool,
|
|
|
|
|
page: Option<i64>,
|
|
|
|
|
limit: Option<i64>,
|
|
|
|
|
) -> Result<Vec<Self>, Error> {
|
|
|
|
|
pub struct ReplyQueryBuilder<'a> {
|
|
|
|
|
conn: &'a PgConnection,
|
|
|
|
|
query: super::comment_view::reply_view::BoxedQuery<'a, Pg>,
|
|
|
|
|
for_user_id: i32,
|
|
|
|
|
sort: &'a SortType,
|
|
|
|
|
unread_only: bool,
|
|
|
|
|
page: Option<i64>,
|
|
|
|
|
limit: Option<i64>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl<'a> ReplyQueryBuilder<'a> {
|
|
|
|
|
pub fn create(conn: &'a PgConnection, for_user_id: i32) -> Self {
|
|
|
|
|
use super::comment_view::reply_view::dsl::*;
|
|
|
|
|
|
|
|
|
|
let (limit, offset) = limit_and_offset(page, limit);
|
|
|
|
|
let query = reply_view.into_boxed();
|
|
|
|
|
|
|
|
|
|
let mut query = reply_view.into_boxed();
|
|
|
|
|
ReplyQueryBuilder {
|
|
|
|
|
conn,
|
|
|
|
|
query,
|
|
|
|
|
for_user_id: for_user_id,
|
|
|
|
|
sort: &SortType::New,
|
|
|
|
|
unread_only: false,
|
|
|
|
|
page: None,
|
|
|
|
|
limit: None,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn sort(mut self, sort: &'a SortType) -> Self {
|
|
|
|
|
self.sort = sort;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn unread_only(mut self, unread_only: bool) -> Self {
|
|
|
|
|
self.unread_only = unread_only;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn page(mut self, page: i64) -> Self {
|
|
|
|
|
self.page = Some(page);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn page_optional(mut self, page: Option<i64>) -> Self {
|
|
|
|
|
self.page = page;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn limit(mut self, limit: i64) -> Self {
|
|
|
|
|
self.limit = Some(limit);
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn limit_optional(mut self, limit: Option<i64>) -> Self {
|
|
|
|
|
self.limit = limit;
|
|
|
|
|
self
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn list(self) -> Result<Vec<ReplyView>, Error> {
|
|
|
|
|
use super::comment_view::reply_view::dsl::*;
|
|
|
|
|
|
|
|
|
|
let mut query = self.query;
|
|
|
|
|
|
|
|
|
|
query = query
|
|
|
|
|
.filter(user_id.eq(for_user_id))
|
|
|
|
|
.filter(recipient_id.eq(for_user_id));
|
|
|
|
|
.filter(user_id.eq(self.for_user_id))
|
|
|
|
|
.filter(recipient_id.eq(self.for_user_id));
|
|
|
|
|
|
|
|
|
|
if unread_only {
|
|
|
|
|
if self.unread_only {
|
|
|
|
|
query = query.filter(read.eq(false));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
query = match sort {
|
|
|
|
|
query = match self.sort {
|
|
|
|
|
// SortType::Hot => query.order_by(hot_rank.desc()),
|
|
|
|
|
SortType::New => query.order_by(published.desc()),
|
|
|
|
|
SortType::TopAll => query.order_by(score.desc()),
|
|
|
|
@ -238,7 +383,11 @@ impl ReplyView {
|
|
|
|
|
_ => query.order_by(published.desc()),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
query.limit(limit).offset(offset).load::<Self>(conn)
|
|
|
|
|
let (limit, offset) = limit_and_offset(self.page, self.limit);
|
|
|
|
|
query
|
|
|
|
|
.limit(limit)
|
|
|
|
|
.offset(offset)
|
|
|
|
|
.load::<ReplyView>(self.conn)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -368,30 +517,16 @@ mod tests {
|
|
|
|
|
saved: None,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let read_comment_views_no_user = CommentView::list(
|
|
|
|
|
&conn,
|
|
|
|
|
&SortType::New,
|
|
|
|
|
Some(inserted_post.id),
|
|
|
|
|
None,
|
|
|
|
|
None,
|
|
|
|
|
None,
|
|
|
|
|
false,
|
|
|
|
|
None,
|
|
|
|
|
None,
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
let read_comment_views_with_user = CommentView::list(
|
|
|
|
|
&conn,
|
|
|
|
|
&SortType::New,
|
|
|
|
|
Some(inserted_post.id),
|
|
|
|
|
None,
|
|
|
|
|
None,
|
|
|
|
|
Some(inserted_user.id),
|
|
|
|
|
false,
|
|
|
|
|
None,
|
|
|
|
|
None,
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
let read_comment_views_no_user = CommentQueryBuilder::create(&conn)
|
|
|
|
|
.for_post_id(inserted_post.id)
|
|
|
|
|
.list()
|
|
|
|
|
.unwrap();
|
|
|
|
|
let read_comment_views_with_user = CommentQueryBuilder::create(&conn)
|
|
|
|
|
.for_post_id(inserted_post.id)
|
|
|
|
|
.for_creator_id(inserted_user.id)
|
|
|
|
|
.list()
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
let like_removed = CommentLike::remove(&conn, &comment_like_form).unwrap();
|
|
|
|
|
let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap();
|
|
|
|
|
Post::delete(&conn, inserted_post.id).unwrap();
|
|
|
|
|