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.

imphnen-gacha/Cargo.toml

@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-imphnen-iam ={ version = "0.1.0", path = "../imphnen-iam" }
-imphnen-libs = { version = "0.1.0", path = "../imphnen-libs" }
-imphnen-utils = { version = "0.1.0", path = "../imphnen-utils" }
-imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
+imphnen-iam.workspace = true
+imphnen-libs.workspace = true
+imphnen-utils.workspace = true
+imphnen-entities.workspace = true
 axum.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -23,4 +23,6 @@ chrono.workspace = true
 anyhow.workspace = true
 tower-http.workspace = true
 utoipa-swagger-ui.workspace = true
-rand_distr.workspace = true
+rand_distr.workspace = true
+log.workspace = true
+tracing.workspace = true

imphnen-gacha/src/lib.rs

@@ -1,7 +1,3 @@
-use imphnen_entities::*;
-use imphnen_libs::*;
-use imphnen_utils::*;
-
 pub mod v1;
 
 pub use imphnen_entities::*;

imphnen-gacha/src/v1/gacha_claims/gacha_claims_repository.rs

@@ -2,6 +2,8 @@ use super::{GachaClaimQueryDto, GachaClaimSchema};
 use crate::{AppState, ResourceEnum};
 use anyhow::{Result, bail};
 use imphnen_iam::DetailQueryBuilder;
+use std::time::Instant;
+use tracing::instrument;
 
 pub struct GachaClaimRepository<'a> {
 	state: &'a AppState,
@@ -12,10 +14,12 @@ impl<'a> GachaClaimRepository<'a> {
 		Self { state }
 	}
 
+	#[instrument(skip(self, id), err)]
 	pub async fn query_gacha_claim_by_id(
 		&self,
 		id: String,
 	) -> Result<GachaClaimQueryDto> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let builder = DetailQueryBuilder::new(ResourceEnum::GachaClaims.to_string())
 			.with_id(id.clone())
@@ -25,21 +29,35 @@ impl<'a> GachaClaimRepository<'a> {
 		let sql = builder.build();
 		let result: Option<GachaClaimQueryDto> =
 			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_gacha_claim_by_id' took: {elapsed:.2?}");
+		}
 		match result {
 			Some(claim) if !claim.is_deleted => Ok(claim),
 			_ => bail!("Gacha Claim not found"),
 		}
 	}
 
+	#[instrument(skip(self, data), err)]
 	pub async fn query_create_gacha_claim(
 		&self,
 		data: GachaClaimSchema,
 	) -> Result<String> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let record: Option<GachaClaimSchema> = db
 			.create(ResourceEnum::GachaClaims.to_string())
 			.content(data)
 			.await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_create_gacha_claim' took: {elapsed:.2?}");
+		}
 		match record {
 			Some(_) => Ok("Success create Gacha Claim".into()),
 			None => bail!("Failed to create Gacha Claim"),

imphnen-gacha/src/v1/gacha_credits/gacha_credits_repository.rs

@@ -2,7 +2,9 @@ use super::{GachaCreditRequestDto, GachaCreditSchema};
 use crate::{AppState, ResourceEnum};
 use anyhow::{Result, bail};
 use imphnen_iam::make_thing;
+use std::time::Instant;
 use surrealdb::Uuid;
+use tracing::instrument;
 
 pub struct GachaCreditRepository<'a> {
 	state: &'a AppState,
@@ -13,28 +15,54 @@ impl<'a> GachaCreditRepository<'a> {
 		Self { state }
 	}
 
+	#[instrument(skip(self, user_id), err)]
 	pub async fn query_by_user_id(
 		&self,
 		user_id: String,
 	) -> Result<Option<GachaCreditSchema>> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let sql = format!(
 			"SELECT * FROM {} WHERE user = {}:⟨$user_id⟩ AND is_deleted = false LIMIT 1",
-			ResourceEnum::GachaCredits.to_string(),
-			ResourceEnum::Users.to_string()
+			ResourceEnum::GachaCredits,
+			ResourceEnum::Users
 		);
 		let result: Vec<GachaCreditSchema> =
 			db.query(sql).bind(("user_id", user_id)).await?.take(0)?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_by_user_id' took: {elapsed:.2?}");
+		}
 		Ok(result.into_iter().next())
 	}
 
