Adding email admins for new applications. Fixes #2271 (#2390)

[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 d377af6330dcceac72361ffe71326dc1629adf65..b5a758b84e982a736e249fd87adf3f9be04b9087 100644 (file)
--- a/crates/db_views/src/local_user_view.rs
+++ b/crates/db_views/src/local_user_view.rs
@@ -1,127 +1,167 @@
+use crate::structs::{LocalUserSettingsView, LocalUserView};
 use diesel::{result::Error, *};
-use lemmy_db_queries::{aggregates::person_aggregates::PersonAggregates, ToSafe, ToSafeSettings};
 use lemmy_db_schema::{
+  aggregates::structs::PersonAggregates,
+  newtypes::{LocalUserId, PersonId},
   schema::{local_user, person, person_aggregates},
   source::{
     local_user::{LocalUser, LocalUserSettings},
     person::{Person, PersonSafe},
   },
+  traits::{ToSafe, ToSafeSettings, ViewToVec},
+  utils::functions::lower,
 };
-use serde::Serialize;
 
-#[derive(Debug, Serialize, Clone)]
-pub struct LocalUserView {
-  pub person: Person,
-  pub counts: PersonAggregates,
-  pub local_user: LocalUser,
-}
-
-type LocalUserViewTuple = (Person, PersonAggregates, LocalUser);
+type LocalUserViewTuple = (LocalUser, Person, PersonAggregates);
 
 impl LocalUserView {
-  pub fn read_person(conn: &PgConnection, person_id: i32) -> Result<Self, Error> {
-    let (person, counts, local_user) = person::table
-      .find(person_id)
-      .inner_join(person_aggregates::table)
-      .inner_join(local_user::table)
+  pub fn read(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
+    let (local_user, person, counts) = local_user::table
+      .find(local_user_id)
+      .inner_join(person::table)
+      .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
       .select((
+        local_user::all_columns,
         person::all_columns,
         person_aggregates::all_columns,
-        local_user::all_columns,
       ))
       .first::<LocalUserViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
+    })
+  }
+
+  pub fn read_person(conn: &mut PgConnection, person_id: PersonId) -> Result<Self, Error> {
+    let (local_user, person, counts) = local_user::table
+      .filter(person::id.eq(person_id))
+      .inner_join(person::table)
+      .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
+      .select((
+        local_user::all_columns,
+        person::all_columns,
+        person_aggregates::all_columns,
+      ))
+      .first::<LocalUserViewTuple>(conn)?;
+    Ok(Self {
       local_user,
+      person,
+      counts,
     })
   }
 
   // TODO check where this is used
-  pub fn read_from_name(conn: &PgConnection, name: &str) -> Result<Self, Error> {
-    let (person, counts, local_user) = person::table
+  pub fn read_from_name(conn: &mut PgConnection, name: &str) -> Result<Self, Error> {
+    let (local_user, person, counts) = local_user::table
       .filter(person::name.eq(name))
-      .inner_join(person_aggregates::table)
-      .inner_join(local_user::table)
+      .inner_join(person::table)
+      .inner_join(person_aggregates::table.on(person::id.eq(person_aggregates::person_id)))
       .select((
+        local_user::all_columns,
         person::all_columns,
         person_aggregates::all_columns,
-        local_user::all_columns,
       ))
       .first::<LocalUserViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
-      local_user,
     })
   }
 
-  pub fn find_by_email_or_name(conn: &PgConnection, name_or_email: &str) -> Result<Self, Error> {
-    let (person, counts, local_user) = person::table
-      .inner_join(person_aggregates::table)
-      .inner_join(local_user::table)
+  pub fn find_by_email_or_name(
+    conn: &mut PgConnection,
+    name_or_email: &str,
+  ) -> Result<Self, Error> {
+    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,
-        local_user::all_columns,
       ))
       .first::<LocalUserViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
-      local_user,
     })
   }
 
-  pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<Self, Error> {
-    let (person, counts, local_user) = person::table
-      .inner_join(person_aggregates::table)
-      .inner_join(local_user::table)
+  pub fn find_by_email(conn: &mut PgConnection, from_email: &str) -> Result<Self, Error> {
+    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(local_user::email.eq(from_email))
       .select((
+        local_user::all_columns,
         person::all_columns,
         person_aggregates::all_columns,
-        local_user::all_columns,
       ))
       .first::<LocalUserViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
-      local_user,
     })
   }
 }
 
-#[derive(Debug, Serialize, Clone)]
-pub struct LocalUserSettingsView {
-  pub person: PersonSafe,
-  pub counts: PersonAggregates,
-  pub local_user: LocalUserSettings,
-}
-
-type LocalUserSettingsViewTuple = (PersonSafe, PersonAggregates, LocalUserSettings);
+type LocalUserSettingsViewTuple = (LocalUserSettings, PersonSafe, PersonAggregates);
 
 impl LocalUserSettingsView {
-  pub fn read(conn: &PgConnection, person_id: i32) -> Result<Self, Error> {
-    let (person, counts, local_user) = person::table
-      .find(person_id)
-      .inner_join(person_aggregates::table)
-      .inner_join(local_user::table)
+  pub fn read(conn: &mut PgConnection, local_user_id: LocalUserId) -> Result<Self, Error> {
+    let (local_user, person, counts) = local_user::table
+      .find(local_user_id)
+      .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(),
         person_aggregates::all_columns,
-        LocalUser::safe_settings_columns_tuple(),
       ))
       .first::<LocalUserSettingsViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
-      local_user,
     })
   }
+
+  pub fn list_admins_with_emails(conn: &mut PgConnection) -> Result<Vec<Self>, Error> {
+    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(),
+        person_aggregates::all_columns,
+      ))
+      .load::<LocalUserSettingsViewTuple>(conn)?;
+
+    Ok(LocalUserSettingsView::from_tuple_to_vec(res))
+  }
+}
+
+impl ViewToVec for LocalUserSettingsView {
+  type DbTuple = LocalUserSettingsViewTuple;
+  fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
+    items
+      .into_iter()
+      .map(|a| Self {
+        local_user: a.0,
+        person: a.1,
+        counts: a.2,
+      })
+      .collect::<Vec<Self>>()
+  }
 }