MythEclipse/imphnen-backend-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: cleaning code

Browse Source
This commit is contained in:
Maulana Sodiqin
2025-05-20 01:49:50 +07:00
parent d97095a38d
commit 1e5ed26f76
19 changed files with 274 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imphnen-iam/src/v1/permissions/permissions_controller.rs
+7 -4
View File
@@ -1,23 +1,26 @@
use axum::{
Extension, Json,
extract::{Path, Query},
response::IntoResponse,
Extension, Json,
};
use crate::{
AppState, MessageResponseDto, MetaRequestDto, ResponseListSuccessDto,
ResponseSuccessDto,
v1::{
permissions_dto::{PermissionsItemDto, PermissionsRequestDto},
permissions_service::PermissionsService,
},
AppState, MessageResponseDto, MetaRequestDto, ResponseListSuccessDto,
ResponseSuccessDto,
};
use super::{permissions_guard, PermissionsEnum};
use super::{PermissionsEnum, permissions_guard};
#[utoipa::path(
get,
path = "/v1/permissions",
security(
("Bearer" = [])
),
params(
("page" = Option<i64>, Query, description = "Page number"),
("per_page" = Option<i64>, Query, description = "Items per page"),
imphnen-iam/src/v1/permissions/permissions_repository.rs
+2 -6
View File
@@ -36,17 +36,13 @@ impl<'a> PermissionsRepository<'a> {
None,
"name",
None,
None,
)
.await?;
let transformed_data = raw_result
.data
.into_iter()
.map(|permission| PermissionsItemDto {
id: extract_id(&permission.id),
name: permission.name,
created_at: permission.created_at,
updated_at: permission.updated_at,
})
.map(|permission| PermissionsSchema::list(&permission))
.collect();
Ok(ResponseListSuccessDto {
data: transformed_data,
imphnen-iam/src/v1/permissions/permissions_schema.rs
+13
View File
@@ -2,6 +2,8 @@ use crate::{ResourceEnum, make_thing};
use serde::{Deserialize, Serialize};
use surrealdb::{Uuid, sql::Thing};
use super::PermissionsItemDto;
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct PermissionsSchema {
pub id: Thing,
@@ -25,3 +27,14 @@ impl Default for PermissionsSchema {
}
}
}
impl PermissionsSchema {
pub fn list(&self) -> PermissionsItemDto {
PermissionsItemDto {
id: self.id.id.to_raw(),
name: self.name.clone(),
created_at: self.created_at.clone(),
updated_at: self.updated_at.clone(),
}
}
}
imphnen-iam/src/v1/roles/roles_repository.rs
+12 -18
View File
@@ -35,27 +35,21 @@ impl<'a> RolesRepository<'a> {
conditions.push(format!("{} = $filter", filter_by));
}
}
let raw_result: ResponseListSuccessDto<Vec<RolesDetailQueryDto>> =
query_list_with_meta(
&self.state.surrealdb_ws,
&ResourceEnum::Roles.to_string(),
&meta,
conditions,
None,
"name",
None,
)
.await?;
let raw_result: ResponseListSuccessDto<Vec<RolesSchema>> = query_list_with_meta(
&self.state.surrealdb_ws,
&ResourceEnum::Roles.to_string(),
&meta,
conditions,
None,
"name",
None,
None,
)
.await?;
let data = raw_result
.data
.into_iter()
.map(|role| RolesListItemDto {
id: extract_id(&role.id),
name: role.name,
created_at: role.created_at,
updated_at: role.updated_at,
permissions_count: role.permissions.len(),
})
.map(|role| RolesSchema::list(&role))
.collect();
Ok(ResponseListSuccessDto {
data,
imphnen-iam/src/v1/roles/roles_schema.rs
+11 -1
View File
@@ -1,5 +1,5 @@
use super::{
RolesDetailItemDto, RolesDetailQueryDto, RolesRequestCreateDto,
RolesDetailItemDto, RolesDetailQueryDto, RolesListItemDto, RolesRequestCreateDto,
RolesRequestUpdateDto,
};
use crate::{ResourceEnum, make_thing};
@@ -112,4 +112,14 @@ impl RolesSchema {
updated_at: Some(get_iso_date()),
}
}
pub fn list(&self) -> RolesListItemDto {
RolesListItemDto {
id: self.id.id.to_raw(),
name: self.name.clone(),
permissions_count: self.permissions.len(),
created_at: self.created_at.clone(),
updated_at: self.updated_at.clone(),
}
}
}
imphnen-iam/src/v1/users/users_dto.rs
+22 -2
View File
@@ -139,10 +139,10 @@ pub struct UsersListQueryDto {
}
impl UsersListQueryDto {
pub fn from(&self, role: String) -> UsersListItemDto {
pub fn from(&self) -> UsersListItemDto {
UsersListItemDto {
id: self.id.id.to_raw(),
role,
role: self.role.name.clone(),
fullname: self.fullname.clone(),
email: self.email.clone(),
avatar: self.avatar.clone(),
@@ -170,3 +170,23 @@ pub struct UsersDetailQueryDto {
pub created_at: String,
pub updated_at: String,
}
impl UsersDetailQueryDto {
pub fn from(&self) -> Self {
Self {
id: self.id.clone(),
role: RolesDetailQueryDto::from(self.role.clone()),
fullname: self.fullname.clone(),
email: self.email.clone(),
avatar: self.avatar.clone(),
phone_number: self.phone_number.clone(),
is_active: self.is_active,
gender: self.gender.clone(),
is_deleted: self.is_deleted,
password: self.password.clone(),
birthdate: self.birthdate.clone(),
created_at: self.created_at.clone(),
updated_at: self.updated_at.clone(),
}
}
}
imphnen-iam/src/v1/users/users_repository.rs
+9 -114
View File
@@ -1,8 +1,7 @@
use super::{UsersDetailQueryDto, UsersListItemDto, UsersListQueryDto, UsersSchema};
use crate::{
AppState, MetaRequestDto, PermissionsQueryDto, ResourceEnum,
ResponseListSuccessDto, RolesDetailQueryDto, get_id, make_thing,
query_list_with_meta,
AppState, MetaRequestDto, ResourceEnum, ResponseListSuccessDto, get_id,
make_thing, query_list_with_meta,
};
use anyhow::{Result, bail};
use imphnen_utils::DetailQueryBuilder;
@@ -45,25 +44,15 @@ impl<'a> UsersRepository<'a> {
vec!["is_deleted = false".into()],
None,
"fullname",
Some(vec![
"email",
"fullname",
"id",
"is_active",
"is_deleted",
"role",
"role.permissions",
]),
Some(vec!["*"]),
Some(vec!["role", "role.permissions"]),
)
.await?;
let data = raw_result
.data
.into_iter()
.map(|schema| {
let role = schema.clone().role.name;
schema.from(role)
})
.map(|schema| UsersListQueryDto::from(&schema))
.collect::<Vec<_>>();
Ok(ResponseListSuccessDto {
@@ -81,21 +70,7 @@ impl<'a> UsersRepository<'a> {
let builder = DetailQueryBuilder::new(ResourceEnum::Users.to_string())
.with_where("email")
.where_value(email.clone())
.with_select_fields(vec![
"id",
"fullname",
"email",
"avatar",
"phone_number",
"is_active",
"is_deleted",
"gender",
"birthdate",
"password",
"created_at",
"updated_at",
"role",
])
.with_select_fields(vec!["*"])
.with_fetch("role")
.with_fetch("role.permissions");
@@ -112,40 +87,7 @@ impl<'a> UsersRepository<'a> {
bail!("User not found");
}
let permissions = user
.role
.permissions
.into_iter()
.map(|perm| PermissionsQueryDto {
id: perm.id,
name: perm.name,
created_at: perm.created_at,
updated_at: perm.updated_at,
})
.collect();
Ok(UsersDetailQueryDto {
id: user.id,
fullname: user.fullname,
email: user.email,
avatar: user.avatar,
phone_number: user.phone_number,
is_active: user.is_active,
is_deleted: user.is_deleted,
gender: user.gender,
birthdate: user.birthdate,
password: user.password,
created_at: user.created_at,
updated_at: user.updated_at,
role: RolesDetailQueryDto {
id: user.role.id,
name: user.role.name,
created_at: user.role.created_at,
updated_at: user.role.updated_at,
is_deleted: user.role.is_deleted,
permissions,
},
})
Ok(UsersDetailQueryDto::from(&user))
}
pub async fn query_user_by_id(&self, id: String) -> Result<UsersDetailQueryDto> {
@@ -153,21 +95,7 @@ impl<'a> UsersRepository<'a> {
let builder = DetailQueryBuilder::new(ResourceEnum::Users.to_string())
.with_id(&id)
.with_select_fields(vec![
"id",
"fullname",
"email",
"avatar",
"phone_number",
"is_active",
"is_deleted",
"gender",
"birthdate",
"password",
"created_at",
"updated_at",
"role",
])
.with_select_fields(vec!["*"])
.with_fetch("role")
.with_fetch("role.permissions");
@@ -184,40 +112,7 @@ impl<'a> UsersRepository<'a> {
bail!("User not found");
}
let permissions = user
.role
.permissions
.into_iter()
.map(|perm| PermissionsQueryDto {
id: perm.id,
name: perm.name,
created_at: perm.created_at,
updated_at: perm.updated_at,
})
.collect();
Ok(UsersDetailQueryDto {
id: user.id,
fullname: user.fullname,
email: user.email,
avatar: user.avatar,
phone_number: user.phone_number,
is_active: user.is_active,
is_deleted: user.is_deleted,
gender: user.gender,
birthdate: user.birthdate,
password: user.password,
created_at: user.created_at,
updated_at: user.updated_at,
role: RolesDetailQueryDto {
id: user.role.id,
name: user.role.name,
created_at: user.role.created_at,
updated_at: user.role.updated_at,
is_deleted: user.role.is_deleted,
permissions,
},
})
Ok(UsersDetailQueryDto::from(&user))
}
pub async fn query_create_user(&self, data: UsersSchema) -> Result<String> {