chore: cleaning code

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
+2
View File
@@ -8,6 +8,7 @@ imphnen-libs = { version = "0.1.0", path = "../imphnen-libs" }
imphnen-utils = { version = "0.1.0", path = "../imphnen-utils" }
imphnen-gateway = { version = "0.1.0", path = "../imphnen-gateway" }
imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
imphnen-iam = { version = "0.1.0", path = "../imphnen-iam" }
axum.workspace = true
serde.workspace = true
serde_json.workspace = true
@@ -23,3 +24,4 @@ chrono.workspace = true
anyhow.workspace = true
tower-http.workspace = true
utoipa-swagger-ui.workspace = true
env_logger.workspace = true
+2
View File
@@ -1,8 +1,10 @@
use env_logger;
use imphnen_gateway::gateway_service;
use imphnen_libs::axum_init;
#[tokio::main]
async fn main() {
env_logger::init();
axum_init(|surrealdb_ws, surrealdb_mem| async {
gateway_service(surrealdb_ws, surrealdb_mem).await
})
@@ -1,4 +1,4 @@
use imphnen_utils::{get_iso_date, make_thing, Env};
use imphnen_iam::{get_iso_date, make_thing, Env};
use std::error::Error;
use surrealdb::{engine::remote::ws::Ws, opt::auth::Root, Surreal};
@@ -17,43 +17,41 @@ async fn main() -> Result<(), Box<dyn Error>> {
.use_db(env.surrealdb_dbname)
.await?;
let role_permissions = vec![
(
"50133429-f4b1-4249-9f97-7b86e6ee9d86",
vec![
"7c15e31d-36e2-49f9-97db-138c03fb0cf6",
"319ee593-ff0a-4f29-bbaf-9feb3174a3a6",
],
),
(
"f6b03f25-e416-4893-ac88-caaa690afb07",
vec![
"023e2dfe-93c3-4008-94a8-b5dff403f73b",
"96df0689-2ae9-4894-bf00-837c19415e5c",
"98b3dc4c-0124-461f-afcd-166637c5e6e8",
"319ee593-ff0a-4f29-bbaf-9feb3174a3a6",
"7c15e31d-36e2-49f9-97db-138c03fb0cf6",
"9164ca6e-c7e3-4238-a15f-f36ab9577e7e",
"319ee593-ff0a-4f29-bbaf-9feb3174a3a2",
"a00d5608-4c48-4542-845c-dfe004687022",
"35b0d992-65c8-4b62-b030-e6e0320e4048",
],
),
let admin_permissions = vec![
"023e2dfe-93c3-4008-94a8-b5dff403f73b",
"0269ed71-0ae0-4c43-ad29-e3d861d8f9a0",
"299cb4d5-6556-4cc9-b6c1-32e6d31e0f9b",
"319ee593-ff0a-4f29-bbaf-9feb3174a3a2",
"319ee593-ff0a-4f29-bbaf-9feb3174a3a6",
"35b0d992-65c8-4b62-b030-e6e0320e4048",
"4da8b434-89f9-4d91-85ae-eebd63cdbeda",
"73888d18-b3e9-4f62-95a5-ba2c0d69fccb",
"7c15e31d-36e2-49f9-97db-138c03fb0cf6",
"7d4b1379-4960-416a-b045-98cd82c0cac9",
"8195eeb8-e64f-4172-aa57-596492c84a72",
"81eba91d-b8ab-44b9-bbfe-4e6da2f98952",
"9164ca6e-c7e3-4238-a15f-f36ab9577e7e",
"96df0689-2ae9-4894-bf00-837c19415e5c",
"98b3dc4c-0124-461f-afcd-166637c5e6e8",
"a00d5608-4c48-4542-845c-dfe004687022",
"b2dc3928-86ba-4c59-a03d-0b57d5183ebc",
"dad435cf-042c-41bd-a946-cea61ed2ffbc",
];
for (role_id, permission_ids) in role_permissions {
let permission_refs: Vec<_> = permission_ids
.into_iter()
.map(|perm_id| make_thing("app_permissions", perm_id))
.collect();
db.query("UPDATE type::thing('app_roles', $role_id) SET permissions = $permissions, updated_at = $updated_at")
.bind(("role_id", role_id))
.bind(("permissions", permission_refs))
.bind(("updated_at", get_iso_date()))
.await?;
println!("✅ Updated permissions for role ID: {}", role_id);
}
println!("✅ All Roles permissions seeded");
let admin_role_id = "f6b03f25-e416-4893-ac88-caaa690afb07";
let permission_refs_admin: Vec<_> = admin_permissions
.into_iter()
.map(|perm_id| make_thing("app_permissions", perm_id))
.collect();
db.query("UPDATE type::thing('app_roles', $role_id) SET permissions = $permissions, updated_at = $updated_at WHERE is_deleted = false")
.bind(("role_id", admin_role_id))
.bind(("permissions", permission_refs_admin))
.bind(("updated_at", get_iso_date()))
.await?;
println!("✅ All permissions successfully added to each role");
Ok(())
}
+1 -30
View File
@@ -1,31 +1,8 @@
use imphnen_iam::UsersSchema;
use imphnen_utils::{get_iso_date, hash_password, Env};
use serde::{Deserialize, Serialize};
use std::error::Error;
use surrealdb::{engine::remote::ws::Ws, opt::auth::Root, sql::Thing, Surreal};
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct UsersSchema {
pub id: Thing,
pub fullname: String,
pub email: String,
pub password: String,
pub avatar: Option<String>,
pub phone_number: String,
pub referral_code: Option<String>,
pub referred_by: Option<String>,
pub identity_number: Option<String>,
pub is_active: bool,
pub is_deleted: bool,
pub student_type: String,
pub religion: Option<String>,
pub gender: Option<String>,
pub birthdate: Option<String>,
pub is_profile_completed: bool,
pub role: Thing,
pub created_at: String,
pub updated_at: String,
}
#[tokio::main]
async fn main() -> Result<(), Box<dyn Error>> {
let env = Env::new();
@@ -68,16 +45,10 @@ async fn main() -> Result<(), Box<dyn Error>> {
password: hash_password("password").unwrap(),
avatar: None,
phone_number: "081234567890".into(),
referral_code: None,
referred_by: None,
identity_number: None,
is_active: true,
is_deleted: false,
student_type: "TNI".into(),
religion: None,
gender: None,
birthdate: None,
is_profile_completed: false,
role: Thing::from(("app_roles", role_id)),
created_at: get_iso_date(),
updated_at: get_iso_date(),