Get rid of Safe Views, use serde_skip (#2767)

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

diff --git a/crates/db_views_moderator/src/mod_ban_from_community_view.rs b/crates/db_views_moderator/src/mod_ban_from_community_view.rs
index 2d16edb0422c6c03d945613745141b473133b72d..c7fb739560dfd2a3329a5860577e19842025418c 100644 (file)
--- a/crates/db_views_moderator/src/mod_ban_from_community_view.rs
+++ b/crates/db_views_moderator/src/mod_ban_from_community_view.rs
@@ -1,83 +1,85 @@
-use diesel::{result::Error, *};
-use lemmy_db_queries::{limit_and_offset, ToSafe, ViewToVec};
+use crate::structs::{ModBanFromCommunityView, ModlogListParams};
+use diesel::{
+  result::Error,
+  BoolExpressionMethods,
+  ExpressionMethods,
+  IntoSql,
+  JoinOnDsl,
+  NullableExpressionMethods,
+  QueryDsl,
+};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
-  schema::{community, mod_ban_from_community, person, person_alias_1},
-  source::{
-    community::{Community, CommunitySafe},
-    moderator::ModBanFromCommunity,
-    person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
-  },
+  newtypes::PersonId,
+  schema::{community, mod_ban_from_community, person},
+  source::{community::Community, moderator::ModBanFromCommunity, person::Person},
+  traits::JoinView,
+  utils::{get_conn, limit_and_offset, DbPool},
 };
-use serde::Serialize;
-
-#[derive(Debug, Serialize, Clone)]
-pub struct ModBanFromCommunityView {
-  pub mod_ban_from_community: ModBanFromCommunity,
-  pub moderator: PersonSafe,
-  pub community: CommunitySafe,
-  pub banned_person: PersonSafeAlias1,
-}
 
-type ModBanFromCommunityViewTuple = (
-  ModBanFromCommunity,
-  PersonSafe,
-  CommunitySafe,
-  PersonSafeAlias1,
-);
+type ModBanFromCommunityViewTuple = (ModBanFromCommunity, Option<Person>, Community, Person);
 
 impl ModBanFromCommunityView {
-  pub fn list(
-    conn: &PgConnection,
-    community_id: Option<i32>,
-    mod_person_id: Option<i32>,
-    page: Option<i64>,
-    limit: Option<i64>,
-  ) -> Result<Vec<Self>, Error> {
+  pub async fn list(pool: &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_from_community::mod_person_id
+      .eq(person::id)
+      .and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
     let mut query = mod_ban_from_community::table
-      .inner_join(person::table.on(mod_ban_from_community::mod_person_id.eq(person::id)))
+      .left_join(person::table.on(admin_names_join))
       .inner_join(community::table)
       .inner_join(
-        person_alias_1::table.on(mod_ban_from_community::other_person_id.eq(person_alias_1::id)),
+        person_alias_1
+          .on(mod_ban_from_community::other_person_id.eq(person_alias_1.field(person::id))),
       )
       .select((
         mod_ban_from_community::all_columns,
-        Person::safe_columns_tuple(),
-        Community::safe_columns_tuple(),
-        PersonAlias1::safe_columns_tuple(),
+        person::all_columns.nullable(),
+        community::all_columns,
+        person_alias_1.fields(person::all_columns),
       ))
       .into_boxed();
 
-    if let Some(mod_person_id) = mod_person_id {
+    if let Some(mod_person_id) = params.mod_person_id {
       query = query.filter(mod_ban_from_community::mod_person_id.eq(mod_person_id));
     };
 
-    if let Some(community_id) = community_id {
+    if let Some(community_id) = params.community_id {
       query = query.filter(mod_ban_from_community::community_id.eq(community_id));
     };
 
-    let (limit, offset) = limit_and_offset(page, limit);
+    if let Some(other_person_id) = params.other_person_id {
+      query = query.filter(mod_ban_from_community::other_person_id.eq(other_person_id));
+    };
+
+    let (limit, offset) = limit_and_offset(params.page, params.limit)?;
 
     let res = query
       .limit(limit)
       .offset(offset)
       .order_by(mod_ban_from_community::when_.desc())
-      .load::<ModBanFromCommunityViewTuple>(conn)?;
+      .load::<ModBanFromCommunityViewTuple>(conn)
+      .await?;
 
-    Ok(Self::from_tuple_to_vec(res))
+    let results = res.into_iter().map(Self::from_tuple).collect();
+    Ok(results)
   }
 }
 
-impl ViewToVec for ModBanFromCommunityView {
-  type DbTuple = ModBanFromCommunityViewTuple;
-  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
-    items
-      .iter()
-      .map(|a| Self {
-        mod_ban_from_community: a.0.to_owned(),
-        moderator: a.1.to_owned(),
-        community: a.2.to_owned(),
-        banned_person: a.3.to_owned(),
-      })
-      .collect::<Vec<Self>>()
+impl JoinView for ModBanFromCommunityView {
+  type JoinTuple = ModBanFromCommunityViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      mod_ban_from_community: a.0,
+      moderator: a.1,
+      community: a.2,
+      banned_person: a.3,
+    }
   }
 }