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

[lemmy.git] / crates / db_views / src / local_user_view.rs

diff --git a/crates/db_views/src/local_user_view.rs b/crates/db_views/src/local_user_view.rs
index 0e4d872ac60c82f49169e90bf1dec3a1ea428191..567ca3feb336e267bd675c6d179ab3480db6c2d6 100644 (file)
--- a/crates/db_views/src/local_user_view.rs
+++ b/crates/db_views/src/local_user_view.rs
@@ -1,27 +1,21 @@
-use diesel::{result::Error, *};
-use lemmy_db_queries::{aggregates::person_aggregates::PersonAggregates, ToSafe, ToSafeSettings};
+use crate::structs::LocalUserView;
+use diesel::{result::Error, BoolExpressionMethods, ExpressionMethods, JoinOnDsl, QueryDsl};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
+  aggregates::structs::PersonAggregates,
+  newtypes::{LocalUserId, PersonId},
   schema::{local_user, person, person_aggregates},
-  source::{
-    local_user::{LocalUser, LocalUserSettings},
-    person::{Person, PersonSafe},
-  },
-  LocalUserId,
-  PersonId,
+  source::{local_user::LocalUser, person::Person},
+  traits::JoinView,
+  utils::{functions::lower, get_conn, DbPool},
 };
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct LocalUserView {
-  pub local_user: LocalUser,
-  pub person: Person,
-  pub counts: PersonAggregates,
-}
 
 type LocalUserViewTuple = (LocalUser, Person, PersonAggregates);
 
 impl LocalUserView {
-  pub fn read(conn: &PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, local_user_id: LocalUserId) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
+
     let (local_user, person, counts) = local_user::table
       .find(local_user_id)
       .inner_join(person::table)
@@ -31,7 +25,8 @@ impl LocalUserView {
         person::all_columns,
         person_aggregates::all_columns,
       ))
-      .first::<LocalUserViewTuple>(conn)?;
+      .first::<LocalUserViewTuple>(conn)
+      .await?;
     Ok(Self {
       local_user,
       person,
@@ -39,7 +34,8 @@ impl LocalUserView {
     })
   }
 
-  pub fn read_person(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
+  pub async fn read_person(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
     let (local_user, person, counts) = local_user::table
       .filter(person::id.eq(person_id))
       .inner_join(person::table)
@@ -49,7 +45,8 @@ impl LocalUserView {
         person::all_columns,
         person_aggregates::all_columns,
       ))
-      .first::<LocalUserViewTuple>(conn)?;
+      .first::<LocalUserViewTuple>(conn)
+      .await?;
     Ok(Self {
       local_user,
       person,
@@ -57,10 +54,10 @@ impl LocalUserView {
     })
   }
 
-  // TODO check where this is used
-  pub fn read_from_name(conn: &PgConnection, name: &str) -> Result<Self, Error> {
+  pub async fn read_from_name(pool: &mut DbPool<'_>, name: &str) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
     let (local_user, person, counts) = local_user::table
-      .filter(person::name.eq(name))
+      .filter(lower(person::name).eq(name.to_lowercase()))
       .inner_join(person::table)
       .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
       .select((
@@ -68,7 +65,8 @@ impl LocalUserView {
         person::all_columns,
         person_aggregates::all_columns,
       ))
-      .first::<LocalUserViewTuple>(conn)?;
+      .first::<LocalUserViewTuple>(conn)
+      .await?;
     Ok(Self {
       local_user,
       person,
@@ -76,21 +74,26 @@ impl LocalUserView {
     })
   }
 
-  pub fn find_by_email_or_name(conn: &PgConnection, name_or_email: &str) -> Result<Self, Error> {
+  pub async fn find_by_email_or_name(
+    pool: &mut DbPool<'_>,
+    name_or_email: &str,
+  ) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
     let (local_user, person, counts) = local_user::table
       .inner_join(person::table)
       .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
       .filter(
-        person::name
-          .ilike(name_or_email)
-          .or(local_user::email.ilike(name_or_email)),
+        lower(person::name)
+          .eq(lower(name_or_email))
+          .or(local_user::email.eq(name_or_email)),
       )
       .select((
         local_user::all_columns,
         person::all_columns,
         person_aggregates::all_columns,
       ))
-      .first::<LocalUserViewTuple>(conn)?;
+      .first::<LocalUserViewTuple>(conn)
+      .await?;
     Ok(Self {
       local_user,
       person,
@@ -98,7 +101,8 @@ impl LocalUserView {
     })
   }
 
-  pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<Self, Error> {
+  pub async fn find_by_email(pool: &mut DbPool<'_>, from_email: &str) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
     let (local_user, person, counts) = local_user::table
       .inner_join(person::table)
       .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
@@ -108,40 +112,41 @@ impl LocalUserView {
         person::all_columns,
         person_aggregates::all_columns,
       ))
-      .first::<LocalUserViewTuple>(conn)?;
+      .first::<LocalUserViewTuple>(conn)
+      .await?;
     Ok(Self {
       local_user,
       person,
       counts,
     })
   }
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct LocalUserSettingsView {
-  pub local_user: LocalUserSettings,
-  pub person: PersonSafe,
-  pub counts: PersonAggregates,
-}
-
-type LocalUserSettingsViewTuple = (LocalUserSettings, PersonSafe, PersonAggregates);
 
-impl LocalUserSettingsView {
-  pub fn read(conn: &PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
-    let (local_user, person, counts) = local_user::table
-      .find(local_user_id)
+  pub async fn list_admins_with_emails(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
+    let conn = &mut get_conn(pool).await?;
+    let res = local_user::table
+      .filter(person::admin.eq(true))
+      .filter(local_user::email.is_not_null())
       .inner_join(person::table)
       .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
       .select((
-        LocalUser::safe_settings_columns_tuple(),
-        Person::safe_columns_tuple(),
+        local_user::all_columns,
+        person::all_columns,
         person_aggregates::all_columns,
       ))
-      .first::<LocalUserSettingsViewTuple>(conn)?;
-    Ok(Self {
-      local_user,
-      person,
-      counts,
-    })
+      .load::<LocalUserViewTuple>(conn)
+      .await?;
+
+    Ok(res.into_iter().map(LocalUserView::from_tuple).collect())
+  }
+}
+
+impl JoinView for LocalUserView {
+  type JoinTuple = LocalUserViewTuple;
+  fn from_tuple(a: Self::JoinTuple) -> Self {
+    Self {
+      local_user: a.0,
+      person: a.1,
+      counts: a.2,
+    }
   }
 }