use crate::structs::PrivateMessageView;
-use diesel::{pg::Pg, result::Error, *};
+use diesel::{
+ debug_query,
+ pg::Pg,
+ result::Error,
+ BoolExpressionMethods,
+ ExpressionMethods,
+ JoinOnDsl,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
newtypes::{PersonId, PrivateMessageId},
schema::{person, private_message},
- source::{
- person::{Person, PersonSafe},
- private_message::PrivateMessage,
- },
- traits::{ToSafe, ViewToVec},
- utils::limit_and_offset,
+ 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 fn read(
- conn: &mut PgConnection,
- private_message_id: PrivateMessageId,
- ) -> Result<Self, Error> {
+ pub async fn read(pool: &DbPool, private_message_id: PrivateMessageId) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
let person_alias_1 = diesel::alias!(person as person1);
let (private_message, creator, recipient) = private_message::table
.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)?;
+ .first::<PrivateMessageViewTuple>(conn)
+ .await?;
Ok(PrivateMessageView {
private_message,
}
/// Gets the number of unread messages
- pub fn get_unread_messages(
- conn: &mut PgConnection,
- my_person_id: PersonId,
- ) -> Result<i64, Error> {
- use diesel::dsl::*;
+ pub async fn get_unread_messages(pool: &DbPool, my_person_id: PersonId) -> Result<i64, Error> {
+ use diesel::dsl::count;
+ let conn = &mut get_conn(pool).await?;
private_message::table
.filter(private_message::read.eq(false))
.filter(private_message::recipient_id.eq(my_person_id))
.filter(private_message::deleted.eq(false))
.select(count(private_message::id))
.first::<i64>(conn)
+ .await
}
}
#[builder(field_defaults(default))]
pub struct PrivateMessageQuery<'a> {
#[builder(!default)]
- conn: &'a mut PgConnection,
+ pool: &'a DbPool,
#[builder(!default)]
recipient_id: PersonId,
unread_only: Option<bool>,
}
impl<'a> PrivateMessageQuery<'a> {
- pub fn list(self) -> Result<Vec<PrivateMessageView>, Error> {
+ pub async fn list(self) -> Result<Vec<PrivateMessageView>, Error> {
+ let conn = &mut get_conn(self.pool).await?;
let person_alias_1 = diesel::alias!(person as person1);
let mut query = private_message::table
)
.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();
debug_query::<Pg, _>(&query)
);
- let res = query.load::<PrivateMessageViewTuple>(self.conn)?;
+ 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,
+ }
}
}