+	#[instrument(skip(self, user_id), err)]
 	pub async fn query_consume_credit(&self, user_id: String) -> Result<()> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let credit_opt = self.query_by_user_id(user_id).await?;
 		let Some(mut credit) = credit_opt else {
+			let elapsed = now.elapsed();
+			if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+				== "development"
+			{
+				println!(
+					"Query 'query_consume_credit' took: {elapsed:.2?} (no credit to consume)"
+				);
+			}
 			return Ok(());
 		};
 		if credit.available_rolls <= 0 {
+			let elapsed = now.elapsed();
+			if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+				== "development"
+			{
+				println!(
+					"Query 'query_consume_credit' took: {elapsed:.2?} (no rolls remaining)"
+				);
+			}
 			bail!("No extra roll credits remaining");
 		}
 		credit.available_rolls -= 1;
@@ -45,13 +73,21 @@ impl<'a> GachaCreditRepository<'a> {
 			))
 			.merge(credit)
 			.await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_consume_credit' took: {elapsed:.2?}");
+		}
 		Ok(())
 	}
 
+	#[instrument(skip(self, payload), err)]
 	pub async fn query_add_credit(
 		&self,
 		payload: GachaCreditRequestDto,
 	) -> Result<()> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		if let Some(mut credit) = self.query_by_user_id(payload.user_id.clone()).await? {
 			credit.available_rolls += payload.amount;
@@ -63,7 +99,7 @@ impl<'a> GachaCreditRepository<'a> {
 				.merge(credit)
 				.await?;
 		} else {
-			let data = GachaCreditSchema::from(&GachaCreditSchema {
+			let data = GachaCreditSchema {
 				id: make_thing(
 					&ResourceEnum::GachaCredits.to_string(),
 					&Uuid::new_v4().to_string(),
@@ -71,12 +107,18 @@ impl<'a> GachaCreditRepository<'a> {
 				user: make_thing(&ResourceEnum::Users.to_string(), &payload.user_id),
 				available_rolls: payload.amount,
 				..Default::default()
-			});
+			};
 			let _: Option<GachaCreditSchema> = db
-				.create(&ResourceEnum::GachaCredits.to_string())
+				.create(ResourceEnum::GachaCredits.to_string())
 				.content(data)
 				.await?;
 		}
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_add_credit' took: {elapsed:.2?}");
+		}
 		Ok(())
 	}
 }

imphnen-gacha/src/v1/gacha_items/gacha_items_repository.rs

@@ -5,6 +5,10 @@ use crate::{
 };
 use anyhow::{Result, bail};
 use imphnen_iam::QueryListBuilder;
+use imphnen_utils::get_iso_date;
+use serde_json::{Map, Value};
+use std::time::Instant;
+use tracing::instrument;
 
 pub struct GachaItemRepository<'a> {
 	state: &'a AppState,
@@ -15,10 +19,12 @@ impl<'a> GachaItemRepository<'a> {
 		Self { state }
 	}
 
+	#[instrument(skip(self, meta), err)]
 	pub async fn query_gacha_item_list(
 		&self,
 		meta: MetaRequestDto,
 	) -> Result<ResponseListSuccessDto<Vec<GachaItemDto>>> {
+		let now = Instant::now();
 		let raw_result: ResponseListSuccessDto<Vec<GachaItemSchema>> =
 			QueryListBuilder::new(
 				&self.state.surrealdb_ws,
@@ -30,6 +36,12 @@ impl<'a> GachaItemRepository<'a> {
 			.select_fields(vec!["*"])
 			.build()
 			.await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_gacha_item_list' took: {elapsed:.2?}");
+		}
 		let data = raw_result
 			.data
 			.into_iter()
@@ -41,36 +53,54 @@ impl<'a> GachaItemRepository<'a> {
 		})
 	}
 
+	#[instrument(skip(self, id), err)]
 	pub async fn query_gacha_item_by_id(&self, id: String) -> Result<GachaItemSchema> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let result: Option<GachaItemSchema> = db
 			.select((ResourceEnum::GachaItems.to_string(), id.clone()))
 			.await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_gacha_item_by_id' took: {elapsed:.2?}");
+		}
 		match result {
 			Some(item) if !item.is_deleted => Ok(item),
 			_ => bail!("Gacha Item not found"),
 		}
 	}
 
+	#[instrument(skip(self, data), err)]
 	pub async fn query_create_gacha_item(
 		&self,
 		data: GachaItemSchema,
 	) -> Result<String> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let record: Option<GachaItemSchema> = db
 			.create(ResourceEnum::GachaItems.to_string())
 			.content(data)
 			.await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_create_gacha_item' took: {elapsed:.2?}");
+		}
 		match record {
 			Some(_) => Ok("Success create Gacha Item".into()),
 			None => bail!("Failed to create Gacha Item"),
 		}
 	}
 
+	#[instrument(skip(self, data), err)]
 	pub async fn query_update_gacha_item(
 		&self,
 		data: GachaItemSchema,
 	) -> Result<String> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let record_key = get_id(&data.id)?;
 		let existing = self.query_gacha_item_by_id(data.id.id.to_raw()).await?;
