Add comprehensive tests for mentor repository and authentication

- Implemented tests for creating, retrieving, updating, and deleting mentors in `mentor_repository_test.rs`.
- Added tests for user authentication, including successful login, invalid email formats, and inactive users in `auth_login_tests.rs`.
- Created a mock test environment setup in `mock_test.rs` to facilitate database operations during tests.
- Updated module structure to include new test files for mentors and authentication.
- Ensured cleanup of the database after tests to maintain isolation and prevent side effects.

tests/src/iam/auth/auth_login_tests.rs

@@ -0,0 +1,379 @@
+#[cfg(test)]
+mod auth_login_tests {
+	use crate::generate_unique_email;
+	use crate::hash_password;
+	use crate::mock_test::setup_all_test_environment;
+	use axum::http::StatusCode;
+	use imphnen_iam::{
+		v1::auth::{AuthLoginRequestDto, AuthService},
+		AppState, UsersRepository, UsersSchema,
+	};
+	use serde_json::Value; // Import the new setup function
+
+	async fn setup_test_environment() -> AppState {
+		setup_all_test_environment().await
+	}
+
+	async fn create_test_user_with_role(
+		state: &AppState,
+		email: &str,
+		password: &str,
+		role_name: &str,
+		is_active: bool,
+	) -> UsersSchema {
+		let role_repo = imphnen_iam::RolesRepository::new(state);
+
+		let role = match role_repo.query_role_by_name(role_name.to_string()).await {
+			Ok(role) => role,
+			Err(_) => {
+				let _ = role_repo
+					.query_create_role(imphnen_iam::RolesRequestCreateDto {
+						name: role_name.to_string(),
+						permissions: vec![],
+					})
+					.await
+					.unwrap();
+
+				role_repo
+					.query_role_by_name(role_name.to_string())
+					.await
+					.unwrap_or_else(|_| {
+						panic!("Failed to create {role_name} role");
+					})
+			}
+		};
+
+		let user = UsersSchema {
+			id: crate::make_thing("app_users", &uuid::Uuid::new_v4().to_string()),
+			email: email.to_string(),
+			fullname: "Test User".to_string(),
+			password: hash_password(password).unwrap(),
+			is_deleted: false,
+			avatar: None,
+			phone_number: "081234567890".to_string(),
+			is_active,
+			gender: None,
+			birthdate: None,
+			role: crate::make_thing("app_roles", &role.id),
+			mentor_id: None,
+			created_at: imphnen_utils::get_iso_date(),
+			updated_at: imphnen_utils::get_iso_date(),
+		};
+		let user_repo = UsersRepository::new(state);
+		user_repo
+			.query_create_user(user.clone())
+			.await
+			.expect("Failed to create test user");
+
+		user
+	}
+
+	#[tokio::test]
+	async fn test_successful_login_with_valid_credentials() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_login_success");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "User", true).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::OK);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+
+		assert!(response_json.get("data").is_some());
+		assert!(response_json["data"].get("token").is_some());
+		assert!(response_json["data"]["token"].get("access_token").is_some());
+		assert!(response_json["data"]["token"]
+			.get("refresh_token")
+			.is_some());
+		assert!(response_json["data"].get("user").is_some());
+		assert_eq!(response_json["data"]["user"]["email"], email);
+	}
+
+	#[tokio::test]
+	async fn test_login_with_invalid_email_format() {
+		let state = setup_test_environment().await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: "invalid-email".to_string(),
+			password: "TestPass123!".to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::BAD_REQUEST);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+		assert_eq!(response_json["message"], "Email not valid");
+	}
+
+	#[tokio::test]
+	async fn test_login_with_empty_email() {
+		let state = setup_test_environment().await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: "".to_string(),
+			password: "TestPass123!".to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::BAD_REQUEST);
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+		let message = response_json["message"].as_str().unwrap();
+		assert!(message.contains("Email cannot be empty"));
+		assert!(message.contains("Email not valid"));
+	}
+
+	#[tokio::test]
+	async fn test_login_with_empty_password() {
+		let state = setup_test_environment().await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: generate_unique_email("test_empty_pass"),
+			password: "".to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::BAD_REQUEST);
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+		assert_eq!(response_json["message"], "Password cannot be empty");
+	}
+
+	#[tokio::test]
+	async fn test_login_with_wrong_password() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_wrong_pass");
+		let correct_password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, correct_password, "User", true).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: "WrongPassword123!".to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::BAD_REQUEST);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+
+		assert_eq!(response_json["message"], "Email or password not correct");
+	}
+
+	#[tokio::test]
+	async fn test_login_with_nonexistent_user() {
+		let state = setup_test_environment().await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: generate_unique_email("nonexistent"),
+			password: "TestPass123!".to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::UNAUTHORIZED);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+
+		assert!(response_json["message"]
+			.to_string()
+			.contains("User not found"));
+	}
+
+	#[tokio::test]
+	async fn test_login_with_inactive_user() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_inactive");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "User", false).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::BAD_REQUEST);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+
+		assert_eq!(
+			response_json["message"],
+			"Account not active, please verify your email"
+		);
+	}
+
+	#[tokio::test]
+	async fn test_successful_mentor_login() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_mentor_login");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "Mentor", true).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_mentor_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::OK);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+
+		assert!(response_json.get("data").is_some());
+		assert_eq!(response_json["data"]["user"]["role"]["name"], "Mentor");
+	}
+
+	#[tokio::test]
+	async fn test_mentor_login_with_non_mentor_user() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_user_not_mentor");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "User", true).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_mentor_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::FORBIDDEN);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+
+		assert_eq!(
+			response_json["message"],
+			"User does not have mentor privileges"
+		);
+	}
+
+	#[tokio::test]
+	async fn test_mentor_login_with_inactive_mentor() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_inactive_mentor");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "Mentor", false).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_mentor_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::BAD_REQUEST);
+
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+
+		assert_eq!(
+			response_json["message"],
+			"Account not active, please verify your email"
+		);
+	}
+
+	#[tokio::test]
+	async fn test_login_creates_user_cache() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_cache");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "User", true).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, _) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::OK);
+
+		// Verify user was cached
+		let auth_repo = imphnen_iam::AuthRepository::new(&state);
+		let cached_user = auth_repo.query_get_stored_user(email.clone()).await;
+		assert!(cached_user.is_ok());
+		assert_eq!(cached_user.unwrap().email, email);
+	}
+
+	#[tokio::test]
+	async fn test_login_with_special_characters_in_email() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test+special");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "User", true).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.clone(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, _) = response.into_parts();
+
+		assert_eq!(parts.status, StatusCode::OK);
+	}
+
+	#[tokio::test]
+	async fn test_login_with_case_sensitive_email() {
+		let state = setup_test_environment().await;
+		let email = generate_unique_email("test_case");
+		let password = "TestPass123!";
+
+		create_test_user_with_role(&state, &email, password, "User", true).await;
+
+		let login_dto = AuthLoginRequestDto {
+			email: email.to_uppercase(),
+			password: password.to_string(),
+		};
+
+		let response = AuthService::mutation_login(login_dto, &state).await;
+		let (parts, body) = response.into_parts();
+
+		// Email should be case-sensitive
+		assert_eq!(parts.status, StatusCode::UNAUTHORIZED);
+		let body_bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
+		let response_json: Value = serde_json::from_slice(&body_bytes).unwrap();
+		assert!(response_json["message"]
+			.to_string()
+			.contains("User not found"));
+	}
+}

