+use crate::structs::PersonBlockView;
use diesel::{result::Error, *};
-use lemmy_db_queries::{ToSafe, ViewToVec};
use lemmy_db_schema::{
- schema::{person, person_alias_1, person_block},
- source::person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
- PersonId,
+ newtypes::PersonId,
+ schema::{person, person_block},
+ source::person::{Person, PersonSafe},
+ traits::{ToSafe, ViewToVec},
};
-use serde::{Deserialize, Serialize};
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct PersonBlockView {
- pub person: PersonSafe,
- pub target: PersonSafeAlias1,
-}
-
-type PersonBlockViewTuple = (PersonSafe, PersonSafeAlias1);
+type PersonBlockViewTuple = (PersonSafe, PersonSafe);
impl PersonBlockView {
- pub fn for_person(conn: &PgConnection, person_id: PersonId) -> Result<Vec<Self>, Error> {
+ pub fn for_person(conn: &mut PgConnection, person_id: PersonId) -> Result<Vec<Self>, Error> {
+ let person_alias_1 = diesel::alias!(person as person1);
+
let res = person_block::table
.inner_join(person::table)
- .inner_join(person_alias_1::table) // TODO I dont know if this will be smart abt the column
+ .inner_join(person_alias_1)
.select((
Person::safe_columns_tuple(),
- PersonAlias1::safe_columns_tuple(),
+ person_alias_1.fields(Person::safe_columns_tuple()),
))
.filter(person_block::person_id.eq(person_id))
.order_by(person_block::published)
type DbTuple = PersonBlockViewTuple;
fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
items
- .iter()
+ .into_iter()
.map(|a| Self {
- person: a.0.to_owned(),
- target: a.1.to_owned(),
+ person: a.0,
+ target: a.1,
})
.collect::<Vec<Self>>()
}