mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-16 12:20:32 +00:00
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
185 lines
5.3 KiB
Rust
185 lines
5.3 KiB
Rust
use crate::{
|
|
newtypes::{CommentId, PersonId, PersonMentionId},
|
|
schema::person_mention::dsl::*,
|
|
source::person_mention::*,
|
|
traits::Crud,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error, *};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
#[async_trait]
|
|
impl Crud for PersonMention {
|
|
type InsertForm = PersonMentionInsertForm;
|
|
type UpdateForm = PersonMentionUpdateForm;
|
|
type IdType = PersonMentionId;
|
|
async fn read(pool: &DbPool, person_mention_id: PersonMentionId) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
person_mention
|
|
.find(person_mention_id)
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn create(pool: &DbPool, person_mention_form: &Self::InsertForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
// since the return here isnt utilized, we dont need to do an update
|
|
// but get_result doesnt return the existing row here
|
|
insert_into(person_mention)
|
|
.values(person_mention_form)
|
|
.on_conflict((recipient_id, comment_id))
|
|
.do_update()
|
|
.set(person_mention_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn update(
|
|
pool: &DbPool,
|
|
person_mention_id: PersonMentionId,
|
|
person_mention_form: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(person_mention.find(person_mention_id))
|
|
.set(person_mention_form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
impl PersonMention {
|
|
pub async fn mark_all_as_read(
|
|
pool: &DbPool,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Vec<PersonMention>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(
|
|
person_mention
|
|
.filter(recipient_id.eq(for_recipient_id))
|
|
.filter(read.eq(false)),
|
|
)
|
|
.set(read.eq(true))
|
|
.get_results::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn read_by_comment_and_person(
|
|
pool: &DbPool,
|
|
for_comment_id: CommentId,
|
|
for_recipient_id: PersonId,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
person_mention
|
|
.filter(comment_id.eq(for_comment_id))
|
|
.filter(recipient_id.eq(for_recipient_id))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
source::{
|
|
comment::*,
|
|
community::{Community, CommunityInsertForm},
|
|
instance::Instance,
|
|
person::*,
|
|
person_mention::*,
|
|
post::*,
|
|
},
|
|
traits::Crud,
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap();
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
.name("terrylake".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
|
|
|
let recipient_form = PersonInsertForm::builder()
|
|
.name("terrylakes recipient".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_recipient = Person::create(pool, &recipient_form).await.unwrap();
|
|
|
|
let new_community = CommunityInsertForm::builder()
|
|
.name("test community lake".to_string())
|
|
.title("nada".to_owned())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
|
|
|
let new_post = PostInsertForm::builder()
|
|
.name("A test post".into())
|
|
.creator_id(inserted_person.id)
|
|
.community_id(inserted_community.id)
|
|
.build();
|
|
|
|
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
|
|
|
let comment_form = CommentInsertForm::builder()
|
|
.content("A test comment".into())
|
|
.creator_id(inserted_person.id)
|
|
.post_id(inserted_post.id)
|
|
.build();
|
|
|
|
let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
|
|
|
|
let person_mention_form = PersonMentionInsertForm {
|
|
recipient_id: inserted_recipient.id,
|
|
comment_id: inserted_comment.id,
|
|
read: None,
|
|
};
|
|
|
|
let inserted_mention = PersonMention::create(pool, &person_mention_form)
|
|
.await
|
|
.unwrap();
|
|
|
|
let expected_mention = PersonMention {
|
|
id: inserted_mention.id,
|
|
recipient_id: inserted_mention.recipient_id,
|
|
comment_id: inserted_mention.comment_id,
|
|
read: false,
|
|
published: inserted_mention.published,
|
|
};
|
|
|
|
let read_mention = PersonMention::read(pool, inserted_mention.id)
|
|
.await
|
|
.unwrap();
|
|
|
|
let person_mention_update_form = PersonMentionUpdateForm { read: Some(false) };
|
|
let updated_mention =
|
|
PersonMention::update(pool, inserted_mention.id, &person_mention_update_form)
|
|
.await
|
|
.unwrap();
|
|
Comment::delete(pool, inserted_comment.id).await.unwrap();
|
|
Post::delete(pool, inserted_post.id).await.unwrap();
|
|
Community::delete(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
Person::delete(pool, inserted_person.id).await.unwrap();
|
|
Person::delete(pool, inserted_recipient.id).await.unwrap();
|
|
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
|
|
|
assert_eq!(expected_mention, read_mention);
|
|
assert_eq!(expected_mention, inserted_mention);
|
|
assert_eq!(expected_mention, updated_mention);
|
|
}
|
|
}
|