@@ -83,13 +113,21 @@ impl<'a> GachaItemRepository<'a> {
 		};
 		let record: Option<GachaItemSchema> =
 			db.update(record_key).merge(merged).await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_update_gacha_item' took: {elapsed:.2?}");
+		}
 		match record {
 			Some(_) => Ok("Success update Gacha Item".into()),
 			None => bail!("Failed to update Gacha Item"),
 		}
 	}
 
+	#[instrument(skip(self, id), err)]
 	pub async fn query_delete_gacha_item(&self, id: String) -> Result<String> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let item_id = make_thing(&ResourceEnum::GachaItems.to_string(), &id);
 		let item = self.query_gacha_item_by_id(item_id.id.to_raw()).await?;
@@ -97,13 +135,20 @@ impl<'a> GachaItemRepository<'a> {
 			bail!("Gacha Item already deleted");
 		}
 		let record_key = get_id(&item.id)?;
-		let record: Option<GachaItemSchema> = db
-			.update(record_key)
-			.merge(serde_json::json!({ "is_deleted": true }))
-			.await?;
+		let mut patch = Map::new();
+		patch.insert("is_deleted".to_string(), Value::Bool(true));
+		patch.insert("updated_at".to_string(), Value::String(get_iso_date()));
+
+		let record: Option<GachaItemSchema> = db.update(record_key).merge(patch).await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_delete_gacha_item' took: {elapsed:.2?}");
+		}
 		match record {
-			Some(_) => Ok("Success delete Gacha Item".into()),
-			None => bail!("Failed to delete Gacha Item"),
+			Some(_) => Ok("Success soft delete Gacha Item".into()),
+			None => bail!("Failed to soft delete Gacha Item"),
 		}
 	}
 }

imphnen-gacha/src/v1/gacha_items/gacha_items_service.rs

@@ -45,7 +45,12 @@ impl GachaItemService {
 			return common_response(status, &message);
 		}
 		let repo = GachaItemRepository::new(state);
-		let schema = GachaItemSchema::from(payload);
+		let schema = GachaItemSchema {
+			id: make_thing(&ResourceEnum::GachaItems.to_string(), &payload.name), // Fixed: Use payload.name or some other identifier
+			name: payload.name,
+			image_url: payload.image_url,
+			..Default::default()
+		};
 		match repo.query_create_gacha_item(schema).await {
 			Ok(msg) => common_response(StatusCode::CREATED, &msg),
 			Err(e) => common_response(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),

imphnen-gacha/src/v1/gacha_rolls/gacha_rolls_controller.rs

@@ -91,3 +91,32 @@ pub async fn post_execute_gacha_roll(
 		Err(response) => response,
 	}
 }
+
+#[utoipa::path(
+    delete,
+    path = "/v1/gacha/rolls/delete/{id}",
+    security(
+        ("Bearer" = [])
+    ),
+    params(("id" = String, Path, description = "Gacha Roll ID")),
+    responses(
+        (status = 200, description = "Delete Gacha Roll (soft delete)", body = MessageResponseDto)
+    ),
+    tag = "Gacha"
+)]
+pub async fn delete_gacha_roll(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Path(id): Path<String>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::DeleteGachaRolls],
+	)
+	.await
+	{
+		Ok(_) => GachaRollService::soft_delete_gacha_roll(&state, id).await,
+		Err(response) => response,
+	}
+}

imphnen-gacha/src/v1/gacha_rolls/gacha_rolls_dto.rs

@@ -29,7 +29,7 @@ impl GachaRollItemDto {
 		Self {
 			id: dto.id.id.to_raw(),
 			item: GachaItemDto::from(dto.item.clone()),
-			weight: dto.weight.clone(),
+			weight: dto.weight,
 			quantity: dto.quantity,
 			is_deleted: dto.is_deleted,
 			created_at: dto.created_at.clone(),

imphnen-gacha/src/v1/gacha_rolls/gacha_rolls_repository.rs

@@ -1,11 +1,15 @@
 use super::GachaRollQueryDto;
 use super::GachaRollSchema;
-use crate::{AppState, DetailQueryBuilder, ResourceEnum};
+use crate::{AppState, DetailQueryBuilder, ResourceEnum, get_id, make_thing};
 use anyhow::{Result, bail};
-use imphnen_iam::ListQueryBuilder;
+
 use rand::prelude::*;
-use rand::rng;
+
+use imphnen_utils::get_iso_date;
 use rand_distr::weighted::WeightedIndex;
+use serde_json::{Map, Value};
+use std::time::Instant;
+use tracing::instrument;
 
 pub struct GachaRollRepository<'a> {
 	state: &'a AppState,
@@ -16,46 +20,70 @@ impl<'a> GachaRollRepository<'a> {
 		Self { state }
 	}
 
+	#[instrument(skip(self, id), err)]
 	pub async fn query_gacha_roll_by_id(
 		&self,
 		id: String,
 	) -> Result<GachaRollQueryDto> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let builder = DetailQueryBuilder::new(ResourceEnum::GachaRolls.to_string())
 			.with_id(id.clone())
+			.with_condition("is_deleted = false")
 			.with_select_fields(vec!["*"])
 			.with_fetch("item");
 		let sql = builder.build();
 		let result: Option<GachaRollQueryDto> =
 			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_gacha_roll_by_id' took: {elapsed:.2?}");
+		}
 		match result {
 			Some(roll) if !roll.is_deleted => Ok(roll),
 			_ => bail!("Gacha Roll not found"),
 		}
 	}
 
