Cache & Optimize Woodpecker CI (#3450)

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

diff --git a/crates/db_views/src/private_message_report_view.rs b/crates/db_views/src/private_message_report_view.rs
index 647256ade25a04624ef8969fd8a41ba2a449e811..7ceca271abe63a5110b2b1af30a5a932e21b0a70 100644 (file)
--- a/crates/db_views/src/private_message_report_view.rs
+++ b/crates/db_views/src/private_message_report_view.rs
@@ -5,28 +5,30 @@ use lemmy_db_schema::{
   newtypes::PrivateMessageReportId,
   schema::{person, private_message, private_message_report},
   source::{
-    person::{Person, PersonSafe},
+    person::Person,
     private_message::PrivateMessage,
     private_message_report::PrivateMessageReport,
   },
-  traits::{ToSafe, ViewToVec},
+  traits::JoinView,
   utils::{get_conn, limit_and_offset, DbPool},
 };
-use typed_builder::TypedBuilder;
 
 type PrivateMessageReportViewTuple = (
   PrivateMessageReport,
   PrivateMessage,
-  PersonSafe,
-  PersonSafe,
-  Option<PersonSafe>,
+  Person,
+  Person,
+  Option<Person>,
 );
 
 impl PrivateMessageReportView {
   /// returns the PrivateMessageReportView for the provided report_id
   ///
   /// * `report_id` - the report id to obtain
-  pub async fn read(pool: &DbPool, report_id: PrivateMessageReportId) -> Result<Self, Error> {
+  pub async fn read(
+    pool: &mut DbPool<'_>,
+    report_id: PrivateMessageReportId,
+  ) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
     let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2);
 
@@ -47,11 +49,9 @@ impl PrivateMessageReportView {
         .select((
           private_message_report::all_columns,
           private_message::all_columns,
-          Person::safe_columns_tuple(),
-          person_alias_1.fields(Person::safe_columns_tuple()),
-          person_alias_2
-            .fields(Person::safe_columns_tuple())
-            .nullable(),
+          person::all_columns,
+          person_alias_1.fields(person::all_columns),
+          person_alias_2.fields(person::all_columns).nullable(),
         ))
         .first::<PrivateMessageReportViewTuple>(conn)
         .await?;
@@ -66,7 +66,7 @@ impl PrivateMessageReportView {
   }
 
   /// Returns the current unresolved post report count for the communities you mod
-  pub async fn get_report_count(pool: &DbPool) -> Result<i64, Error> {
+  pub async fn get_report_count(pool: &mut DbPool<'_>) -> Result<i64, Error> {
     use diesel::dsl::count;
     let conn = &mut get_conn(pool).await?;
 
@@ -80,19 +80,16 @@ impl PrivateMessageReportView {
   }
 }
 
-#[derive(TypedBuilder)]
-#[builder(field_defaults(default))]
-pub struct PrivateMessageReportQuery<'a> {
-  #[builder(!default)]
-  pool: &'a DbPool,
-  page: Option<i64>,
-  limit: Option<i64>,
-  unresolved_only: Option<bool>,
+#[derive(Default)]
+pub struct PrivateMessageReportQuery {
+  pub page: Option<i64>,
+  pub limit: Option<i64>,
+  pub unresolved_only: Option<bool>,
 }
 
-impl<'a> PrivateMessageReportQuery<'a> {
-  pub async fn list(self) -> Result<Vec<PrivateMessageReportView>, Error> {
-    let conn = &mut get_conn(self.pool).await?;
+impl PrivateMessageReportQuery {
+  pub async fn list(self, pool: &mut DbPool<'_>) -> Result<Vec<PrivateMessageReportView>, Error> {
+    let conn = &mut get_conn(pool).await?;
     let (person_alias_1, person_alias_2) = diesel::alias!(person as person1, person as person2);
 
     let mut query = private_message_report::table
@@ -108,15 +105,13 @@ impl<'a> PrivateMessageReportQuery<'a> {
       .select((
         private_message_report::all_columns,
         private_message::all_columns,
-        Person::safe_columns_tuple(),
-        person_alias_1.fields(Person::safe_columns_tuple()),
-        person_alias_2
-          .fields(Person::safe_columns_tuple())
-          .nullable(),
+        person::all_columns,
+        person_alias_1.fields(person::all_columns),
+        person_alias_2.fields(person::all_columns).nullable(),
       ))
       .into_boxed();
 
-    if self.unresolved_only.unwrap_or(true) {
+    if self.unresolved_only.unwrap_or(false) {
       query = query.filter(private_message_report::resolved.eq(false));
     }
 
@@ -129,28 +124,33 @@ impl<'a> PrivateMessageReportQuery<'a> {
 
     let res = query.load::<PrivateMessageReportViewTuple>(conn).await?;
 
-    Ok(PrivateMessageReportView::from_tuple_to_vec(res))
+    Ok(
+      res
+        .into_iter()
+        .map(PrivateMessageReportView::from_tuple)
+        .collect(),
+    )
   }
 }
 
-impl ViewToVec for PrivateMessageReportView {
-  type DbTuple = PrivateMessageReportViewTuple;
-  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
-    items
-      .into_iter()
-      .map(|a| Self {
-        private_message_report: a.0,
-        private_message: a.1,
-        private_message_creator: a.2,
-        creator: a.3,
-        resolver: a.4,
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for PrivateMessageReportView {
+  type JoinTuple = PrivateMessageReportViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      private_message_report: a.0,
+      private_message: a.1,
+      private_message_creator: a.2,
+      creator: a.3,
+      resolver: a.4,
+    }
   }
 }
 
 #[cfg(test)]
 mod tests {
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
   use crate::private_message_report_view::PrivateMessageReportQuery;
   use lemmy_db_schema::{
     source::{
@@ -168,6 +168,7 @@ mod tests {
   #[serial]
   async fn test_crud() {
     let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
 
     let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
       .await
@@ -206,10 +207,8 @@ mod tests {
       .await
       .unwrap();
 
-    let reports = PrivateMessageReportQuery::builder()
-      .pool(pool)
-      .build()
-      .list()
+    let reports = PrivateMessageReportQuery::default()
+      .list(pool)
       .await
       .unwrap();
     assert_eq!(1, reports.len());
@@ -231,13 +230,13 @@ mod tests {
       .await
       .unwrap();
 
-    let reports = PrivateMessageReportQuery::builder()
-      .pool(pool)
-      .unresolved_only(Some(false))
-      .build()
-      .list()
-      .await
-      .unwrap();
+    let reports = PrivateMessageReportQuery {
+      unresolved_only: (Some(false)),
+      ..Default::default()
+    }
+    .list(pool)
+    .await
+    .unwrap();
     assert_eq!(1, reports.len());
     assert!(reports[0].private_message_report.resolved);
     assert!(reports[0].resolver.is_some());