Use same table join code for both read and list functions (#3663)

[lemmy.git] / crates / db_views_actor / src / person_view.rs

diff --git a/crates/db_views_actor/src/person_view.rs b/crates/db_views_actor/src/person_view.rs
index 908fbaab4328fb9489a78aaeada7fd83cd4ceba6..dd4edcaf0c5dec24ab318e15115a594e50428909 100644 (file)
--- a/crates/db_views_actor/src/person_view.rs
+++ b/crates/db_views_actor/src/person_view.rs
@@ -1,6 +1,7 @@
 use crate::structs::PersonView;
 use diesel::{
   dsl::now,
+  pg::Pg,
   result::Error,
   BoolExpressionMethods,
   ExpressionMethods,
@@ -15,23 +16,82 @@ use lemmy_db_schema::{
   schema::{person, person_aggregates},
   source::person::Person,
   traits::JoinView,
-  utils::{fuzzy_search, get_conn, limit_and_offset, DbPool},
+  utils::{fuzzy_search, get_conn, limit_and_offset, DbConn, DbPool, ListFn, Queries, ReadFn},
   PersonSortType,
 };
-use std::iter::Iterator;
 
 type PersonViewTuple = (Person, PersonAggregates);
 
-impl PersonView {
-  pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
-    let conn = &mut get_conn(pool).await?;
-    let res = person::table
-      .find(person_id)
+enum ListMode {
+  Admins,
+  Banned,
+  Query(PersonQuery),
+}
+
+fn queries<'a>(
+) -> Queries<impl ReadFn<'a, PersonView, PersonId>, impl ListFn<'a, PersonView, ListMode>> {
+  let all_joins = |query: person::BoxedQuery<'a, Pg>| {
+    query
       .inner_join(person_aggregates::table)
       .select((person::all_columns, person_aggregates::all_columns))
-      .first::<PersonViewTuple>(conn)
-      .await?;
-    Ok(Self::from_tuple(res))
+  };
+
+  let read = move |mut conn: DbConn<'a>, person_id: PersonId| async move {
+    all_joins(person::table.find(person_id).into_boxed())
+      .first::<PersonViewTuple>(&mut conn)
+      .await
+  };
+
+  let list = move |mut conn: DbConn<'a>, mode: ListMode| async move {
+    let mut query = all_joins(person::table.into_boxed());
+    match mode {
+      ListMode::Admins => {
+        query = query
+          .filter(person::admin.eq(true))
+          .filter(person::deleted.eq(false))
+          .order_by(person::published);
+      }
+      ListMode::Banned => {
+        query = query
+          .filter(
+            person::banned.eq(true).and(
+              person::ban_expires
+                .is_null()
+                .or(person::ban_expires.gt(now)),
+            ),
+          )
+          .filter(person::deleted.eq(false));
+      }
+      ListMode::Query(options) => {
+        if let Some(search_term) = options.search_term {
+          let searcher = fuzzy_search(&search_term);
+          query = query
+            .filter(person::name.ilike(searcher.clone()))
+            .or_filter(person::display_name.ilike(searcher));
+        }
+
+        query = match options.sort.unwrap_or(PersonSortType::CommentScore) {
+          PersonSortType::New => query.order_by(person::published.desc()),
+          PersonSortType::Old => query.order_by(person::published.asc()),
+          PersonSortType::MostComments => query.order_by(person_aggregates::comment_count.desc()),
+          PersonSortType::CommentScore => query.order_by(person_aggregates::comment_score.desc()),
+          PersonSortType::PostScore => query.order_by(person_aggregates::post_score.desc()),
+          PersonSortType::PostCount => query.order_by(person_aggregates::post_count.desc()),
+        };
+
+        let (limit, offset) = limit_and_offset(options.page, options.limit)?;
+        query = query.limit(limit).offset(offset);
+      }
+    }
+    query.load::<PersonViewTuple>(&mut conn).await
+  };
+
+  Queries::new(read, list)
+}
+
+impl PersonView {
+  pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
+    queries().read(pool, person_id).await
   }
 
   pub async fn is_admin(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<bool, Error> {
@@ -44,37 +104,13 @@ impl PersonView {
       .await?;
     Ok(is_admin)
   }
-  pub async fn admins(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
-    let conn = &mut get_conn(pool).await?;
-    let admins = person::table
-      .inner_join(person_aggregates::table)
-      .select((person::all_columns, person_aggregates::all_columns))
-      .filter(person::admin.eq(true))
-      .filter(person::deleted.eq(false))
-      .order_by(person::published)
-      .load::<PersonViewTuple>(conn)
-      .await?;
 
-    Ok(admins.into_iter().map(Self::from_tuple).collect())
+  pub async fn admins(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
+    queries().list(pool, ListMode::Admins).await
   }
 
   pub async fn banned(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
-    let conn = &mut get_conn(pool).await?;
-    let banned = person::table
-      .inner_join(person_aggregates::table)
-      .select((person::all_columns, person_aggregates::all_columns))
-      .filter(
-        person::banned.eq(true).and(
-          person::ban_expires
-            .is_null()
-            .or(person::ban_expires.gt(now)),
-        ),
-      )
-      .filter(person::deleted.eq(false))
-      .load::<PersonViewTuple>(conn)
-      .await?;
-
-    Ok(banned.into_iter().map(Self::from_tuple).collect())
+    queries().list(pool, ListMode::Banned).await
   }
 }
 
@@ -88,34 +124,7 @@ pub struct PersonQuery {
 
 impl PersonQuery {
   pub async fn list(self, pool: &mut DbPool<'_>) -> Result<Vec<PersonView>, Error> {
-    let conn = &mut get_conn(pool).await?;
-    let mut query = person::table
-      .inner_join(person_aggregates::table)
-      .select((person::all_columns, person_aggregates::all_columns))
-      .into_boxed();
-
-    if let Some(search_term) = self.search_term {
-      let searcher = fuzzy_search(&search_term);
-      query = query
-        .filter(person::name.ilike(searcher.clone()))
-        .or_filter(person::display_name.ilike(searcher));
-    }
-
-    query = match self.sort.unwrap_or(PersonSortType::CommentScore) {
-      PersonSortType::New => query.order_by(person::published.desc()),
-      PersonSortType::Old => query.order_by(person::published.asc()),
-      PersonSortType::MostComments => query.order_by(person_aggregates::comment_count.desc()),
-      PersonSortType::CommentScore => query.order_by(person_aggregates::comment_score.desc()),
-      PersonSortType::PostScore => query.order_by(person_aggregates::post_score.desc()),
-      PersonSortType::PostCount => query.order_by(person_aggregates::post_count.desc()),
-    };
-
-    let (limit, offset) = limit_and_offset(self.page, self.limit)?;
-    query = query.limit(limit).offset(offset);
-
-    let res = query.load::<PersonViewTuple>(conn).await?;
-
-    Ok(res.into_iter().map(PersonView::from_tuple).collect())
+    queries().list(pool, ListMode::Query(self)).await
   }
 }