gandc/lldap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: small cleanup

Browse Source
This commit is contained in:
Valentin Tolmer
2023-09-11 15:09:23 +02:00
committed by nitnelave
parent 08d3aef177
commit 94da42ffb9
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/domain/sql_group_backend_handler.rs
View File

@@ -102,9 +102,9 @@ impl GroupBackendHandler for SqlBackendHandler {
#[instrument(skip(self), level = "debug", ret, err)] #[instrument(skip(self), level = "debug", ret, err)]
async fn get_group_details(&self, group_id: GroupId) -> Result<GroupDetails> { async fn get_group_details(&self, group_id: GroupId) -> Result<GroupDetails> {
model::Group::find_by_id(group_id) model::Group::find_by_id(group_id)
.into_model::<GroupDetails>()
.one(&self.sql_pool) .one(&self.sql_pool)
.await? .await?
.map(Into::<GroupDetails>::into)
.ok_or_else(|| DomainError::EntityNotFound(format!("{:?}", group_id))) .ok_or_else(|| DomainError::EntityNotFound(format!("{:?}", group_id)))
} }

7
server/src/domain/sql_user_backend_handler.rs
View File

@@ -68,7 +68,7 @@ fn get_user_filter_expr(filter: UserRequestFilter) -> Cond {
.eq(group_id) .eq(group_id)
.into_condition(), .into_condition(),
UserIdSubString(filter) => UserColumn::UserId UserIdSubString(filter) => UserColumn::UserId
.like(&filter.to_sql_filter()) .like(filter.to_sql_filter())
.into_condition(), .into_condition(),
SubString(col, filter) => { SubString(col, filter) => {
SimpleExpr::FunctionCall(Func::lower(Expr::col(col.as_column_ref()))) SimpleExpr::FunctionCall(Func::lower(Expr::col(col.as_column_ref())))
@@ -196,9 +196,10 @@ impl UserBackendHandler for SqlBackendHandler {
.ok_or_else(|| DomainError::EntityNotFound(user_id.to_string()))?; .ok_or_else(|| DomainError::EntityNotFound(user_id.to_string()))?;
Ok(HashSet::from_iter( Ok(HashSet::from_iter(
user.find_linked(model::memberships::UserToGroup) user.find_linked(model::memberships::UserToGroup)
.into_model::<GroupDetails>()
.all(&self.sql_pool) .all(&self.sql_pool)
.await?, .await?
.into_iter()
.map(Into::<GroupDetails>::into),
)) ))
} }

4
server/src/domain/types.rs
View File

@@ -3,7 +3,7 @@ use chrono::{NaiveDateTime, TimeZone};
use sea_orm::{ use sea_orm::{
entity::IntoActiveValue, entity::IntoActiveValue,
sea_query::{value::ValueType, ArrayType, BlobSize, ColumnType, Nullable, ValueTypeErr}, sea_query::{value::ValueType, ArrayType, BlobSize, ColumnType, Nullable, ValueTypeErr},
DbErr, FromQueryResult, QueryResult, TryFromU64, TryGetError, TryGetable, Value, DbErr, QueryResult, TryFromU64, TryGetError, TryGetable, Value,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use strum::{EnumString, IntoStaticStr}; use strum::{EnumString, IntoStaticStr};
@@ -552,7 +552,7 @@ pub struct Group {
pub users: Vec<UserId>, pub users: Vec<UserId>,
} }
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, FromQueryResult)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct GroupDetails { pub struct GroupDetails {
pub group_id: GroupId, pub group_id: GroupId,
pub display_name: String, pub display_name: String,