tests/src/iam/auth/auth_repository_test.rs

@@ -1,9 +1,16 @@
 #[cfg(test)]
 mod auth_repository_test {
 	use crate::{
-		AuthOtpSchema, AuthRepository, ResourceEnum, UsersRepository, UsersSchema,
-		create_mock_app_state, generate_unique_email, get_iso_date, get_role_id,
+		generate_unique_email,
+		get_iso_date,
+		get_role_id,
 		make_thing,
+		setup_all_test_environment, // Import the new setup function
+		AuthOtpSchema,
+		AuthRepository,
+		ResourceEnum,
+		UsersRepository,
+		UsersSchema,
 	};
 	use chrono::{Duration, Utc};
 	use imphnen_iam::{AppState, RolesDetailQueryDto, UsersDetailQueryDto};
@@ -22,6 +29,7 @@ mod auth_repository_test {
 			gender: None,
 			birthdate: None,
 			role: make_thing("app_roles", &get_role_id(state).await),
+			mentor_id: None,
 			created_at: get_iso_date(),
 			updated_at: get_iso_date(),
 		}
@@ -29,27 +37,35 @@ mod auth_repository_test {
 
 	#[tokio::test]
 	async fn test_store_and_get_user() {
-		let app_state = create_mock_app_state().await;
+		let app_state = setup_all_test_environment().await; // Use the new setup function
 		let repo = AuthRepository::new(&app_state);
 		let email = generate_unique_email("forgot");
-		let user = create_mock_user(&app_state, &email).await;
+		let mut user = create_mock_user(&app_state, &email).await;
+		user.role = make_thing("app_roles", &get_role_id(&app_state).await);
 		let user_repo = UsersRepository::new(&app_state);
 		let create_user = user_repo.query_create_user(user.clone()).await;
 		assert!(create_user.is_ok());
-		let user_data = user_repo
-			.query_user_by_email(email.to_string())
-			.await
-			.unwrap();
+		let user_data = user_repo.query_user_by_email(email).await;
+		assert!(
+			user_data.is_ok(),
+			"Failed to get user by email: {:?}",
+			user_data.err()
+		);
+		let user_data = user_data.unwrap();
 		let store = repo.query_store_user(user_data.clone()).await;
-		assert!(store.is_ok());
+		assert!(store.is_ok(), "Failed to store user: {:?}", store.err());
 		let fetched = repo.query_get_stored_user(user.email.clone()).await;
-		assert!(fetched.is_ok());
+		assert!(
+			fetched.is_ok(),
+			"Failed to fetch stored user: {:?}",
+			fetched.err()
+		);
 		assert_eq!(fetched.unwrap().email, user.email);
 	}
 
 	#[tokio::test]
 	async fn test_delete_stored_user() {
-		let state = create_mock_app_state().await;
+		let state = setup_all_test_environment().await; // Use the new setup function
 		let auth_repo = AuthRepository::new(&state);
 		let email = "delete_me@example.com".to_string();
 		let mock_user = UsersDetailQueryDto {
@@ -71,15 +87,20 @@ mod auth_repository_test {
 			},
 			is_deleted: false,
 			password: "".into(),
+			mentor_id: None,
 			created_at: get_iso_date(),
 			updated_at: get_iso_date(),
 		};
-		let _: Option<UsersDetailQueryDto> = state
+		let created: Result<Option<UsersDetailQueryDto>, surrealdb::Error> = state
 			.surrealdb_mem
 			.create((ResourceEnum::UsersCache.to_string(), email.clone()))
 			.content(mock_user)
-			.await
-			.unwrap();
+			.await;
+		assert!(
+			created.is_ok(),
+			"Failed to create mock user: {:?}",
+			created.err()
+		);
 		let result = auth_repo.query_delete_stored_user(email.clone()).await;
 		assert!(
 			result.is_ok(),
@@ -91,101 +112,120 @@ mod auth_repository_test {
 
 	#[tokio::test]
 	async fn test_store_and_get_otp() {
-		let app_state = create_mock_app_state().await;
+		let app_state = setup_all_test_environment().await; // Use the new setup function
 		let repo = AuthRepository::new(&app_state);
 		let email = "otp_user@example.com".to_string();
 		let otp = 123456;
 		let stored = repo.query_store_otp(email.clone(), otp).await;
-		assert!(stored.is_ok());
+		assert!(stored.is_ok(), "Failed to store OTP: {:?}", stored.err());
 		let fetched = repo.query_get_stored_otp(email.clone()).await;
-		assert!(fetched.is_ok());
+		assert!(fetched.is_ok(), "Failed to fetch OTP: {:?}", fetched.err());
 		assert_eq!(fetched.unwrap(), otp);
 	}
 
 	#[tokio::test]
 	async fn test_delete_stored_otp() {
-		let app_state = create_mock_app_state().await;
+		let app_state = setup_all_test_environment().await; // Use the new setup function
 		let repo = AuthRepository::new(&app_state);
 		let email = "otp_del@example.com".to_string();
 		let otp = 654321;
-		repo.query_store_otp(email.clone(), otp).await.unwrap();
+		let store_res = repo.query_store_otp(email.clone(), otp).await;
+		assert!(
+			store_res.is_ok(),
+			"Failed to store OTP: {:?}",
+			store_res.err()
+		);
 		let deleted = repo.query_delete_stored_otp(email.clone()).await;
-		assert!(deleted.is_ok());
+		assert!(deleted.is_ok(), "Failed to delete OTP: {:?}", deleted.err());
 		let fetched = repo.query_get_stored_otp(email.clone()).await;
-		assert!(fetched.is_err());
+		assert!(
+			fetched.is_err(),
+			"OTP should be deleted, but got: {fetched:?}"
+		);
 	}
 
 	#[tokio::test]
 	async fn test_expired_otp() {
-		let app_state = create_mock_app_state().await;
+		let app_state = setup_all_test_environment().await; // Use the new setup function
 		let repo = AuthRepository::new(&app_state);
 		let email = "expired_otp@example.com".to_string();
 		let otp = 789012;
 		let table = ResourceEnum::OtpCache.to_string();
 		let expires_at = Utc::now() - Duration::seconds(1);
-		let _: Option<AuthOtpSchema> = repo
+		let created: Result<Option<AuthOtpSchema>, surrealdb::Error> = repo
 			.state
 			.surrealdb_mem
 			.create((table.clone(), email.as_str()))
 			.content(AuthOtpSchema { otp, expires_at })
-			.await
-			.unwrap();
+			.await;
+		assert!(
+			created.is_ok(),
+			"Failed to create expired OTP: {:?}",
+			created.err()
+		);
 		let result = repo.query_get_stored_otp(email.clone()).await;
-		assert!(result.is_err());
+		assert!(
+			result.is_err(),
+			"Expired OTP should not be retrievable, got: {result:?}"
+		);
+		if let Some(err) = result.err() {
+			assert!(
+				err.to_string().contains("OTP expired"),
+				"Expected 'OTP expired' error, got: {err}"
+			);
+		}
 	}
 
 	#[tokio::test]
 	async fn test_get_non_existent_stored_user_should_fail() {
-		let app_state = create_mock_app_state().await;
+		let app_state = setup_all_test_environment().await; // Use the new setup function
 		let repo = AuthRepository::new(&app_state);
 		let result = repo
 			.query_get_stored_user("not_found@example.com".into())
 			.await;
 		assert!(result.is_err());
+		if let Some(err) = result.err() {
+			assert!(
+				err.to_string().contains("No stored user data found"),
+				"Expected 'No stored user data found' error, got: {err}"
+			);
+		}
 	}
 
 	#[tokio::test]
 	async fn test_delete_non_existent_user_should_fail() {
-		let app_state = create_mock_app_state().await;
+		let app_state = setup_all_test_environment().await; // Use the new setup function
 		let repo = AuthRepository::new(&app_state);
 		let result = repo
 			.query_delete_stored_user("ghost@example.com".into())
 			.await;
 		assert!(result.is_err());
-	}
-
-	#[tokio::test]
-	async fn test_get_expired_otp_should_fail() {
-		use chrono::Duration;
-		let app_state = create_mock_app_state().await;
-		let repo = AuthRepository::new(&app_state);
-		let email = "expired_otp@example.com";
-		let expired_time = chrono::Utc::now() - Duration::seconds(10);
-		let otp = 123456;
-		let _: Option<AuthOtpSchema> = repo
-			.state
-			.surrealdb_mem
-			.create((ResourceEnum::OtpCache.to_string(), email))
-			.content(AuthOtpSchema {
-				otp,
-				expires_at: expired_time,
-			})
-			.await
-			.unwrap();
-
-		let result = repo.query_get_stored_otp(email.into()).await;
-		assert!(result.is_err());
+		if let Some(err) = result.err() {
+			assert!(
+				err.to_string().contains("Failed delete stored user"),
+				"Expected 'Failed delete stored user' error, got: {err}"
+			);
+		}
 	}
 
 	#[tokio::test]
 	async fn test_store_and_get_valid_otp() {
-		let app_state = create_mock_app_state().await;
+		let app_state = setup_all_test_environment().await; // Use the new setup function
 		let repo = AuthRepository::new(&app_state);
 		let email = "valid_otp@example.com";
 		let otp = 654321;
 		let store_result = repo.query_store_otp(email.into(), otp).await;
-		assert!(store_result.is_ok());
+		assert!(
+			store_result.is_ok(),
+			"Failed to store valid OTP: {:?}",
+			store_result.err()
+		);
 		let get_result = repo.query_get_stored_otp(email.into()).await;
+		assert!(
+			get_result.is_ok(),
+			"Failed to get valid OTP: {:?}",
+			get_result.err()
+		);
 		assert_eq!(get_result.unwrap(), otp);
 	}
 }

tests/src/iam/auth/mod.rs

@@ -1,2 +1,4 @@
 #[cfg(test)]
+pub mod auth_login_tests;
+#[cfg(test)]
 pub mod auth_repository_test;

tests/src/iam/permissions/permissions_repository_test.rs

@@ -1,19 +1,22 @@
 use crate::{
-	create_mock_app_state,
+	get_iso_date, // Import the new setup function and get_iso_date
 	permissions::{PermissionsRepository, PermissionsSchema},
+	setup_all_test_environment,
 };
 use chrono::Utc;
 
 fn create_dummy_permission(name: &str) -> PermissionsSchema {
 	PermissionsSchema {
 		name: name.to_string(),
+		created_at: Some(get_iso_date()), // Ensure created_at is always set
+		updated_at: Some(get_iso_date()), // Ensure updated_at is always set
 		..Default::default()
 	}
 }
 
 #[tokio::test]
 async fn test_create_permission_should_succeed() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 	let permission = create_dummy_permission("Test Permission");
 	let result = repo.query_create_permission(permission).await;
@@ -22,7 +25,7 @@ async fn test_create_permission_should_succeed() {
 
 #[tokio::test]
 async fn test_query_permission_list_should_return_data() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 
 	let _ = repo
@@ -45,7 +48,7 @@ async fn test_query_permission_list_should_return_data() {
 
 #[tokio::test]
 async fn test_query_permission_by_id_should_succeed() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 	let permission = create_dummy_permission("Detail");
 	let _ = repo.query_create_permission(permission.clone()).await;
@@ -56,7 +59,7 @@ async fn test_query_permission_by_id_should_succeed() {
 
 #[tokio::test]
 async fn test_update_permission_should_succeed() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 	let mut permission = create_dummy_permission("Update This");
 	let _ = repo.query_create_permission(permission.clone()).await;
@@ -68,7 +71,7 @@ async fn test_update_permission_should_succeed() {
 
 #[tokio::test]
 async fn test_delete_permission_should_succeed() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 	let permission = create_dummy_permission("To Be Deleted");
 	let _ = repo.query_create_permission(permission.clone()).await;
@@ -79,33 +82,64 @@ async fn test_delete_permission_should_succeed() {
 
 #[tokio::test]
 async fn test_delete_permission_should_fail_if_already_deleted() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 	let permission = create_dummy_permission("Delete Twice");
 	let _ = repo.query_create_permission(permission.clone()).await;
 	let id = permission.id.id.to_raw();
-	let _ = repo.query_delete_permission(id.clone()).await;
-	let second = repo.query_delete_permission(id).await;
-	assert!(second.is_err(), "Should fail on second delete");
+	let delete_result = repo.query_delete_permission(id.clone()).await;
+	assert!(
+		delete_result.is_ok(),
+		"Initial delete failed: {:?}",
+		delete_result.err()
+	);
+	let second_delete_result = repo.query_delete_permission(id).await;
+	assert!(
+		second_delete_result.is_err(),
+		"Should fail on second delete"
+	);
+	if let Some(err) = second_delete_result.err() {
+		assert!(
+			err.to_string().contains("Permission not found"),
+			"Expected 'Permission not found' error, got: {err}"
+		);
+	}
 }
 
 #[tokio::test]
 async fn test_update_permission_should_fail_if_deleted() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 	let mut permission = create_dummy_permission("To Be Updated Then Deleted");
 	let _ = repo.query_create_permission(permission.clone()).await;
 	let id = permission.id.id.to_raw();
-	let _ = repo.query_delete_permission(id.clone()).await;
+	let delete_result = repo.query_delete_permission(id.clone()).await;
+	assert!(
+		delete_result.is_ok(),
+		"Initial delete failed: {:?}",
+		delete_result.err()
+	);
 	permission.name = "Try Update".into();
 	let result = repo.query_update_permission(permission).await;
 	assert!(result.is_err(), "Update on deleted should fail");
+	if let Some(err) = result.err() {
+		assert!(
+			err.to_string().contains("Permission not found"),
+			"Expected 'Permission not found' error, got: {err}"
+		);
+	}
 }
 
 #[tokio::test]
 async fn test_query_permission_by_id_should_fail_if_not_found() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use the new setup function
 	let repo = PermissionsRepository::new(&state);
 	let result = repo.query_permission_by_id("non-existent-id".into()).await;
 	assert!(result.is_err(), "Expected error for not found id");
+	if let Some(err) = result.err() {
+		assert!(
+			err.to_string().contains("Permission not found"),
+			"Expected 'Permission not found' error, got: {err}"
+		);
+	}
 }

tests/src/iam/roles/roles_repository_test.rs

@@ -1,5 +1,5 @@
 use crate::{
-	ResourceEnum, create_mock_app_state, get_iso_date, make_thing,
+	get_iso_date, make_thing,
 	permissions::{
 		permissions_repository::PermissionsRepository,
 		permissions_schema::PermissionsSchema,
@@ -8,6 +8,7 @@ use crate::{
 		roles_dto::{RolesRequestCreateDto, RolesRequestUpdateDto},
 		roles_repository::RolesRepository,
 	},
+	setup_all_test_environment, ResourceEnum,
 };
 use surrealdb::Uuid;
 
@@ -17,58 +18,92 @@ fn generate_unique_name(prefix: &str) -> String {
 
 #[tokio::test]
 async fn test_query_create_role_should_succeed() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await;
 	let perm_repo = PermissionsRepository::new(&state);
 	let role_repo = RolesRepository::new(&state);
 	let perm_id = Uuid::new_v4().to_string();
 	let permission = PermissionsSchema {
-		id: make_thing(&ResourceEnum::Permissions.to_string(), &perm_id.clone()),
+		id: make_thing(&ResourceEnum::Permissions.to_string(), &perm_id),
 		name: generate_unique_name("read_quiz"),
 		is_deleted: false,
 		created_at: Some(get_iso_date()),
 		updated_at: Some(get_iso_date()),
 	};
-	perm_repo.query_create_permission(permission).await.unwrap();
+	let perm_res = perm_repo.query_create_permission(permission).await;
+	assert!(
+		perm_res.is_ok(),
+		"Failed to create permission: {:?}",
+		perm_res.err()
+	);
 	let payload = RolesRequestCreateDto {
 		name: generate_unique_name("user"),
 		permissions: vec![perm_id.clone()],
 	};
 	let result = role_repo.query_create_role(payload).await;
-	assert!(result.is_ok());
+	assert!(result.is_ok(), "Failed to create role: {:?}", result.err());
 }
 
 #[tokio::test]
 async fn test_query_role_by_name_should_return_data() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await;
 	let role_repo = RolesRepository::new(&state);
 	let name = generate_unique_name("viewer");
 	let payload = RolesRequestCreateDto {
 		name: name.clone(),
 		permissions: vec![],
 	};
-	role_repo.query_create_role(payload.clone()).await.unwrap();
-	let role = role_repo.query_role_by_name(name.clone()).await.unwrap();
+	let create_res = role_repo.query_create_role(payload.clone()).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create role: {:?}",
+		create_res.err()
+	);
+	let role = role_repo.query_role_by_name(name.clone()).await;
+	assert!(role.is_ok(), "Failed to get role by name: {:?}", role.err());
+	let role = role.unwrap();
 	assert_eq!(role.name, name.clone());
 }
 
 #[tokio::test]
 async fn test_query_role_by_id_should_return_data() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await;
 	let role_repo = RolesRepository::new(&state);
+
 	let name = generate_unique_name("tester");
+
 	let payload = RolesRequestCreateDto {
 		name: name.clone(),
 		permissions: vec![],
 	};
-	role_repo.query_create_role(payload.clone()).await.unwrap();
-	let role = role_repo.query_role_by_name(name.clone()).await.unwrap();
-	let result = role_repo.query_role_by_id(role.id).await.unwrap();
-	assert_eq!(result.name, name.clone());
+
+	let create_res = role_repo.query_create_role(payload.clone()).await;
+
+	assert!(
+		create_res.is_ok(),
+		"Failed to create role: {:?}",
+		create_res.err()
+	);
+
+	let role = role_repo.query_role_by_name(name.clone()).await;
+
+	assert!(role.is_ok(), "Failed to get role by name: {:?}", role.err());
+	let role = role.unwrap();
+
+	let result = role_repo.query_role_by_id(role.id.clone()).await;
+
+	assert!(
+		result.is_ok(),
+		"Failed to get role by id: {:?}",
+		result.err()
+	);
+	let result_role = result.unwrap();
+
+	assert_eq!(result_role.name, name.clone());
 }
 
 #[tokio::test]
 async fn test_query_update_role_should_update_name_and_permissions() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await;
 	let repo = RolesRepository::new(&state);
 	let perm_repo = PermissionsRepository::new(&state);
 	let original_perm_id = Uuid::new_v4().to_string();
@@ -77,22 +112,32 @@ async fn test_query_update_role_should_update_name_and_permissions() {
 		name: generate_unique_name("original_permission"),
 		is_deleted: false,
 		created_at: Some(crate::get_iso_date()),
-		updated_at: None,
+		updated_at: Some(crate::get_iso_date()),
 	};
-	perm_repo
-		.query_create_permission(original_perm)
-		.await
-		.unwrap();
+	let perm_res = perm_repo.query_create_permission(original_perm).await;
+	assert!(
+		perm_res.is_ok(),
+		"Failed to create original permission: {:?}",
+		perm_res.err()
+	);
 	let role_upadate_name = generate_unique_name("role_for_update");
 	let create_payload = RolesRequestCreateDto {
 		name: role_upadate_name.clone(),
 		permissions: vec![original_perm_id.clone()],
 	};
-	repo.query_create_role(create_payload).await.unwrap();
-	let existing_role = repo
-		.query_role_by_name(role_upadate_name.clone())
-		.await
-		.unwrap();
+	let create_res = repo.query_create_role(create_payload).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create role: {:?}",
+		create_res.err()
+	);
+	let existing_role = repo.query_role_by_name(role_upadate_name.clone()).await;
+	assert!(
+		existing_role.is_ok(),
+		"Failed to get role by name: {:?}",
+		existing_role.err()
+	);
+	let existing_role = existing_role.unwrap();
 	let existing_role_id = existing_role.id.clone();
 	let new_perm_id = Uuid::new_v4().to_string();
 	let new_perm = PermissionsSchema {
@@ -100,10 +145,15 @@ async fn test_query_update_role_should_update_name_and_permissions() {
 		name: "New Permission".into(),
 		is_deleted: false,
 		created_at: Some(crate::get_iso_date()),
-		updated_at: None,
+		updated_at: Some(crate::get_iso_date()),
 	};
 	let new_role_name = generate_unique_name("updated_role_name");
-	perm_repo.query_create_permission(new_perm).await.unwrap();
+	let perm_res = perm_repo.query_create_permission(new_perm).await;
+	assert!(
+		perm_res.is_ok(),
+		"Failed to create new permission: {:?}",
+		perm_res.err()
+	);
 	let update_payload = RolesRequestUpdateDto {
 		name: Some(new_role_name.clone()),
 		permissions: Some(vec![new_perm_id.clone()]),
@@ -112,34 +162,57 @@ async fn test_query_update_role_should_update_name_and_permissions() {
 	let update_result = repo
 		.query_update_role(existing_role_id.clone(), update_payload)
 		.await;
-	assert!(update_result.is_ok());
-	let updated = repo
-		.query_role_by_id(existing_role_id.clone())
-		.await
-		.unwrap();
-	assert_eq!(updated.name, new_role_name.clone());
+	assert!(
+		update_result.is_ok(),
+		"Failed to update role: {:?}",
+		update_result.err()
+	);
+	let updated = repo.query_role_by_id(existing_role_id.clone()).await;
+	assert!(
+		updated.is_ok(),
+		"Failed to get updated role: {:?}",
+		updated.err()
+	);
+	assert_eq!(updated.unwrap().name, new_role_name.clone());
 }
 
 #[tokio::test]
 async fn test_query_delete_role_should_soft_delete() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await;
 	let role_repo = RolesRepository::new(&state);
 	let name = generate_unique_name("temporary");
 	let payload = RolesRequestCreateDto {
 		name: name.clone(),
 		permissions: vec![],
 	};
-	role_repo.query_create_role(payload.clone()).await.unwrap();
-	let role = role_repo.query_role_by_name(name.clone()).await.unwrap();
+	let create_res = role_repo.query_create_role(payload.clone()).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create role: {:?}",
+		create_res.err()
+	);
+	let role = role_repo.query_role_by_name(name.clone()).await;
+	assert!(role.is_ok(), "Failed to get role by name: {:?}", role.err());
+	let role = role.unwrap();
 	let result = role_repo.query_delete_role(role.id.clone()).await;
-	assert!(result.is_ok());
+	assert!(result.is_ok(), "Failed to delete role: {:?}", result.err());
 	let deleted = role_repo.query_role_by_id(role.id).await;
-	assert!(deleted.is_err());
+	assert!(
+		deleted.is_err(),
+		"Role should be deleted, but got: {deleted:?}"
+	);
+	if let Some(err) = deleted.err() {
+		assert!(
+			err.to_string().contains("Role not found"),
+			"Expected 'Role not found' error, got: {err}"
+		);
+	}
 }
+
 #[tokio::test]
-async fn test_query_update_role_should_fallback_to_existing_permissions_if_none_provided()
- {
-	let state = create_mock_app_state().await;
+async fn test_query_update_role_should_fallback_to_existing_permissions_if_none_provided(
+) {
+	let state = setup_all_test_environment().await;
 	let repo = RolesRepository::new(&state);
 	let perm_repo = PermissionsRepository::new(&state);
 	let perm_id = Uuid::new_v4().to_string();
@@ -148,18 +221,31 @@ async fn test_query_update_role_should_fallback_to_existing_permissions_if_none_
 		name: "Permission for Fallback".into(),
 		is_deleted: false,
 		created_at: Some(crate::get_iso_date()),
-		updated_at: None,
+		updated_at: Some(crate::get_iso_date()),
 	};
-	perm_repo.query_create_permission(permission).await.unwrap();
+	let perm_res = perm_repo.query_create_permission(permission).await;
+	assert!(
+		perm_res.is_ok(),
+		"Failed to create permission: {:?}",
+		perm_res.err()
+	);
 	let create_payload = RolesRequestCreateDto {
 		name: "Role With Permission".into(),
 		permissions: vec![perm_id.clone()],
 	};
-	repo.query_create_role(create_payload).await.unwrap();
-	let existing = repo
-		.query_role_by_name("Role With Permission".into())
-		.await
-		.unwrap();
+	let create_res = repo.query_create_role(create_payload).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create role: {:?}",
+		create_res.err()
+	);
+	let existing = repo.query_role_by_name("Role With Permission".into()).await;
+	assert!(
+		existing.is_ok(),
+		"Failed to get role by name: {:?}",
+		existing.err()
+	);
+	let existing = existing.unwrap();
 	let existing_id = existing.id.clone();
 	let update_payload = RolesRequestUpdateDto {
 		name: Some("Updated Role Name".into()),
@@ -169,29 +255,61 @@ async fn test_query_update_role_should_fallback_to_existing_permissions_if_none_
 	let update_res = repo
 		.query_update_role(existing_id.clone(), update_payload)
 		.await;
-	assert!(update_res.is_ok());
+	assert!(
+		update_res.is_ok(),
+		"Failed to update role (fallback): {:?}",
+		update_res.err()
+	);
 }
 
 #[tokio::test]
 async fn test_query_role_by_name_should_fail_if_not_found() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await;
 	let role_repo = RolesRepository::new(&state);
 	let result = role_repo.query_role_by_name("ghost-role".into()).await;
 	assert!(result.is_err());
+	if let Some(err) = result.err() {
+		assert!(
+			err.to_string().contains("Role not found"),
+			"Expected 'Role not found' error, got: {err}"
+		);
+	}
 }
 
 #[tokio::test]
 async fn test_query_delete_role_should_fail_if_already_deleted() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await;
 	let role_repo = RolesRepository::new(&state);
 	let name = generate_unique_name("soft_delete_test");
 	let payload = RolesRequestCreateDto {
 		name: name.clone(),
 		permissions: vec![],
 	};
-	role_repo.query_create_role(payload.clone()).await.unwrap();
-	let role = role_repo.query_role_by_name(name.clone()).await.unwrap();
-	role_repo.query_delete_role(role.id.clone()).await.unwrap();
-	let result = role_repo.query_delete_role(role.id);
-	assert!(result.await.is_err());
+	let create_res = role_repo.query_create_role(payload.clone()).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create role: {:?}",
+		create_res.err()
+	);
+	let role = role_repo.query_role_by_name(name.clone()).await;
+	assert!(role.is_ok(), "Failed to get role by name: {:?}", role.err());
+	let role = role.unwrap();
+	let del_res = role_repo.query_delete_role(role.id.clone()).await;
+	assert!(
+		del_res.is_ok(),
+		"Failed to delete role: {:?}",
+		del_res.err()
+	);
+	let result_fut = role_repo.query_delete_role(role.id);
+	let result_val = result_fut.await;
+	assert!(
+		result_val.is_err(),
+		"Role should already be deleted, but got: {result_val:?}"
+	);
+	if let Some(err) = result_val.err() {
+		assert!(
+			err.to_string().contains("Role not found"),
+			"Expected 'Role not found' error, got: {err}"
+		);
+	}
 }

