From 93e9985a812dfe85c046a8541775d13c92f79a17 Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Thu, 28 Sep 2023 01:42:28 +0200 Subject: [PATCH] server: rename SchemaBackendHandler -> ReadSchemaBackendHandler --- server/src/domain/handler.rs | 12 ++++++------ server/src/domain/sql_schema_backend_handler.rs | 4 ++-- server/src/infra/access_control.rs | 10 +++++----- server/src/infra/graphql/query.rs | 2 +- server/src/infra/ldap_handler.rs | 2 +- server/src/infra/test_utils.rs | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/src/domain/handler.rs b/server/src/domain/handler.rs index 4b8ef09..47297e2 100644 --- a/server/src/domain/handler.rs +++ b/server/src/domain/handler.rs @@ -163,12 +163,12 @@ pub trait LoginHandler: Send + Sync { } #[async_trait] -pub trait GroupListerBackendHandler: SchemaBackendHandler { +pub trait GroupListerBackendHandler: ReadSchemaBackendHandler { async fn list_groups(&self, filters: Option) -> Result>; } #[async_trait] -pub trait GroupBackendHandler: SchemaBackendHandler { +pub trait GroupBackendHandler: ReadSchemaBackendHandler { async fn get_group_details(&self, group_id: GroupId) -> Result; async fn update_group(&self, request: UpdateGroupRequest) -> Result<()>; async fn create_group(&self, group_name: &str) -> Result; @@ -176,7 +176,7 @@ pub trait GroupBackendHandler: SchemaBackendHandler { } #[async_trait] -pub trait UserListerBackendHandler: SchemaBackendHandler { +pub trait UserListerBackendHandler: ReadSchemaBackendHandler { async fn list_users( &self, filters: Option, @@ -185,7 +185,7 @@ pub trait UserListerBackendHandler: SchemaBackendHandler { } #[async_trait] -pub trait UserBackendHandler: SchemaBackendHandler { +pub trait UserBackendHandler: ReadSchemaBackendHandler { async fn get_user_details(&self, user_id: &UserId) -> Result; async fn create_user(&self, request: CreateUserRequest) -> Result<()>; async fn update_user(&self, request: UpdateUserRequest) -> Result<()>; @@ -196,7 +196,7 @@ pub trait UserBackendHandler: SchemaBackendHandler { } #[async_trait] -pub trait SchemaBackendHandler { +pub trait ReadSchemaBackendHandler { async fn get_schema(&self) -> Result; } @@ -208,7 +208,7 @@ pub trait BackendHandler: + UserBackendHandler + UserListerBackendHandler + GroupListerBackendHandler - + SchemaBackendHandler + + ReadSchemaBackendHandler { } diff --git a/server/src/domain/sql_schema_backend_handler.rs b/server/src/domain/sql_schema_backend_handler.rs index 68b0447..ee210d8 100644 --- a/server/src/domain/sql_schema_backend_handler.rs +++ b/server/src/domain/sql_schema_backend_handler.rs @@ -1,6 +1,6 @@ use crate::domain::{ error::{DomainError, Result}, - handler::{AttributeList, AttributeSchema, Schema, SchemaBackendHandler}, + handler::{AttributeList, AttributeSchema, ReadSchemaBackendHandler, Schema}, model, sql_backend_handler::SqlBackendHandler, }; @@ -8,7 +8,7 @@ use async_trait::async_trait; use sea_orm::{DatabaseTransaction, EntityTrait, QueryOrder, TransactionTrait}; #[async_trait] -impl SchemaBackendHandler for SqlBackendHandler { +impl ReadSchemaBackendHandler for SqlBackendHandler { async fn get_schema(&self) -> Result { Ok(self .sql_pool diff --git a/server/src/infra/access_control.rs b/server/src/infra/access_control.rs index 6b6560b..5be4745 100644 --- a/server/src/infra/access_control.rs +++ b/server/src/infra/access_control.rs @@ -6,10 +6,10 @@ use tracing::info; use crate::domain::{ error::Result, handler::{ - AttributeSchema, BackendHandler, CreateUserRequest, GroupBackendHandler, - GroupListerBackendHandler, GroupRequestFilter, Schema, SchemaBackendHandler, - UpdateGroupRequest, UpdateUserRequest, UserBackendHandler, UserListerBackendHandler, - UserRequestFilter, + AttributeSchema, BackendHandler, CreateUserRequest, + GroupBackendHandler, GroupListerBackendHandler, GroupRequestFilter, + ReadSchemaBackendHandler, Schema, UpdateGroupRequest, UpdateUserRequest, + UserBackendHandler, UserListerBackendHandler, UserRequestFilter, }, types::{Group, GroupDetails, GroupId, User, UserAndGroups, UserId}, }; @@ -265,7 +265,7 @@ pub struct UserRestrictedListerBackendHandler<'a, Handler> { } #[async_trait] -impl<'a, Handler: SchemaBackendHandler + Sync> SchemaBackendHandler +impl<'a, Handler: ReadSchemaBackendHandler + Sync> ReadSchemaBackendHandler for UserRestrictedListerBackendHandler<'a, Handler> { async fn get_schema(&self) -> Result { diff --git a/server/src/infra/graphql/query.rs b/server/src/infra/graphql/query.rs index 633c8e8..3b80795 100644 --- a/server/src/infra/graphql/query.rs +++ b/server/src/infra/graphql/query.rs @@ -1,6 +1,6 @@ use crate::{ domain::{ - handler::{BackendHandler, SchemaBackendHandler}, + handler::{BackendHandler, ReadSchemaBackendHandler}, ldap::utils::{map_user_field, UserFieldType}, schema::{ PublicSchema, SchemaAttributeExtractor, SchemaGroupAttributeExtractor, diff --git a/server/src/infra/ldap_handler.rs b/server/src/infra/ldap_handler.rs index 25e3012..ef11024 100644 --- a/server/src/infra/ldap_handler.rs +++ b/server/src/infra/ldap_handler.rs @@ -1,7 +1,7 @@ use crate::{ domain::{ handler::{ - BackendHandler, BindRequest, CreateUserRequest, LoginHandler, SchemaBackendHandler, + BackendHandler, BindRequest, CreateUserRequest, LoginHandler, ReadSchemaBackendHandler, }, ldap::{ error::{LdapError, LdapResult}, diff --git a/server/src/infra/test_utils.rs b/server/src/infra/test_utils.rs index f6b44fe..9b253aa 100644 --- a/server/src/infra/test_utils.rs +++ b/server/src/infra/test_utils.rs @@ -38,7 +38,7 @@ mockall::mock! { async fn remove_user_from_group(&self, user_id: &UserId, group_id: GroupId) -> Result<()>; } #[async_trait] - impl SchemaBackendHandler for TestBackendHandler { + impl ReadSchemaBackendHandler for TestBackendHandler { async fn get_schema(&self) -> Result; } #[async_trait]