c9f1407429
* Initial commit to bump diesel to 2.0.0-rc.0 and see what happens * Add chrono feature from diesel * db_schema crate is close to building? * Upgrade diesel-derive-newtype * Mostly modifying references to connections to be mutable ones; also used new way to do migrations as suggested by the migration guide; a lot more compiles now, though I can't figure out this tricky ToSql issue at the moment * Running clippy --fix * Trying to fix drone clippy 1 * Fix clippy * Upgrade clux-musl * Trying to fix drone clippy 2 * Trying to fix drone clippy 3 * Trying to fix drone clippy 5 * Adding diesel table aliases, removing sql view hack. Fixes #2101 Co-authored-by: Steven Chu <stevenc1@gmail.com> Co-authored-by: Nutomic <me@nutomic.com>
137 lines
4 KiB
Rust
137 lines
4 KiB
Rust
use crate::structs::{LocalUserSettingsView, LocalUserView};
|
|
use diesel::{result::Error, *};
|
|
use lemmy_db_schema::{
|
|
aggregates::structs::PersonAggregates,
|
|
newtypes::{LocalUserId, PersonId},
|
|
schema::{local_user, person, person_aggregates},
|
|
source::{
|
|
local_user::{LocalUser, LocalUserSettings},
|
|
person::{Person, PersonSafe},
|
|
},
|
|
traits::{ToSafe, ToSafeSettings},
|
|
utils::functions::lower,
|
|
};
|
|
|
|
type LocalUserViewTuple = (LocalUser, Person, PersonAggregates);
|
|
|
|
impl LocalUserView {
|
|
pub fn read(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
|
|
let (local_user, person, counts) = local_user::table
|
|
.find(local_user_id)
|
|
.inner_join(person::table)
|
|
.inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
|
|
.select((
|
|
local_user::all_columns,
|
|
person::all_columns,
|
|
person_aggregates::all_columns,
|
|
))
|
|
.first::<LocalUserViewTuple>(conn)?;
|
|
Ok(Self {
|
|
local_user,
|
|
person,
|
|
counts,
|
|
})
|
|
}
|
|
|
|
pub fn read_person(conn: &mut PgConnection, person_id: PersonId) -> Result<Self, Error> {
|
|
let (local_user, person, counts) = local_user::table
|
|
.filter(person::id.eq(person_id))
|
|
.inner_join(person::table)
|
|
.inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
|
|
.select((
|
|
local_user::all_columns,
|
|
person::all_columns,
|
|
person_aggregates::all_columns,
|
|
))
|
|
.first::<LocalUserViewTuple>(conn)?;
|
|
Ok(Self {
|
|
local_user,
|
|
person,
|
|
counts,
|
|
})
|
|
}
|
|
|
|
// TODO check where this is used
|
|
pub fn read_from_name(conn: &mut PgConnection, name: &str) -> Result<Self, Error> {
|
|
let (local_user, person, counts) = local_user::table
|
|
.filter(person::name.eq(name))
|
|
.inner_join(person::table)
|
|
.inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
|
|
.select((
|
|
local_user::all_columns,
|
|
person::all_columns,
|
|
person_aggregates::all_columns,
|
|
))
|
|
.first::<LocalUserViewTuple>(conn)?;
|
|
Ok(Self {
|
|
local_user,
|
|
person,
|
|
counts,
|
|
})
|
|
}
|
|
|
|
pub fn find_by_email_or_name(
|
|
conn: &mut PgConnection,
|
|
name_or_email: &str,
|
|
) -> Result<Self, Error> {
|
|
let (local_user, person, counts) = local_user::table
|
|
.inner_join(person::table)
|
|
.inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
|
|
.filter(
|
|
lower(person::name)
|
|
.eq(lower(name_or_email))
|
|
.or(local_user::email.eq(name_or_email)),
|
|
)
|
|
.select((
|
|
local_user::all_columns,
|
|
person::all_columns,
|
|
person_aggregates::all_columns,
|
|
))
|
|
.first::<LocalUserViewTuple>(conn)?;
|
|
Ok(Self {
|
|
local_user,
|
|
person,
|
|
counts,
|
|
})
|
|
}
|
|
|
|
pub fn find_by_email(conn: &mut PgConnection, from_email: &str) -> Result<Self, Error> {
|
|
let (local_user, person, counts) = local_user::table
|
|
.inner_join(person::table)
|
|
.inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
|
|
.filter(local_user::email.eq(from_email))
|
|
.select((
|
|
local_user::all_columns,
|
|
person::all_columns,
|
|
person_aggregates::all_columns,
|
|
))
|
|
.first::<LocalUserViewTuple>(conn)?;
|
|
Ok(Self {
|
|
local_user,
|
|
person,
|
|
counts,
|
|
})
|
|
}
|
|
}
|
|
|
|
type LocalUserSettingsViewTuple = (LocalUserSettings, PersonSafe, PersonAggregates);
|
|
|
|
impl LocalUserSettingsView {
|
|
pub fn read(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
|
|
let (local_user, person, counts) = local_user::table
|
|
.find(local_user_id)
|
|
.inner_join(person::table)
|
|
.inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
|
|
.select((
|
|
LocalUser::safe_settings_columns_tuple(),
|
|
Person::safe_columns_tuple(),
|
|
person_aggregates::all_columns,
|
|
))
|
|
.first::<LocalUserSettingsViewTuple>(conn)?;
|
|
Ok(Self {
|
|
local_user,
|
|
person,
|
|
counts,
|
|
})
|
|
}
|
|
}
|