tests/src/iam/users/users_repository_test.rs

@@ -1,31 +1,44 @@
-use crate::{MetaRequestDto, UsersRepository, generate_unique_email, get_role_id};
-use crate::{create_mock_app_state, create_test_user};
+use crate::{create_test_user, mock_test::setup_all_test_environment};
+use crate::{generate_unique_email, get_role_id, MetaRequestDto, UsersRepository}; // Import setup_all_test_environment from mock_test
 
 #[tokio::test]
 async fn test_create_and_get_user() {
-	let app_state = create_mock_app_state().await;
+	let app_state = setup_all_test_environment().await; // Use centralized setup
 	let repo = UsersRepository::new(&app_state);
 	let email = generate_unique_email("testuser");
 	let user =
 		create_test_user(&email, "Test User", true, &get_role_id(&app_state).await);
 	let create_result = repo.query_create_user(user.clone()).await;
-	assert!(create_result.is_ok());
-	let fetched = repo.query_user_by_email(email.clone().into()).await;
-	assert!(fetched.is_ok());
+	assert!(
+		create_result.is_ok(),
+		"Failed to create user: {:?}",
+		create_result.err()
+	);
+	let fetched = repo.query_user_by_email(email.clone()).await;
+	assert!(
+		fetched.is_ok(),
+		"Failed to fetch user by email: {:?}",
+		fetched.err()
+	);
 	assert_eq!(fetched.unwrap().email, email.clone());
 }
 
 #[tokio::test]
 async fn test_query_user_list_with_pagination_and_filter() {
-	let app_state = create_mock_app_state().await;
+	let app_state = setup_all_test_environment().await; // Use centralized setup
 	let repo = UsersRepository::new(&app_state);
 	for i in 0..10 {
-		let email = format!("user{}@example.com", i);
-		let fullname = format!("User {}", i);
+		let email = format!("user{i}@example.com");
+		let fullname = format!("User {i}");
 		let is_active = i % 2 == 0;
 		let user =
 			create_test_user(&email, &fullname, is_active, &get_role_id(&app_state).await);
-		repo.query_create_user(user).await.unwrap();
+		let create_res = repo.query_create_user(user).await;
+		assert!(
+			create_res.is_ok(),
+			"Failed to create user: {:?}",
+			create_res.err()
+		);
 	}
 	let meta = MetaRequestDto {
 		page: Some(1),
@@ -36,25 +49,43 @@ async fn test_query_user_list_with_pagination_and_filter() {
 		filter: Some("true".into()),
 		filter_by: Some("is_active".into()),
 	};
-	let result = repo.query_user_list(meta).await.unwrap();
+	let result = repo.query_user_list(meta).await;
+	assert!(
+		result.is_ok(),
+		"Failed to query user list: {:?}",
+		result.err()
+	);
+	let result = result.unwrap();
 	assert!(result.data.len() <= 5);
 	assert!(result.data.iter().all(|u| u.is_active));
-	assert!(result.meta.as_ref().unwrap().total.is_some());
+	assert!(
+		result
+			.meta
+			.as_ref()
+			.map(|m| m.total.is_some())
+			.unwrap_or(false),
+		"Meta total should be Some"
+	);
 }
 
 #[tokio::test]
 async fn test_query_user_list_basic() {
-	let app_state = create_mock_app_state().await;
+	let app_state = setup_all_test_environment().await; // Use centralized setup
 	let repo = UsersRepository::new(&app_state);
 	for i in 0..10 {
-		let email = format!("basic{}@example.com", i);
+		let email = format!("basic{i}@example.com");
 		let user = create_test_user(
 			&email,
-			&format!("Basic User {}", i),
+			&format!("Basic User {i}"),
 			true,
 			&get_role_id(&app_state).await,
 		);
-		repo.query_create_user(user).await.unwrap();
+		let create_res = repo.query_create_user(user).await;
+		assert!(
+			create_res.is_ok(),
+			"Failed to create user: {:?}",
+			create_res.err()
+		);
 	}
 	let meta = MetaRequestDto {
 		page: Some(1),
@@ -65,59 +96,103 @@ async fn test_query_user_list_basic() {
 		filter: None,
 		filter_by: None,
 	};
-	let result = repo.query_user_list(meta).await.unwrap();
-	assert!(result.meta.as_ref().unwrap().total.unwrap() >= 1);
-	assert_eq!(result.meta.as_ref().unwrap().page.unwrap(), 1);
-	assert_eq!(result.meta.as_ref().unwrap().per_page.unwrap(), 5);
+	let result = repo.query_user_list(meta).await;
+	assert!(
+		result.is_ok(),
+		"Failed to query user list: {:?}",
+		result.err()
+	);
+	let result = result.unwrap();
+	assert!(
+		result.meta.as_ref().and_then(|m| m.total).unwrap_or(0) >= 1,
+		"Meta total should be >= 1"
+	);
+	assert_eq!(
+		result.meta.as_ref().and_then(|m| m.page).unwrap_or(0),
+		1,
+		"Meta page should be 1"
+	);
+	assert_eq!(
+		result.meta.as_ref().and_then(|m| m.per_page).unwrap_or(0),
+		5,
+		"Meta per_page should be 5"
+	);
 }
 
 #[tokio::test]
 async fn test_query_delete_user() {
-	let app_state = create_mock_app_state().await;
+	let app_state = setup_all_test_environment().await; // Use centralized setup
 	let repo = UsersRepository::new(&app_state);
 	let email = &generate_unique_email("deleteuser");
 	let user =
 		create_test_user(email, "Delete User", true, &get_role_id(&app_state).await);
-	repo.query_create_user(user.clone()).await.unwrap();
-	let user_detail = repo
-		.query_user_by_email(email.to_string().clone())
-		.await
-		.unwrap();
+	let create_res = repo.query_create_user(user.clone()).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create user: {:?}",
+		create_res.err()
+	);
+	let user_detail = repo.query_user_by_email(email.to_string().clone()).await;
+	assert!(
+		user_detail.is_ok(),
+		"Failed to fetch user by email: {:?}",
+		user_detail.err()
+	);
+	let user_detail = user_detail.unwrap();
 	let delete_result = repo
 		.query_delete_user(user_detail.id.id.to_raw().clone())
 		.await;
-	assert!(delete_result.is_ok());
+	assert!(
+		delete_result.is_ok(),
+		"Failed to delete user: {:?}",
+		delete_result.err()
+	);
 	let fetch_result = repo.query_user_by_email(user_detail.email.clone()).await;
-	assert!(fetch_result.is_err());
+	assert!(
+		fetch_result.is_err(),
+		"User should be deleted, but got: {fetch_result:?}"
+	);
 }
 
 #[tokio::test]
 async fn test_delete_non_existent_user_should_fail() {
-	let app_state = create_mock_app_state().await;
+	let app_state = setup_all_test_environment().await; // Use centralized setup
 	let repo = UsersRepository::new(&app_state);
 	let result = repo.query_delete_user("lklklklk".to_string()).await;
-	assert!(result.is_err());
-	assert_eq!(result.unwrap_err().to_string(), "User not found");
+	assert!(result.is_err(), "Delete non-existent user should fail");
+	assert_eq!(
+		result.unwrap_err().to_string(),
+		"User not found in database"
+	);
 }
 
 #[tokio::test]
 async fn test_delete_user_twice_should_fail_on_second_attempt() {
-	let app_state = create_mock_app_state().await;
+	let app_state = setup_all_test_environment().await; // Use centralized setup
 	let repo = UsersRepository::new(&app_state);
 	let email = "twice@example.com";
 	let user =
 		create_test_user(email, "Delete Twice", true, &get_role_id(&app_state).await);
-	repo.query_create_user(user.clone()).await.unwrap();
+	let create_res = repo.query_create_user(user.clone()).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create user: {:?}",
+		create_res.err()
+	);
 	let first = repo.query_delete_user(user.id.id.to_raw()).await;
-	assert!(first.is_ok());
+	assert!(
+		first.is_ok(),
+		"First delete should succeed: {:?}",
+		first.err()
+	);
 	let second = repo.query_delete_user(user.id.id.to_raw()).await;
-	assert!(second.is_err());
+	assert!(second.is_err(), "Second delete should fail");
 	assert_eq!(second.unwrap_err().to_string(), "User not found");
 }
 
 #[tokio::test]
 async fn test_query_update_user_should_succeed() {
-	let state = create_mock_app_state().await;
+	let state = setup_all_test_environment().await; // Use centralized setup
 	let repo = UsersRepository::new(&state);
 	let mut user = create_test_user(
 		"update@example.com",
@@ -125,12 +200,23 @@ async fn test_query_update_user_should_succeed() {
 		true,
 		&get_role_id(&state).await,
 	);
-	repo.query_create_user(user.clone()).await.unwrap();
+	let create_res = repo.query_create_user(user.clone()).await;
+	assert!(
+		create_res.is_ok(),
+		"Failed to create user: {:?}",
+		create_res.err()
+	);
 	user.fullname = "Updated Name".into();
 	user.phone_number = "089876543210".into();
 	let result = repo.query_update_user(user.clone()).await;
 	assert!(result.is_ok(), "Update failed: {:?}", result.err());
-	let updated = repo.query_user_by_id(user.id.id.to_raw()).await.unwrap();
+	let updated = repo.query_user_by_id(&user.id).await;
+	assert!(
+		updated.is_ok(),
+		"Failed to fetch updated user: {:?}",
+		updated.err()
+	);
+	let updated = updated.unwrap();
 	assert_eq!(updated.fullname, "Updated Name");
 	assert_eq!(updated.phone_number, "089876543210");
 }