Diesel 2.0.0 upgrade (#2452)

[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 85a83e1569a040ad8465f0ee30c42ea78f8279bd..0e6d24b1164d0139d54fb04be2c014fe2e33f200 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 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},
   },
-  LocalUserId,
-  PersonId,
+  traits::{ToSafe, ToSafeSettings},
+  utils::functions::lower,
 };
-use serde::Serialize;
-
-#[derive(Debug, Serialize, 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 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)
@@ -39,7 +33,7 @@ impl LocalUserView {
     })
   }
 
-  pub fn read_person(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
+  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)
@@ -58,7 +52,7 @@ impl LocalUserView {
   }
 
   // TODO check where this is used
-  pub fn read_from_name(conn: &PgConnection, name: &str) -> Result<Self, Error> {
+  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::table)
@@ -70,20 +64,23 @@ impl LocalUserView {
       ))
       .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> {
+  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,
@@ -92,13 +89,13 @@ impl LocalUserView {
       ))
       .first::<LocalUserViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
-      local_user,
     })
   }
 
-  pub fn find_by_email(conn: &PgConnection, from_email: &str) -> Result<Self, Error> {
+  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)))
@@ -110,24 +107,17 @@ impl LocalUserView {
       ))
       .first::<LocalUserViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
-      local_user,
     })
   }
 }
 
-#[derive(Debug, Serialize, 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> {
+  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)
@@ -139,9 +129,9 @@ impl LocalUserSettingsView {
       ))
       .first::<LocalUserSettingsViewTuple>(conn)?;
     Ok(Self {
+      local_user,
       person,
       counts,
-      local_user,
     })
   }
 }