-use diesel::{pg::Pg, result::Error, *};
-use lemmy_db_queries::{limit_and_offset, MaybeOptional, ToSafe, ViewToVec};
+use crate::structs::PrivateMessageView;
+use diesel::{
+ debug_query,
+ pg::Pg,
+ result::Error,
+ BoolExpressionMethods,
+ ExpressionMethods,
+ JoinOnDsl,
+ QueryDsl,
+};
+use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
- schema::{person, person_alias_1, private_message},
- source::{
- person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
- private_message::PrivateMessage,
- },
- PersonId,
- PrivateMessageId,
+ newtypes::{PersonId, PrivateMessageId},
+ schema::{person, private_message},
+ source::{person::Person, private_message::PrivateMessage},
+ traits::JoinView,
+ utils::{get_conn, limit_and_offset, DbPool},
};
-use log::debug;
-use serde::Serialize;
-
-#[derive(Debug, PartialEq, Serialize, Clone)]
-pub struct PrivateMessageView {
- pub private_message: PrivateMessage,
- pub creator: PersonSafe,
- pub recipient: PersonSafeAlias1,
-}
+use tracing::debug;
+use typed_builder::TypedBuilder;
-type PrivateMessageViewTuple = (PrivateMessage, PersonSafe, PersonSafeAlias1);
+type PrivateMessageViewTuple = (PrivateMessage, Person, Person);
impl PrivateMessageView {
- pub fn read(conn: &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
.find(private_message_id)
.inner_join(person::table.on(private_message::creator_id.eq(person::id)))
- .inner_join(person_alias_1::table.on(private_message::recipient_id.eq(person_alias_1::id)))
+ .inner_join(
+ person_alias_1.on(private_message::recipient_id.eq(person_alias_1.field(person::id))),
+ )
.order_by(private_message::published.desc())
.select((
private_message::all_columns,
- Person::safe_columns_tuple(),
- PersonAlias1::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: &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
}
}
-pub struct PrivateMessageQueryBuilder<'a> {
- conn: &'a PgConnection,
+#[derive(TypedBuilder)]
+#[builder(field_defaults(default))]
+pub struct PrivateMessageQuery<'a> {
+ #[builder(!default)]
+ pool: &'a DbPool,
+ #[builder(!default)]
recipient_id: PersonId,
unread_only: Option<bool>,
page: Option<i64>,
limit: Option<i64>,
}
-impl<'a> PrivateMessageQueryBuilder<'a> {
- pub fn create(conn: &'a PgConnection, recipient_id: PersonId) -> Self {
- PrivateMessageQueryBuilder {
- conn,
- recipient_id,
- unread_only: None,
- page: None,
- limit: None,
- }
- }
+impl<'a> PrivateMessageQuery<'a> {
+ 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);
- pub fn unread_only<T: MaybeOptional<bool>>(mut self, unread_only: T) -> Self {
- self.unread_only = unread_only.get_optional();
- self
- }
-
- pub fn page<T: MaybeOptional<i64>>(mut self, page: T) -> Self {
- self.page = page.get_optional();
- self
- }
-
- pub fn limit<T: MaybeOptional<i64>>(mut self, limit: T) -> Self {
- self.limit = limit.get_optional();
- self
- }
-
- pub fn list(self) -> Result<Vec<PrivateMessageView>, Error> {
let mut query = private_message::table
.inner_join(person::table.on(private_message::creator_id.eq(person::id)))
- .inner_join(person_alias_1::table.on(private_message::recipient_id.eq(person_alias_1::id)))
+ .inner_join(
+ person_alias_1.on(private_message::recipient_id.eq(person_alias_1.field(person::id))),
+ )
.select((
private_message::all_columns,
- Person::safe_columns_tuple(),
- PersonAlias1::safe_columns_tuple(),
+ person::all_columns,
+ person_alias_1.fields(person::all_columns),
))
.into_boxed();
)
}
- let (limit, offset) = limit_and_offset(self.page, self.limit);
+ let (limit, offset) = limit_and_offset(self.page, self.limit)?;
query = query
.filter(private_message::deleted.eq(false))
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
- .iter()
- .map(|a| Self {
- private_message: a.0.to_owned(),
- creator: a.1.to_owned(),
- recipient: a.2.to_owned(),
- })
- .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,
+ }
}
}