X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fregistration_application_view.rs;h=a2fdcba60973a68ade1acd6b78214ec9953b6b50;hb=9b5e765364ecf7de64c9cbc7a452ccfaabce5449;hp=0b5fa05e188238d3bf273bcf04332e5a76a741fd;hpb=d9e7f0100ad14121b43b89d54b80fb2345d8d83e;p=lemmy.git diff --git a/crates/db_views/src/registration_application_view.rs b/crates/db_views/src/registration_application_view.rs index 0b5fa05e..a2fdcba6 100644 --- a/crates/db_views/src/registration_application_view.rs +++ b/crates/db_views/src/registration_application_view.rs @@ -11,24 +11,23 @@ use diesel_async::RunQueryDsl; use lemmy_db_schema::{ schema::{local_user, person, registration_application}, source::{ - local_user::{LocalUser, LocalUserSettings}, - person::{Person, PersonSafe}, + local_user::LocalUser, + person::Person, registration_application::RegistrationApplication, }, - traits::{ToSafe, ToSafeSettings, ViewToVec}, + traits::JoinView, utils::{get_conn, limit_and_offset, DbPool}, }; use typed_builder::TypedBuilder; -type RegistrationApplicationViewTuple = ( - RegistrationApplication, - LocalUserSettings, - PersonSafe, - Option, -); +type RegistrationApplicationViewTuple = + (RegistrationApplication, LocalUser, Person, Option); impl RegistrationApplicationView { - pub async fn read(pool: &DbPool, registration_application_id: i32) -> Result { + pub async fn read( + pool: &mut DbPool<'_>, + registration_application_id: i32, + ) -> Result { let conn = &mut get_conn(pool).await?; let person_alias_1 = diesel::alias!(person as person1); @@ -46,11 +45,9 @@ impl RegistrationApplicationView { .order_by(registration_application::published.desc()) .select(( registration_application::all_columns, - LocalUser::safe_settings_columns_tuple(), - Person::safe_columns_tuple(), - person_alias_1 - .fields(Person::safe_columns_tuple()) - .nullable(), + local_user::all_columns, + person::all_columns, + person_alias_1.fields(person::all_columns).nullable(), )) .first::(conn) .await?; @@ -64,7 +61,10 @@ impl RegistrationApplicationView { } /// Returns the current unread registration_application count - pub async fn get_unread_count(pool: &DbPool, verified_email_only: bool) -> Result { + pub async fn get_unread_count( + pool: &mut DbPool<'_>, + verified_email_only: bool, + ) -> Result { let conn = &mut get_conn(pool).await?; let person_alias_1 = diesel::alias!(person as person1); @@ -91,16 +91,16 @@ impl RegistrationApplicationView { #[derive(TypedBuilder)] #[builder(field_defaults(default))] -pub struct RegistrationApplicationQuery<'a> { +pub struct RegistrationApplicationQuery<'a, 'b: 'a> { #[builder(!default)] - pool: &'a DbPool, + pool: &'a mut DbPool<'b>, unread_only: Option, verified_email_only: Option, page: Option, limit: Option, } -impl<'a> RegistrationApplicationQuery<'a> { +impl<'a, 'b: 'a> RegistrationApplicationQuery<'a, 'b> { pub async fn list(self) -> Result, Error> { let conn = &mut get_conn(self.pool).await?; let person_alias_1 = diesel::alias!(person as person1); @@ -115,11 +115,9 @@ impl<'a> RegistrationApplicationQuery<'a> { .order_by(registration_application::published.desc()) .select(( registration_application::all_columns, - LocalUser::safe_settings_columns_tuple(), - Person::safe_columns_tuple(), - person_alias_1 - .fields(Person::safe_columns_tuple()) - .nullable(), + local_user::all_columns, + person::all_columns, + person_alias_1.fields(person::all_columns).nullable(), )) .into_boxed(); @@ -140,22 +138,24 @@ impl<'a> RegistrationApplicationQuery<'a> { let res = query.load::(conn).await?; - Ok(RegistrationApplicationView::from_tuple_to_vec(res)) + Ok( + res + .into_iter() + .map(RegistrationApplicationView::from_tuple) + .collect(), + ) } } -impl ViewToVec for RegistrationApplicationView { - type DbTuple = RegistrationApplicationViewTuple; - fn from_tuple_to_vec(items: Vec) -> Vec { - items - .into_iter() - .map(|a| Self { - registration_application: a.0, - creator_local_user: a.1, - creator: a.2, - admin: a.3, - }) - .collect::>() +impl JoinView for RegistrationApplicationView { + type JoinTuple = RegistrationApplicationViewTuple; + fn from_tuple(a: Self::JoinTuple) -> Self { + Self { + registration_application: a.0, + creator_local_user: a.1, + creator: a.2, + admin: a.3, + } } } @@ -168,8 +168,8 @@ mod tests { use lemmy_db_schema::{ source::{ instance::Instance, - local_user::{LocalUser, LocalUserInsertForm, LocalUserSettings, LocalUserUpdateForm}, - person::{Person, PersonInsertForm, PersonSafe}, + local_user::{LocalUser, LocalUserInsertForm, LocalUserUpdateForm}, + person::{Person, PersonInsertForm}, registration_application::{ RegistrationApplication, RegistrationApplicationInsertForm, @@ -185,6 +185,7 @@ mod tests { #[serial] async fn test_crud() { let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) .await @@ -272,7 +273,7 @@ mod tests { let mut expected_sara_app_view = RegistrationApplicationView { registration_application: sara_app.clone(), - creator_local_user: LocalUserSettings { + creator_local_user: LocalUser { id: inserted_sara_local_user.id, person_id: inserted_sara_local_user.person_id, email: inserted_sara_local_user.email, @@ -290,8 +291,13 @@ mod tests { show_new_post_notifs: inserted_sara_local_user.show_new_post_notifs, email_verified: inserted_sara_local_user.email_verified, accepted_application: inserted_sara_local_user.accepted_application, + totp_2fa_secret: inserted_sara_local_user.totp_2fa_secret, + totp_2fa_url: inserted_sara_local_user.totp_2fa_url, + password_encrypted: inserted_sara_local_user.password_encrypted, + open_links_in_new_tab: inserted_sara_local_user.open_links_in_new_tab, + infinite_scroll_enabled: inserted_sara_local_user.infinite_scroll_enabled, }, - creator: PersonSafe { + creator: Person { id: inserted_sara_person.id, name: inserted_sara_person.name.clone(), display_name: None, @@ -311,6 +317,9 @@ mod tests { shared_inbox_url: None, matrix_user_id: None, instance_id: inserted_instance.id, + private_key: inserted_sara_person.private_key, + public_key: inserted_sara_person.public_key, + last_refreshed_at: inserted_sara_person.last_refreshed_at, }, admin: None, }; @@ -366,7 +375,7 @@ mod tests { .accepted_application = true; expected_sara_app_view.registration_application.admin_id = Some(inserted_timmy_person.id); - expected_sara_app_view.admin = Some(PersonSafe { + expected_sara_app_view.admin = Some(Person { id: inserted_timmy_person.id, name: inserted_timmy_person.name.clone(), display_name: None, @@ -386,6 +395,9 @@ mod tests { shared_inbox_url: None, matrix_user_id: None, instance_id: inserted_instance.id, + private_key: inserted_timmy_person.private_key, + public_key: inserted_timmy_person.public_key, + last_refreshed_at: inserted_timmy_person.last_refreshed_at, }); assert_eq!(read_sara_app_view_after_approve, expected_sara_app_view);