Refactor permissions and user DTOs to use imphnen_entities module
- Updated permissions_repository.rs to import PermissionsItemDto from imphnen_entities. - Modified permissions_schema.rs to import PermissionsItemDto and PermissionsQueryDto from imphnen_entities. - Changed roles_dto.rs to import PermissionsItemDto and PermissionsQueryDto from imphnen_entities. - Updated users_dto.rs to import ExperienceDto, EducationDto, UsersDetailQueryDto, RolesDetailQueryDto, and RolesDetailItemDto from imphnen_entities, and removed redundant struct definitions. - Refactored users_repository.rs to import UsersDetailQueryDto from imphnen_entities. - Updated users_schema.rs to import UsersDetailQueryDto, ExperienceDto, and EducationDto from imphnen_entities. - Modified users_service.rs to use UsersDetailQueryDto from imphnen_entities and added UserLookupService implementation. - Updated Cargo.toml in imphnen-libs to include async-trait as a workspace dependency. - Refactored axum module to remove redundant imports and streamline code. - Updated lib.rs to include AppState struct with user_lookup_service and auth_repository fields. - Refactored surrealdb module to define SurrealWsClient and SurrealMemClient types. - Removed imphnen-iam dependency from middleware's Cargo.toml. - Updated auth_middleware to use UsersDetailQueryDto from imphnen_entities and refactored user retrieval logic. - Refactored permissions_middleware to use PermissionsEnum from imphnen_entities and updated user retrieval logic. - Updated mock_test.rs to create AppState with user_lookup_service and auth_repository. - Added permissions.rs and users.rs to imphnen_entities with necessary DTOs and enums. - Created services.rs in imphnen-libs to define UserLookupService and AuthRepositoryTrait traits.
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
// Restore only the necessary imports to fix unresolved function errors
|
||||
use crate::{get_iso_date, hash_password};
|
||||
use imphnen_entities::AppState;
|
||||
use imphnen_iam::{PermissionsEnum, UsersSchema};
|
||||
use imphnen_libs::AppState;
|
||||
use imphnen_iam::{PermissionsEnum, UsersSchema, v1::users::users_service::UsersService, v1::auth::auth_repository::AuthRepoImpl};
|
||||
use std::sync::Arc;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use strum::IntoEnumIterator;
|
||||
use surrealdb::engine::{any, local};
|
||||
@@ -50,7 +51,9 @@ pub async fn create_mock_app_state() -> AppState {
|
||||
|
||||
AppState {
|
||||
surrealdb_ws: db_ws,
|
||||
surrealdb_mem: db_mem,
|
||||
surrealdb_mem: db_mem.clone(),
|
||||
user_lookup_service: Arc::new(UsersService),
|
||||
auth_repository: Arc::new(AuthRepoImpl { db: db_mem.clone() }),
|
||||
}
|
||||
}
|
||||
pub async fn cleanup_db() {
|
||||
|
||||
Reference in New Issue
Block a user