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

[lemmy.git] / crates / db_views_moderator / src / mod_add_view.rs

diff --git a/crates/db_views_moderator/src/mod_add_view.rs b/crates/db_views_moderator/src/mod_add_view.rs
index fe9afea5ee4b051928ffd0ae04250ccf3587e121..7094db1238ae57f50bc874eaf04582d69f5d528e 100644 (file)
--- a/crates/db_views_moderator/src/mod_add_view.rs
+++ b/crates/db_views_moderator/src/mod_add_view.rs
@@ -1,20 +1,28 @@
 use crate::structs::{ModAddView, ModlogListParams};
-use diesel::{result::Error, *};
+use diesel::{
+  result::Error,
+  BoolExpressionMethods,
+  ExpressionMethods,
+  IntoSql,
+  JoinOnDsl,
+  NullableExpressionMethods,
+  QueryDsl,
+};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
   newtypes::PersonId,
-  schema::{mod_add, person, person_alias_1},
-  source::{
-    moderator::ModAdd,
-    person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
-  },
-  traits::{ToSafe, ViewToVec},
-  utils::limit_and_offset,
+  schema::{mod_add, person},
+  source::{moderator::ModAdd, person::Person},
+  traits::JoinView,
+  utils::{get_conn, limit_and_offset, DbPool},
 };
 
-type ModAddViewTuple = (ModAdd, Option<PersonSafe>, PersonSafeAlias1);
+type ModAddViewTuple = (ModAdd, Option<Person>, Person);
 
 impl ModAddView {
-  pub fn list(conn: &PgConnection, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+  pub async fn list(pool: &mut DbPool<'_>, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
+    let person_alias_1 = diesel::alias!(person as person1);
     let admin_person_id_join = params.mod_person_id.unwrap_or(PersonId(-1));
     let show_mod_names = !params.hide_modlog_names;
     let show_mod_names_expr = show_mod_names.as_sql::<diesel::sql_types::Bool>();
@@ -24,11 +32,11 @@ impl ModAddView {
       .and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
     let mut query = mod_add::table
       .left_join(person::table.on(admin_names_join))
-      .inner_join(person_alias_1::table.on(mod_add::other_person_id.eq(person_alias_1::id)))
+      .inner_join(person_alias_1.on(mod_add::other_person_id.eq(person_alias_1.field(person::id))))
       .select((
         mod_add::all_columns,
-        Person::safe_columns_tuple().nullable(),
-        PersonAlias1::safe_columns_tuple(),
+        person::all_columns.nullable(),
+        person_alias_1.fields(person::all_columns),
       ))
       .into_boxed();
 
@@ -37,7 +45,7 @@ impl ModAddView {
     };
 
     if let Some(other_person_id) = params.other_person_id {
-      query = query.filter(person_alias_1::id.eq(other_person_id));
+      query = query.filter(person_alias_1.field(person::id).eq(other_person_id));
     };
 
     let (limit, offset) = limit_and_offset(params.page, params.limit)?;
@@ -46,23 +54,21 @@ impl ModAddView {
       .limit(limit)
       .offset(offset)
       .order_by(mod_add::when_.desc())
-      .load::<ModAddViewTuple>(conn)?;
+      .load::<ModAddViewTuple>(conn)
+      .await?;
 
-    let results = Self::from_tuple_to_vec(res);
+    let results = res.into_iter().map(Self::from_tuple).collect();
     Ok(results)
   }
 }
 
-impl ViewToVec for ModAddView {
-  type DbTuple = ModAddViewTuple;
-  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
-    items
-      .into_iter()
-      .map(|a| Self {
-        mod_add: a.0,
-        moderator: a.1,
-        modded_person: a.2,
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for ModAddView {
+  type JoinTuple = ModAddViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      mod_add: a.0,
+      moderator: a.1,
+      modded_person: a.2,
+    }
   }
 }