use lemmy_db_schema::{
newtypes::{PersonId, PrivateMessageId},
schema::{person, private_message},
- source::{
- person::{Person, PersonSafe},
- private_message::PrivateMessage,
- },
- traits::{ToSafe, ViewToVec},
+ source::{person::Person, private_message::PrivateMessage},
+ traits::JoinView,
utils::{get_conn, limit_and_offset, DbPool},
};
use tracing::debug;
use typed_builder::TypedBuilder;
-type PrivateMessageViewTuple = (PrivateMessage, PersonSafe, PersonSafe);
+type PrivateMessageViewTuple = (PrivateMessage, Person, Person);
impl PrivateMessageView {
pub async fn read(pool: &DbPool, private_message_id: PrivateMessageId) -> Result<Self, Error> {
.order_by(private_message::published.desc())
.select((
private_message::all_columns,
- Person::safe_columns_tuple(),
- person_alias_1.fields(Person::safe_columns_tuple()),
+ person::all_columns,
+ person_alias_1.fields(person::all_columns),
))
.first::<PrivateMessageViewTuple>(conn)
.await?;
/// Gets the number of unread messages
pub async fn get_unread_messages(pool: &DbPool, my_person_id: PersonId) -> Result<i64, Error> {
- use diesel::dsl::*;
+ use diesel::dsl::count;
let conn = &mut get_conn(pool).await?;
private_message::table
.filter(private_message::read.eq(false))
)
.select((
private_message::all_columns,
- Person::safe_columns_tuple(),
- person_alias_1.fields(Person::safe_columns_tuple()),
+ person::all_columns,
+ person_alias_1.fields(person::all_columns),
))
.into_boxed();
let res = query.load::<PrivateMessageViewTuple>(conn).await?;
- Ok(PrivateMessageView::from_tuple_to_vec(res))
+ Ok(
+ res
+ .into_iter()
+ .map(PrivateMessageView::from_tuple)
+ .collect(),
+ )
}
}
-impl ViewToVec for PrivateMessageView {
- type DbTuple = PrivateMessageViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .into_iter()
- .map(|a| Self {
- private_message: a.0,
- creator: a.1,
- recipient: a.2,
- })
- .collect::<Vec<Self>>()
+impl JoinView for PrivateMessageView {
+ type JoinTuple = PrivateMessageViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ private_message: a.0,
+ creator: a.1,
+ recipient: a.2,
+ }
}
}