use crate::structs::PersonBlockView;
-use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
newtypes::PersonId,
schema::{person, person_block},
- source::person::{Person, PersonSafe},
- traits::{ToSafe, ViewToVec},
+ source::person::Person,
+ traits::JoinView,
utils::{get_conn, DbPool},
};
-type PersonBlockViewTuple = (PersonSafe, PersonSafe);
+type PersonBlockViewTuple = (Person, Person);
impl PersonBlockView {
pub async fn for_person(pool: &DbPool, person_id: PersonId) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
- let person_alias_1 = diesel::alias!(person as person1);
+ let target_person_alias = diesel::alias!(person as person1);
let res = person_block::table
- .inner_join(person::table)
- .inner_join(person_alias_1)
+ .inner_join(person::table.on(person_block::person_id.eq(person::id)))
+ .inner_join(
+ target_person_alias.on(person_block::target_id.eq(target_person_alias.field(person::id))),
+ )
.select((
- Person::safe_columns_tuple(),
- person_alias_1.fields(Person::safe_columns_tuple()),
+ person::all_columns,
+ target_person_alias.fields(person::all_columns),
))
.filter(person_block::person_id.eq(person_id))
- .filter(person_alias_1.field(person::deleted).eq(false))
+ .filter(target_person_alias.field(person::deleted).eq(false))
.order_by(person_block::published)
.load::<PersonBlockViewTuple>(conn)
.await?;
- Ok(Self::from_tuple_to_vec(res))
+ Ok(res.into_iter().map(Self::from_tuple).collect())
}
}
-impl ViewToVec for PersonBlockView {
- type DbTuple = PersonBlockViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .into_iter()
- .map(|a| Self {
- person: a.0,
- target: a.1,
- })
- .collect::<Vec<Self>>()
+impl JoinView for PersonBlockView {
+ type JoinTuple = PersonBlockViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ person: a.0,
+ target: a.1,
+ }
}
}