-use diesel::{result::Error, *};
+use crate::structs::CommunityPersonBanView;
+use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
newtypes::{CommunityId, PersonId},
schema::{community, community_person_ban, person},
- source::{
- community::{Community, CommunitySafe},
- person::{Person, PersonSafe},
- },
- traits::ToSafe,
+ source::{community::Community, person::Person},
+ utils::{get_conn, DbPool},
};
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct CommunityPersonBanView {
- pub community: CommunitySafe,
- pub person: PersonSafe,
-}
impl CommunityPersonBanView {
- pub fn get(
- conn: &PgConnection,
+ pub async fn get(
+ pool: &mut DbPool<'_>,
from_person_id: PersonId,
from_community_id: CommunityId,
) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
let (community, person) = community_person_ban::table
.inner_join(community::table)
.inner_join(person::table)
- .select((
- Community::safe_columns_tuple(),
- Person::safe_columns_tuple(),
- ))
+ .select((community::all_columns, person::all_columns))
.filter(community_person_ban::community_id.eq(from_community_id))
.filter(community_person_ban::person_id.eq(from_person_id))
.order_by(community_person_ban::published)
- .first::<(CommunitySafe, PersonSafe)>(conn)?;
+ .first::<(Community, Person)>(conn)
+ .await?;
Ok(CommunityPersonBanView { community, person })
}