server: move domain types to a separate file

server/src/infra/auth_service.rs

@@ -22,12 +22,12 @@ use tracing::{debug, instrument, warn};
 
 use lldap_auth::{login, password_reset, registration, JWTClaims};
 
-use crate::domain::handler::UserRequestFilter;
 use crate::{
     domain::{
         error::DomainError,
-        handler::{BackendHandler, BindRequest, GroupDetails, LoginHandler, UserColumn, UserId},
+        handler::{BackendHandler, BindRequest, LoginHandler, UserRequestFilter},
         opaque_handler::OpaqueHandler,
+        types::{GroupDetails, UserColumn, UserId},
     },
     infra::{
         tcp_backend_handler::*,

server/src/infra/configuration.rs

@@ -1,5 +1,5 @@
 use crate::{
-    domain::handler::UserId,
+    domain::types::UserId,
     infra::cli::{GeneralConfigOpts, LdapsOpts, RunOpts, SmtpEncryption, SmtpOpts, TestEmailOpts},
 };
 use anyhow::{Context, Result};

server/src/infra/graphql/mutation.rs

@@ -1,6 +1,6 @@
-use crate::domain::handler::{
-    BackendHandler, CreateUserRequest, GroupId, JpegPhoto, UpdateGroupRequest, UpdateUserRequest,
-    UserId,
+use crate::domain::{
+    handler::{BackendHandler, CreateUserRequest, UpdateGroupRequest, UpdateUserRequest},
+    types::{GroupId, JpegPhoto, UserId},
 };
 use anyhow::Context as AnyhowContext;
 use juniper::{graphql_object, FieldResult, GraphQLInputObject, GraphQLObject};

server/src/infra/graphql/query.rs

@@ -1,15 +1,16 @@
 use crate::domain::{
-    handler::{BackendHandler, GroupDetails, GroupId, UserColumn, UserId},
+    handler::BackendHandler,
     ldap::utils::map_user_field,
+    types::{GroupDetails, GroupId, UserColumn, UserId},
 };
 use juniper::{graphql_object, FieldResult, GraphQLInputObject};
 use serde::{Deserialize, Serialize};
 use tracing::{debug, debug_span, Instrument};
 
 type DomainRequestFilter = crate::domain::handler::UserRequestFilter;
-type DomainUser = crate::domain::handler::User;
-type DomainGroup = crate::domain::handler::Group;
-type DomainUserAndGroups = crate::domain::handler::UserAndGroups;
+type DomainUser = crate::domain::types::User;
+type DomainGroup = crate::domain::types::Group;
+type DomainUserAndGroups = crate::domain::types::UserAndGroups;
 use super::api::Context;
 
 #[derive(PartialEq, Eq, Debug, GraphQLInputObject)]
@@ -345,10 +346,7 @@ impl<Handler: BackendHandler> From<DomainGroup> for Group<Handler> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        domain::handler::{MockTestBackendHandler, UserRequestFilter},
-        infra::auth_service::ValidationResults,
-    };
+    use crate::{domain::handler::MockTestBackendHandler, infra::auth_service::ValidationResults};
     use chrono::TimeZone;
     use juniper::{
         execute, graphql_value, DefaultScalarValue, EmptyMutation, EmptySubscription, GraphQLType,
@@ -457,9 +455,12 @@ mod tests {
         let mut mock = MockTestBackendHandler::new();
         mock.expect_list_users()
             .with(
-                eq(Some(UserRequestFilter::Or(vec![
-                    UserRequestFilter::UserId(UserId::new("bob")),
-                    UserRequestFilter::Equality(UserColumn::Email, "robert@bobbers.on".to_string()),
+                eq(Some(DomainRequestFilter::Or(vec![
+                    DomainRequestFilter::UserId(UserId::new("bob")),
+                    DomainRequestFilter::Equality(
+                        UserColumn::Email,
+                        "robert@bobbers.on".to_string(),
+                    ),
                 ]))),
                 eq(false),
             )

server/src/infra/ldap_handler.rs

@@ -1,10 +1,6 @@
-use std::collections::HashMap;
-
 use crate::{
     domain::{
-        handler::{
-            BackendHandler, BindRequest, CreateUserRequest, JpegPhoto, LoginHandler, UserId,
-        },
+        handler::{BackendHandler, BindRequest, CreateUserRequest, LoginHandler},
         ldap::{
             error::{LdapError, LdapResult},
             group::get_groups_list,
@@ -14,6 +10,7 @@ use crate::{
             },
         },
         opaque_handler::OpaqueHandler,
+        types::{JpegPhoto, UserId},
     },
     infra::auth_service::{Permission, ValidationResults},
 };
@@ -24,6 +21,7 @@ use ldap3_proto::proto::{
     LdapResult as LdapResultOp, LdapResultCode, LdapSearchRequest, LdapSearchResultEntry,
     LdapSearchScope,
 };
+use std::collections::HashMap;
 use tracing::{debug, instrument, warn};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -569,7 +567,7 @@ impl<Backend: BackendHandler + LoginHandler + OpaqueHandler> LdapHandler<Backend
 mod tests {
     use super::*;
     use crate::{
-        domain::{error::Result, handler::*, opaque_handler::*},
+        domain::{error::Result, handler::*, opaque_handler::*, types::*},
         uuid,
     };
     use async_trait::async_trait;

server/src/infra/sql_backend_handler.rs

@@ -1,9 +1,9 @@
 use super::tcp_backend_handler::TcpBackendHandler;
 use crate::domain::{
     error::*,
-    handler::UserId,
     model::{self, JwtRefreshStorageColumn, JwtStorageColumn, PasswordResetTokensColumn},
     sql_backend_handler::SqlBackendHandler,
+    types::UserId,
 };
 use async_trait::async_trait;
 use sea_orm::{

server/src/infra/tcp_backend_handler.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use std::collections::HashSet;
 
-use crate::domain::{error::Result, handler::UserId};
+use crate::domain::{error::Result, types::UserId};
 
 #[async_trait]
 pub trait TcpBackendHandler {
@@ -22,7 +22,7 @@ pub trait TcpBackendHandler {
 }
 
 #[cfg(test)]
-use crate::domain::handler::*;
+use crate::domain::{handler::*, types::*};
 #[cfg(test)]
 mockall::mock! {
     pub TestTcpBackendHandler{}