-use crate::schema::site_aggregates;
+use crate::{aggregates::structs::SiteAggregates, schema::site_aggregates};
use diesel::{result::Error, *};
-use serde::{Deserialize, Serialize};
-
-#[derive(
- Queryable, Associations, Identifiable, PartialEq, Debug, Serialize, Deserialize, Clone,
-)]
-#[table_name = "site_aggregates"]
-pub struct SiteAggregates {
- pub id: i32,
- pub site_id: i32,
- pub users: i64,
- pub posts: i64,
- pub comments: i64,
- pub communities: i64,
- pub users_active_day: i64,
- pub users_active_week: i64,
- pub users_active_month: i64,
- pub users_active_half_year: i64,
-}
impl SiteAggregates {
- pub fn read(conn: &PgConnection) -> Result<Self, Error> {
+ pub fn read(conn: &mut PgConnection) -> Result<Self, Error> {
site_aggregates::table.first::<Self>(conn)
}
}
mod tests {
use crate::{
aggregates::site_aggregates::SiteAggregates,
- establish_unpooled_connection,
source::{
comment::{Comment, CommentForm},
community::{Community, CommunityForm},
site::{Site, SiteForm},
},
traits::Crud,
+ utils::establish_unpooled_connection,
};
use serial_test::serial;
#[test]
#[serial]
fn test_crud() {
- let conn = establish_unpooled_connection();
+ let conn = &mut establish_unpooled_connection();
let new_person = PersonForm {
name: "thommy_site_agg".into(),
+ public_key: Some("pubkey".to_string()),
..PersonForm::default()
};
- let inserted_person = Person::create(&conn, &new_person).unwrap();
+ let inserted_person = Person::create(conn, &new_person).unwrap();
let site_form = SiteForm {
name: "test_site".into(),
- creator_id: inserted_person.id,
- sidebar: None,
- description: None,
- icon: None,
- banner: None,
- enable_downvotes: None,
- open_registration: None,
- enable_nsfw: None,
- updated: None,
- community_creation_admin_only: Some(false),
+ public_key: Some("pubkey".to_string()),
+ ..Default::default()
};
- Site::create(&conn, &site_form).unwrap();
+ let inserted_site = Site::create(conn, &site_form).unwrap();
let new_community = CommunityForm {
name: "TIL_site_agg".into(),
title: "nada".to_owned(),
+ public_key: Some("pubkey".to_string()),
..CommunityForm::default()
};
- let inserted_community = Community::create(&conn, &new_community).unwrap();
+ let inserted_community = Community::create(conn, &new_community).unwrap();
let new_post = PostForm {
name: "A test post".into(),
};
// Insert two of those posts
- let inserted_post = Post::create(&conn, &new_post).unwrap();
- let _inserted_post_again = Post::create(&conn, &new_post).unwrap();
+ let inserted_post = Post::create(conn, &new_post).unwrap();
+ let _inserted_post_again = Post::create(conn, &new_post).unwrap();
let comment_form = CommentForm {
content: "A test comment".into(),
};
// Insert two of those comments
- let inserted_comment = Comment::create(&conn, &comment_form).unwrap();
+ let inserted_comment = Comment::create(conn, &comment_form, None).unwrap();
let child_comment_form = CommentForm {
content: "A test comment".into(),
creator_id: inserted_person.id,
post_id: inserted_post.id,
- parent_id: Some(inserted_comment.id),
..CommentForm::default()
};
- let _inserted_child_comment = Comment::create(&conn, &child_comment_form).unwrap();
+ let _inserted_child_comment =
+ Comment::create(conn, &child_comment_form, Some(&inserted_comment.path)).unwrap();
- let site_aggregates_before_delete = SiteAggregates::read(&conn).unwrap();
+ let site_aggregates_before_delete = SiteAggregates::read(conn).unwrap();
assert_eq!(1, site_aggregates_before_delete.users);
assert_eq!(1, site_aggregates_before_delete.communities);
assert_eq!(2, site_aggregates_before_delete.comments);
// Try a post delete
- Post::delete(&conn, inserted_post.id).unwrap();
- let site_aggregates_after_post_delete = SiteAggregates::read(&conn).unwrap();
+ Post::delete(conn, inserted_post.id).unwrap();
+ let site_aggregates_after_post_delete = SiteAggregates::read(conn).unwrap();
assert_eq!(1, site_aggregates_after_post_delete.posts);
assert_eq!(0, site_aggregates_after_post_delete.comments);
// This shouuld delete all the associated rows, and fire triggers
- let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
+ let person_num_deleted = Person::delete(conn, inserted_person.id).unwrap();
assert_eq!(1, person_num_deleted);
// Delete the community
- let community_num_deleted = Community::delete(&conn, inserted_community.id).unwrap();
+ let community_num_deleted = Community::delete(conn, inserted_community.id).unwrap();
assert_eq!(1, community_num_deleted);
- let after_delete = SiteAggregates::read(&conn);
- assert!(after_delete.is_err());
+ // Site should still exist, it can without a site creator.
+ let after_delete_creator = SiteAggregates::read(conn);
+ assert!(after_delete_creator.is_ok());
+
+ Site::delete(conn, inserted_site.id).unwrap();
+ let after_delete_site = SiteAggregates::read(conn);
+ assert!(after_delete_site.is_err());
}
}