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

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

diff --git a/crates/db_views_moderator/src/mod_ban_view.rs b/crates/db_views_moderator/src/mod_ban_view.rs
index 1a7743194881ef83b69034f56d5394d23d7d2122..835804e6739915a1d7d0e040d6c43b0ed3613178 100644 (file)
--- a/crates/db_views_moderator/src/mod_ban_view.rs
+++ b/crates/db_views_moderator/src/mod_ban_view.rs
@@ -1,66 +1,74 @@
-use diesel::{result::Error, *};
-use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
+use crate::structs::{ModBanView, ModlogListParams};
+use diesel::{
+  result::Error,
+  BoolExpressionMethods,
+  ExpressionMethods,
+  IntoSql,
+  JoinOnDsl,
+  NullableExpressionMethods,
+  QueryDsl,
+};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
-  schema::{mod_ban, user_, user_alias_1},
-  source::{
-    moderator::ModBan,
-    user::{UserAlias1, UserSafe, UserSafeAlias1, User_},
-  },
+  newtypes::PersonId,
+  schema::{mod_ban, person},
+  source::{moderator::ModBan, person::Person},
+  traits::JoinView,
+  utils::{get_conn, limit_and_offset, DbPool},
 };
-use serde::Serialize;
-
-#[derive(Debug, Serialize, Clone)]
-pub struct ModBanView {
-  pub mod_ban: ModBan,
-  pub moderator: UserSafe,
-  pub banned_user: UserSafeAlias1,
-}
 
-type ModBanViewTuple = (ModBan, UserSafe, UserSafeAlias1);
+type ModBanViewTuple = (ModBan, Option<Person>, Person);
 
 impl ModBanView {
-  pub fn list(
-    conn: &PgConnection,
-    mod_user_id: Option<i32>,
-    page: Option<i64>,
-    limit: Option<i64>,
-  ) -> 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>();
+
+    let admin_names_join = mod_ban::mod_person_id
+      .eq(person::id)
+      .and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
     let mut query = mod_ban::table
-      .inner_join(user_::table.on(mod_ban::mod_user_id.eq(user_::id)))
-      .inner_join(user_alias_1::table.on(mod_ban::other_user_id.eq(user_::id)))
+      .left_join(person::table.on(admin_names_join))
+      .inner_join(person_alias_1.on(mod_ban::other_person_id.eq(person_alias_1.field(person::id))))
       .select((
         mod_ban::all_columns,
-        User_::safe_columns_tuple(),
-        UserAlias1::safe_columns_tuple(),
+        person::all_columns.nullable(),
+        person_alias_1.fields(person::all_columns),
       ))
       .into_boxed();
 
-    if let Some(mod_user_id) = mod_user_id {
-      query = query.filter(mod_ban::mod_user_id.eq(mod_user_id));
+    if let Some(mod_person_id) = params.mod_person_id {
+      query = query.filter(mod_ban::mod_person_id.eq(mod_person_id));
+    };
+
+    if let Some(other_person_id) = params.other_person_id {
+      query = query.filter(person_alias_1.field(person::id).eq(other_person_id));
     };
 
-    let (limit, offset) = limit_and_offset(page, limit);
+    let (limit, offset) = limit_and_offset(params.page, params.limit)?;
 
     let res = query
       .limit(limit)
       .offset(offset)
       .order_by(mod_ban::when_.desc())
-      .load::<ModBanViewTuple>(conn)?;
+      .load::<ModBanViewTuple>(conn)
+      .await?;
 
-    Ok(Self::from_tuple_to_vec(res))
+    let results = res.into_iter().map(Self::from_tuple).collect();
+    Ok(results)
   }
 }
 
-impl ViewToVec for ModBanView {
-  type DbTuple = ModBanViewTuple;
-  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
-    items
-      .iter()
-      .map(|a| Self {
-        mod_ban: a.0.to_owned(),
-        moderator: a.1.to_owned(),
-        banned_user: a.2.to_owned(),
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for ModBanView {
+  type JoinTuple = ModBanViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      mod_ban: a.0,
+      moderator: a.1,
+      banned_person: a.2,
+    }
   }
 }