use crate::structs::RegistrationApplicationView;
use diesel::{dsl::count, result::Error, *};
use lemmy_db_schema::{
- schema::{local_user, person, person_alias_1, registration_application},
+ schema::{local_user, person, registration_application},
source::{
local_user::{LocalUser, LocalUserSettings},
- person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
+ person::{Person, PersonSafe},
registration_application::RegistrationApplication,
},
- traits::{MaybeOptional, ToSafe, ToSafeSettings, ViewToVec},
+ traits::{ToSafe, ToSafeSettings, ViewToVec},
utils::limit_and_offset,
};
+use typed_builder::TypedBuilder;
type RegistrationApplicationViewTuple = (
RegistrationApplication,
LocalUserSettings,
PersonSafe,
- Option<PersonSafeAlias1>,
+ Option<PersonSafe>,
);
impl RegistrationApplicationView {
- pub fn read(conn: &PgConnection, registration_application_id: i32) -> Result<Self, Error> {
+ pub fn read(conn: &mut PgConnection, registration_application_id: i32) -> Result<Self, Error> {
+ let person_alias_1 = diesel::alias!(person as person1);
+
let (registration_application, creator_local_user, creator, admin) =
registration_application::table
.find(registration_application_id)
)
.inner_join(person::table.on(local_user::person_id.eq(person::id)))
.left_join(
- person_alias_1::table
- .on(registration_application::admin_id.eq(person_alias_1::id.nullable())),
+ person_alias_1
+ .on(registration_application::admin_id.eq(person_alias_1.field(person::id).nullable())),
)
.order_by(registration_application::published.desc())
.select((
registration_application::all_columns,
LocalUser::safe_settings_columns_tuple(),
Person::safe_columns_tuple(),
- PersonAlias1::safe_columns_tuple().nullable(),
+ person_alias_1
+ .fields(Person::safe_columns_tuple())
+ .nullable(),
))
.first::<RegistrationApplicationViewTuple>(conn)?;
}
/// Returns the current unread registration_application count
- pub fn get_unread_count(conn: &PgConnection, verified_email_only: bool) -> Result<i64, Error> {
+ pub fn get_unread_count(
+ conn: &mut PgConnection,
+ verified_email_only: bool,
+ ) -> Result<i64, Error> {
+ let person_alias_1 = diesel::alias!(person as person1);
+
let mut query = registration_application::table
.inner_join(local_user::table.on(registration_application::local_user_id.eq(local_user::id)))
.inner_join(person::table.on(local_user::person_id.eq(person::id)))
.left_join(
- person_alias_1::table
- .on(registration_application::admin_id.eq(person_alias_1::id.nullable())),
+ person_alias_1
+ .on(registration_application::admin_id.eq(person_alias_1.field(person::id).nullable())),
)
.filter(registration_application::admin_id.is_null())
.into_boxed();
}
}
-pub struct RegistrationApplicationQueryBuilder<'a> {
- conn: &'a PgConnection,
+#[derive(TypedBuilder)]
+#[builder(field_defaults(default))]
+pub struct RegistrationApplicationQuery<'a> {
+ #[builder(!default)]
+ conn: &'a mut PgConnection,
unread_only: Option<bool>,
verified_email_only: Option<bool>,
page: Option<i64>,
limit: Option<i64>,
}
-impl<'a> RegistrationApplicationQueryBuilder<'a> {
- pub fn create(conn: &'a PgConnection) -> Self {
- RegistrationApplicationQueryBuilder {
- conn,
- unread_only: None,
- verified_email_only: None,
- page: None,
- limit: None,
- }
- }
-
- pub fn unread_only<T: MaybeOptional<bool>>(mut self, unread_only: T) -> Self {
- self.unread_only = unread_only.get_optional();
- self
- }
-
- pub fn verified_email_only<T: MaybeOptional<bool>>(mut self, verified_email_only: T) -> Self {
- self.verified_email_only = verified_email_only.get_optional();
- self
- }
-
- pub fn page<T: MaybeOptional<i64>>(mut self, page: T) -> Self {
- self.page = page.get_optional();
- self
- }
-
- pub fn limit<T: MaybeOptional<i64>>(mut self, limit: T) -> Self {
- self.limit = limit.get_optional();
- self
- }
-
+impl<'a> RegistrationApplicationQuery<'a> {
pub fn list(self) -> Result<Vec<RegistrationApplicationView>, Error> {
+ let person_alias_1 = diesel::alias!(person as person1);
+
let mut query = registration_application::table
.inner_join(local_user::table.on(registration_application::local_user_id.eq(local_user::id)))
.inner_join(person::table.on(local_user::person_id.eq(person::id)))
.left_join(
- person_alias_1::table
- .on(registration_application::admin_id.eq(person_alias_1::id.nullable())),
+ person_alias_1
+ .on(registration_application::admin_id.eq(person_alias_1.field(person::id).nullable())),
)
.order_by(registration_application::published.desc())
.select((
registration_application::all_columns,
LocalUser::safe_settings_columns_tuple(),
Person::safe_columns_tuple(),
- PersonAlias1::safe_columns_tuple().nullable(),
+ person_alias_1
+ .fields(Person::safe_columns_tuple())
+ .nullable(),
))
.into_boxed();
type DbTuple = RegistrationApplicationViewTuple;
fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
items
- .iter()
+ .into_iter()
.map(|a| Self {
- registration_application: a.0.to_owned(),
- creator_local_user: a.1.to_owned(),
- creator: a.2.to_owned(),
- admin: a.3.to_owned(),
+ registration_application: a.0,
+ creator_local_user: a.1,
+ creator: a.2,
+ admin: a.3,
})
.collect::<Vec<Self>>()
}
#[cfg(test)]
mod tests {
use crate::registration_application_view::{
- RegistrationApplicationQueryBuilder,
+ RegistrationApplicationQuery,
RegistrationApplicationView,
};
use lemmy_db_schema::{
#[test]
#[serial]
fn test_crud() {
- let conn = establish_unpooled_connection();
+ let conn = &mut establish_unpooled_connection();
let timmy_person_form = PersonForm {
name: "timmy_rav".into(),
admin: Some(true),
+ public_key: Some("pubkey".to_string()),
..PersonForm::default()
};
- let inserted_timmy_person = Person::create(&conn, &timmy_person_form).unwrap();
+ let inserted_timmy_person = Person::create(conn, &timmy_person_form).unwrap();
let timmy_local_user_form = LocalUserForm {
person_id: Some(inserted_timmy_person.id),
..LocalUserForm::default()
};
- let _inserted_timmy_local_user = LocalUser::create(&conn, &timmy_local_user_form).unwrap();
+ let _inserted_timmy_local_user = LocalUser::create(conn, &timmy_local_user_form).unwrap();
let sara_person_form = PersonForm {
name: "sara_rav".into(),
+ public_key: Some("pubkey".to_string()),
..PersonForm::default()
};
- let inserted_sara_person = Person::create(&conn, &sara_person_form).unwrap();
+ let inserted_sara_person = Person::create(conn, &sara_person_form).unwrap();
let sara_local_user_form = LocalUserForm {
person_id: Some(inserted_sara_person.id),
..LocalUserForm::default()
};
- let inserted_sara_local_user = LocalUser::create(&conn, &sara_local_user_form).unwrap();
+ let inserted_sara_local_user = LocalUser::create(conn, &sara_local_user_form).unwrap();
// Sara creates an application
let sara_app_form = RegistrationApplicationForm {
..RegistrationApplicationForm::default()
};
- let sara_app = RegistrationApplication::create(&conn, &sara_app_form).unwrap();
+ let sara_app = RegistrationApplication::create(conn, &sara_app_form).unwrap();
- let read_sara_app_view = RegistrationApplicationView::read(&conn, sara_app.id).unwrap();
+ let read_sara_app_view = RegistrationApplicationView::read(conn, sara_app.id).unwrap();
let jess_person_form = PersonForm {
name: "jess_rav".into(),
+ public_key: Some("pubkey".to_string()),
..PersonForm::default()
};
- let inserted_jess_person = Person::create(&conn, &jess_person_form).unwrap();
+ let inserted_jess_person = Person::create(conn, &jess_person_form).unwrap();
let jess_local_user_form = LocalUserForm {
person_id: Some(inserted_jess_person.id),
..LocalUserForm::default()
};
- let inserted_jess_local_user = LocalUser::create(&conn, &jess_local_user_form).unwrap();
+ let inserted_jess_local_user = LocalUser::create(conn, &jess_local_user_form).unwrap();
// Sara creates an application
let jess_app_form = RegistrationApplicationForm {
..RegistrationApplicationForm::default()
};
- let jess_app = RegistrationApplication::create(&conn, &jess_app_form).unwrap();
+ let jess_app = RegistrationApplication::create(conn, &jess_app_form).unwrap();
- let read_jess_app_view = RegistrationApplicationView::read(&conn, jess_app.id).unwrap();
+ let read_jess_app_view = RegistrationApplicationView::read(conn, jess_app.id).unwrap();
let mut expected_sara_app_view = RegistrationApplicationView {
registration_application: sara_app.to_owned(),
theme: inserted_sara_local_user.theme,
default_sort_type: inserted_sara_local_user.default_sort_type,
default_listing_type: inserted_sara_local_user.default_listing_type,
- lang: inserted_sara_local_user.lang,
+ interface_language: inserted_sara_local_user.interface_language,
show_avatars: inserted_sara_local_user.show_avatars,
send_notifications_to_email: inserted_sara_local_user.send_notifications_to_email,
validator_time: inserted_sara_local_user.validator_time,
assert_eq!(read_sara_app_view, expected_sara_app_view);
// Do a batch read of the applications
- let apps = RegistrationApplicationQueryBuilder::create(&conn)
- .unread_only(true)
+ let apps = RegistrationApplicationQuery::builder()
+ .conn(conn)
+ .unread_only(Some(true))
+ .build()
.list()
.unwrap();
);
// Make sure the counts are correct
- let unread_count = RegistrationApplicationView::get_unread_count(&conn, false).unwrap();
+ let unread_count = RegistrationApplicationView::get_unread_count(conn, false).unwrap();
assert_eq!(unread_count, 2);
// Approve the application
..RegistrationApplicationForm::default()
};
- RegistrationApplication::update(&conn, sara_app.id, &approve_form).unwrap();
+ RegistrationApplication::update(conn, sara_app.id, &approve_form).unwrap();
// Update the local_user row
let approve_local_user_form = LocalUserForm {
..LocalUserForm::default()
};
- LocalUser::update(&conn, inserted_sara_local_user.id, &approve_local_user_form).unwrap();
+ LocalUser::update(conn, inserted_sara_local_user.id, &approve_local_user_form).unwrap();
let read_sara_app_view_after_approve =
- RegistrationApplicationView::read(&conn, sara_app.id).unwrap();
+ RegistrationApplicationView::read(conn, sara_app.id).unwrap();
// Make sure the columns changed
expected_sara_app_view
.accepted_application = true;
expected_sara_app_view.registration_application.admin_id = Some(inserted_timmy_person.id);
- expected_sara_app_view.admin = Some(PersonSafeAlias1 {
+ expected_sara_app_view.admin = Some(PersonSafe {
id: inserted_timmy_person.id,
name: inserted_timmy_person.name.to_owned(),
display_name: None,
// Do a batch read of apps again
// It should show only jessicas which is unresolved
- let apps_after_resolve = RegistrationApplicationQueryBuilder::create(&conn)
- .unread_only(true)
+ let apps_after_resolve = RegistrationApplicationQuery::builder()
+ .conn(conn)
+ .unread_only(Some(true))
+ .build()
.list()
.unwrap();
assert_eq!(apps_after_resolve, vec![read_jess_app_view]);
// Make sure the counts are correct
let unread_count_after_approve =
- RegistrationApplicationView::get_unread_count(&conn, false).unwrap();
+ RegistrationApplicationView::get_unread_count(conn, false).unwrap();
assert_eq!(unread_count_after_approve, 1);
// Make sure the not undenied_only has all the apps
- let all_apps = RegistrationApplicationQueryBuilder::create(&conn)
+ let all_apps = RegistrationApplicationQuery::builder()
+ .conn(conn)
+ .build()
.list()
.unwrap();
assert_eq!(all_apps.len(), 2);
- Person::delete(&conn, inserted_timmy_person.id).unwrap();
- Person::delete(&conn, inserted_sara_person.id).unwrap();
- Person::delete(&conn, inserted_jess_person.id).unwrap();
+ Person::delete(conn, inserted_timmy_person.id).unwrap();
+ Person::delete(conn, inserted_sara_person.id).unwrap();
+ Person::delete(conn, inserted_jess_person.id).unwrap();
}
}
projects / lemmy.git / blobdiff