+	#[instrument(skip(self, data), err)]
 	pub async fn query_create_gacha_roll(
 		&self,
 		data: GachaRollSchema,
 	) -> Result<String> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
 		let record: Option<GachaRollSchema> = db
 			.create(ResourceEnum::GachaRolls.to_string())
 			.content(data)
 			.await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_create_gacha_roll' took: {elapsed:.2?}");
+		}
 		match record {
 			Some(_) => Ok("Success create Gacha Roll".into()),
 			None => bail!("Failed to create Gacha Roll"),
 		}
 	}
 
+	#[instrument(skip(self), err)]
 	pub async fn query_all_active_rolls(&self) -> Result<Vec<GachaRollQueryDto>> {
+		let now = Instant::now();
 		let db = &self.state.surrealdb_ws;
-		let builder = ListQueryBuilder::new(ResourceEnum::GachaRolls.to_string())
-			.with_select_fields(vec!["*"])
-			.with_fetch(Some(vec!["item"]));
-		let sql = builder.build();
+		let table_name = ResourceEnum::GachaRolls.to_string();
+		let sql =
+			format!("SELECT * FROM {table_name} WHERE is_deleted = false FETCH item");
 		let result: Vec<GachaRollQueryDto> = db.query(sql).await?.take(0)?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_all_active_rolls' took: {elapsed:.2?}");
+		}
 		Ok(result)
 	}
 
@@ -72,8 +100,36 @@ impl<'a> GachaRollRepository<'a> {
 			return None;
 		}
 		let dist = WeightedIndex::new(&weights).ok()?;
-		let mut rng = rng();
+		let mut rng = rand::rngs::ThreadRng::default();
 		let index = dist.sample(&mut rng);
 		Some(filtered[index].clone())
 	}
+
+	#[instrument(skip(self, id), err)]
+	pub async fn query_soft_delete_gacha_roll(&self, id: String) -> Result<String> {
+		let now = Instant::now();
+		let db = &self.state.surrealdb_ws;
+		let roll_id_thing = make_thing(&ResourceEnum::GachaRolls.to_string(), &id);
+		let roll = self.query_gacha_roll_by_id(id.clone()).await?;
+		if roll.is_deleted {
+			bail!("Gacha Roll already deleted");
+		}
+		let record_key = get_id(&roll_id_thing)?;
+
+		let mut patch = Map::new();
+		patch.insert("is_deleted".to_string(), Value::Bool(true));
+		patch.insert("updated_at".to_string(), Value::String(get_iso_date()));
+
+		let record: Option<GachaRollSchema> = db.update(record_key).merge(patch).await?;
+		let elapsed = now.elapsed();
+		if std::env::var("RUST_ENV").unwrap_or_else(|_| "development".to_string())
+			== "development"
+		{
+			println!("Query 'query_soft_delete_gacha_roll' took: {elapsed:.2?}");
+		}
+		match record {
+			Some(_) => Ok("Success soft delete Gacha Roll".into()),
+			None => bail!("Failed to soft delete Gacha Roll"),
+		}
+	}
 }

imphnen-gacha/src/v1/gacha_rolls/gacha_rolls_service.rs

@@ -63,4 +63,12 @@ impl GachaRollService {
 			Err(e) => common_response(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
 		}
 	}
+
+	pub async fn soft_delete_gacha_roll(state: &AppState, id: String) -> Response {
+		let repo = GachaRollRepository::new(state);
+		match repo.query_soft_delete_gacha_roll(id).await {
+			Ok(msg) => common_response(StatusCode::OK, &msg),
+			Err(e) => common_response(StatusCode::NOT_FOUND, &e.to_string()),
+		}
+	}
 }