Hide deleted user accounts, add tests for PersonView (fixes #3811) (#4070)

* Hide deleted user accounts, add tests for PersonView (fixes #3811)

* clippy

Cargo.lock

@@ -2809,8 +2809,10 @@ dependencies = [
  "lemmy_db_schema",
  "serde",
  "serde_with",
+ "serial_test",
  "strum",
  "strum_macros",
+ "tokio",
  "ts-rs",
 ]
 

crates/db_views_actor/Cargo.toml

@@ -31,3 +31,7 @@ ts-rs = { workspace = true, optional = true }
 chrono.workspace = true
 strum = { workspace = true }
 strum_macros = { workspace = true }
+
+[dev-dependencies]
+serial_test = { workspace = true }
+tokio = { workspace = true }

crates/db_views_actor/src/person_view.rs

@@ -52,6 +52,7 @@ fn queries<'a>(
     query
       .inner_join(person_aggregates::table)
       .left_join(local_user::table)
+      .filter(person::deleted.eq(false))
       .select((person::all_columns, person_aggregates::all_columns))
   };
 
@@ -151,3 +152,165 @@ impl PersonQuery {
     queries().list(pool, ListMode::Query(self)).await
   }
 }
+
+#[cfg(test)]
+mod tests {
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
+  use super::*;
+  use diesel::NotFound;
+  use lemmy_db_schema::{
+    source::{
+      instance::Instance,
+      local_user::{LocalUser, LocalUserInsertForm, LocalUserUpdateForm},
+      person::{Person, PersonInsertForm, PersonUpdateForm},
+    },
+    traits::Crud,
+    utils::build_db_pool_for_tests,
+  };
+  use serial_test::serial;
+
+  struct Data {
+    alice: Person,
+    alice_local_user: LocalUser,
+    bob: Person,
+    bob_local_user: LocalUser,
+  }
+
+  async fn init_data(pool: &mut DbPool<'_>) -> Data {
+    let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+      .await
+      .unwrap();
+
+    let alice_form = PersonInsertForm::builder()
+      .name("alice".to_string())
+      .public_key("pubkey".to_string())
+      .instance_id(inserted_instance.id)
+      .build();
+    let alice = Person::create(pool, &alice_form).await.unwrap();
+    let alice_local_user_form = LocalUserInsertForm::builder()
+      .person_id(alice.id)
+      .password_encrypted(String::new())
+      .build();
+    let alice_local_user = LocalUser::create(pool, &alice_local_user_form)
+      .await
+      .unwrap();
+
+    let bob_form = PersonInsertForm::builder()
+      .name("bob".to_string())
+      .bot_account(Some(true))
+      .public_key("pubkey".to_string())
+      .instance_id(inserted_instance.id)
+      .build();
+    let bob = Person::create(pool, &bob_form).await.unwrap();
+    let bob_local_user_form = LocalUserInsertForm::builder()
+      .person_id(bob.id)
+      .password_encrypted(String::new())
+      .build();
+    let bob_local_user = LocalUser::create(pool, &bob_local_user_form).await.unwrap();
+
+    Data {
+      alice,
+      alice_local_user,
+      bob,
+      bob_local_user,
+    }
+  }
+
+  async fn cleanup(data: Data, pool: &mut DbPool<'_>) {
+    LocalUser::delete(pool, data.alice_local_user.id)
+      .await
+      .unwrap();
+    LocalUser::delete(pool, data.bob_local_user.id)
+      .await
+      .unwrap();
+    Person::delete(pool, data.alice.id).await.unwrap();
+    Person::delete(pool, data.bob.id).await.unwrap();
+    Instance::delete(pool, data.bob.instance_id).await.unwrap();
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn exclude_deleted() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
+    let data = init_data(pool).await;
+
+    Person::update(
+      pool,
+      data.alice.id,
+      &PersonUpdateForm {
+        deleted: Some(true),
+        ..Default::default()
+      },
+    )
+    .await
+    .unwrap();
+
+    let read = PersonView::read(pool, data.alice.id).await;
+    assert_eq!(read.err(), Some(NotFound));
+
+    let list = PersonQuery::default().list(pool).await.unwrap();
+    assert_eq!(list.len(), 1);
+    assert_eq!(list[0].person.id, data.bob.id);
+
+    cleanup(data, pool).await;
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn list_banned() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
+    let data = init_data(pool).await;
+
+    Person::update(
+      pool,
+      data.alice.id,
+      &PersonUpdateForm {
+        banned: Some(true),
+        ..Default::default()
+      },
+    )
+    .await
+    .unwrap();
+
+    let list = PersonView::banned(pool).await.unwrap();
+    assert_eq!(list.len(), 1);
+    assert_eq!(list[0].person.id, data.alice.id);
+
+    cleanup(data, pool).await;
+  }
+
+  #[tokio::test]
+  #[serial]
+  async fn list_admins() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
+    let data = init_data(pool).await;
+
+    LocalUser::update(
+      pool,
+      data.alice_local_user.id,
+      &LocalUserUpdateForm {
+        admin: Some(true),
+        ..Default::default()
+      },
+    )
+    .await
+    .unwrap();
+
+    let list = PersonView::admins(pool).await.unwrap();
+    assert_eq!(list.len(), 1);
+    assert_eq!(list[0].person.id, data.alice.id);
+
+    let is_admin = PersonView::is_admin(pool, data.alice.id).await.unwrap();
+    assert!(is_admin);
+
+    let is_admin = PersonView::is_admin(pool, data.bob.id).await.unwrap();
+    assert!(!is_admin);
+
+    cleanup(data, pool).await;
+  }
+}