Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply scheduled post limit to future posts instead of past posts, and verify this in test #5054

Merged
merged 5 commits into from
Sep 27, 2024
Merged

Apply scheduled post limit to future posts instead of past posts, and verify this in test #5054

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddac2de
test scheduled_post_count
dullbananas Sep 25, 2024
f3dfcd4
fix syntax error
dullbananas Sep 25, 2024
7e97c44
fix formatting
dullbananas Sep 25, 2024
65e63c3
fix argument order
dullbananas Sep 25, 2024
a02b0c0
fix user_scheduled_post_count function
dullbananas Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions crates/db_schema/src/impls/post.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ impl Post {
post::table
.inner_join(person::table)
.inner_join(community::table)
// find all posts which have scheduled_publish_time that is in the past
// find all posts which have scheduled_publish_time that is in the future
.filter(post::scheduled_publish_time.is_not_null())
.filter(coalesce(post::scheduled_publish_time, now()).lt(now()))
.filter(coalesce(post::scheduled_publish_time, now()).gt(now()))
// make sure the post and community are still around
.filter(not(post::deleted.or(post::removed)))
.filter(not(community::removed.or(community::deleted)))
Expand Down Expand Up @@ -414,6 +414,7 @@ mod tests {
traits::{Crud, Likeable, Saveable},
utils::build_db_pool_for_tests,
};
use chrono::DateTime;
use pretty_assertions::assert_eq;
use serial_test::serial;
use std::collections::HashSet;
Expand Down Expand Up @@ -456,6 +457,12 @@ mod tests {
);
let inserted_post2 = Post::create(pool, &new_post2).await.unwrap();

let new_scheduled_post = PostInsertForm {
scheduled_publish_time: Some(DateTime::from_timestamp_nanos(i64::MAX)),
..PostInsertForm::new("beans".into(), inserted_person.id, inserted_community.id)
};
let inserted_scheduled_post = Post::create(pool, &new_scheduled_post).await.unwrap();

let expected_post = Post {
id: inserted_post.id,
name: "A test post".into(),
Expand Down Expand Up @@ -535,6 +542,12 @@ mod tests {
.await
.unwrap();

// Scheduled post count
let scheduled_post_count = Post::user_scheduled_post_count(inserted_person.id, pool)
.await
.unwrap();
assert_eq!(1, scheduled_post_count);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Post::user_scheduled_post_count returned 0 instead of 1 here before I changed it


let like_removed = PostLike::remove(pool, inserted_person.id, inserted_post.id)
.await
.unwrap();
Expand All @@ -551,8 +564,11 @@ mod tests {
assert_eq!(2, read_removed);

let num_deleted = Post::delete(pool, inserted_post.id).await.unwrap()
+ Post::delete(pool, inserted_post2.id).await.unwrap();
assert_eq!(2, num_deleted);
+ Post::delete(pool, inserted_post2.id).await.unwrap()
+ Post::delete(pool, inserted_scheduled_post.id)
.await
.unwrap();
assert_eq!(3, num_deleted);
Community::delete(pool, inserted_community.id)
.await
.unwrap();
Expand Down