Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / db_views / src / private_message_view.rs

diff --git a/crates/db_views/src/private_message_view.rs b/crates/db_views/src/private_message_view.rs
index cfbc2dc992ef5b36a4340c0d2d8cfbcb6bbe4a5a..3d8fd42d0305028e2632fab65fe677e2fe5077d3 100644 (file)
--- a/crates/db_views/src/private_message_view.rs
+++ b/crates/db_views/src/private_message_view.rs
@@ -12,20 +12,20 @@ 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},
+  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> {
+  pub async fn read(
+    pool: &mut DbPool<'_>,
+    private_message_id: PrivateMessageId,
+  ) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
     let person_alias_1 = diesel::alias!(person as person1);
 
@@ -38,8 +38,8 @@ impl PrivateMessageView {
       .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?;
@@ -52,8 +52,11 @@ impl PrivateMessageView {
   }
 
   /// Gets the number of unread messages
-  pub async fn get_unread_messages(pool: &DbPool, my_person_id: PersonId) -> Result<i64, Error> {
-    use diesel::dsl::*;
+  pub async fn get_unread_messages(
+    pool: &mut 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))
@@ -67,9 +70,9 @@ impl PrivateMessageView {
 
 #[derive(TypedBuilder)]
 #[builder(field_defaults(default))]
-pub struct PrivateMessageQuery<'a> {
+pub struct PrivateMessageQuery<'a, 'b: 'a> {
   #[builder(!default)]
-  pool: &'a DbPool,
+  pool: &'a mut DbPool<'b>,
   #[builder(!default)]
   recipient_id: PersonId,
   unread_only: Option<bool>,
@@ -77,7 +80,7 @@ pub struct PrivateMessageQuery<'a> {
   limit: Option<i64>,
 }
 
-impl<'a> PrivateMessageQuery<'a> {
+impl<'a, 'b: 'a> PrivateMessageQuery<'a, 'b> {
   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);
@@ -89,8 +92,8 @@ impl<'a> PrivateMessageQuery<'a> {
       )
       .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();
 
@@ -124,20 +127,22 @@ impl<'a> PrivateMessageQuery<'a> {
 
     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,
+    }
   }
 }