feat: add gacha and init cms

Merge pull request #24 from IMPHNEN/chore/normalize-code
chore: normalize code
2025-05-20 10:45:01 +07:00 · 2025-05-20 01:50:58 +07:00 · 2025-05-20 01:49:50 +07:00 · 2025-05-20 00:26:24 +07:00 · 2025-05-18 03:12:20 +07:00 · 2025-05-17 02:08:59 +07:00
118 changed files with 2978 additions and 1567 deletions
@@ -115,6 +115,56 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+dependencies = [
+ "anstyle",
+ "once_cell",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "any_ascii"
 version = "0.3.2"
@@ -123,9 +173,9 @@ checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c"

 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"

 [[package]]
 name = "approx"
@@ -357,9 +407,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

 [[package]]
 name = "axum"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288"
+checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
 dependencies = [
 "axum-core",
 "bytes",
@@ -736,9 +786,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@@ -796,6 +846,12 @@ dependencies = [
 "inout",
 ]

+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1036,10 +1092,10 @@ dependencies = [
 ]

 [[package]]
-name = "doc-comment"
-version = "0.3.3"
+name = "double-ended-peekable"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
+checksum = "c0d05e1c0dbad51b52c38bda7adceef61b9efc2baf04acfe8726a8c4630a6f57"

 [[package]]
 name = "earcutr"
@@ -1097,6 +1153,29 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"

+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -1385,7 +1464,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62ddb1950450d67efee2bbc5e429c68d052a822de3aad010d28b351fbb705224"
 dependencies = [
 "approx 0.5.1",
- "arbitrary",
 "num-traits",
 "rstar",
 "serde",
@@ -1492,12 +1570,6 @@ dependencies = [
 "stable_deref_trait",
 ]

-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1847,19 +1919,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"

 [[package]]
-name = "imphnen-backend-service"
+name = "imphnen-backend"
 version = "0.1.0"
 dependencies = [
 "anyhow",
 "axum",
 "axum-test",
 "chrono",
+ "env_logger",
 "imphnen-entities",
- "imphnen-gateway-service",
+ "imphnen-gateway",
+ "imphnen-iam",
 "imphnen-libs",
 "imphnen-utils",
 "lazy_static",
- "rand 0.9.0",
+ "rand 0.9.1",
 "regex",
 "serde",
 "serde_json",
@@ -1872,7 +1946,7 @@ dependencies = [
 ]

 [[package]]
-name = "imphnen-dimentorin-service"
+name = "imphnen-cms"
 version = "0.1.0"
 dependencies = [
 "anyhow",
@@ -1883,7 +1957,31 @@ dependencies = [
 "imphnen-libs",
 "imphnen-utils",
 "lazy_static",
- "rand 0.9.0",
+ "rand 0.9.1",
+ "regex",
+ "serde",
+ "serde_json",
+ "surrealdb",
+ "tokio",
+ "tower-http",
+ "utoipa",
+ "utoipa-swagger-ui",
+ "validator",
+]
+
+[[package]]
+name = "imphnen-dimentorin"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "axum",
+ "axum-test",
+ "chrono",
+ "imphnen-entities",
+ "imphnen-libs",
+ "imphnen-utils",
+ "lazy_static",
+ "rand 0.9.1",
 "regex",
 "serde",
 "serde_json",
@@ -1907,7 +2005,7 @@ dependencies = [
 ]

 [[package]]
-name = "imphnen-gacha-service"
+name = "imphnen-gacha"
 version = "0.1.0"
 dependencies = [
 "anyhow",
@@ -1915,10 +2013,12 @@ dependencies = [
 "axum-test",
 "chrono",
 "imphnen-entities",
+ "imphnen-iam",
 "imphnen-libs",
 "imphnen-utils",
 "lazy_static",
- "rand 0.9.0",
+ "rand 0.9.1",
+ "rand_distr",
 "regex",
 "serde",
 "serde_json",
@@ -1931,7 +2031,7 @@ dependencies = [
 ]

 [[package]]
-name = "imphnen-gateway-service"
+name = "imphnen-gateway"
 version = "0.1.0"
 dependencies = [
 "anyhow",
@@ -1939,11 +2039,13 @@ dependencies = [
 "axum-test",
 "chrono",
 "imphnen-entities",
- "imphnen-iam-service",
+ "imphnen-gacha",
+ "imphnen-iam",
 "imphnen-libs",
+ "imphnen-middleware",
 "imphnen-utils",
 "lazy_static",
- "rand 0.9.0",
+ "rand 0.9.1",
 "regex",
 "serde",
 "serde_json",
@@ -1956,7 +2058,7 @@ dependencies = [
 ]

 [[package]]
-name = "imphnen-iam-service"
+name = "imphnen-iam"
 version = "0.1.0"
 dependencies = [
 "anyhow",
@@ -1967,7 +2069,7 @@ dependencies = [
 "imphnen-libs",
 "imphnen-utils",
 "lazy_static",
- "rand 0.9.0",
+ "rand 0.9.1",
 "regex",
 "serde",
 "serde_json",
@@ -1989,11 +2091,39 @@ dependencies = [
 "imphnen-entities",
 "jsonwebtoken",
 "lettre",
+ "log",
 "serde",
 "surrealdb",
 "tokio",
 ]

+[[package]]
+name = "imphnen-middleware"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "axum",
+ "axum-test",
+ "chrono",
+ "futures",
+ "imphnen-entities",
+ "imphnen-iam",
+ "imphnen-libs",
+ "imphnen-utils",
+ "lazy_static",
+ "rand 0.9.1",
+ "regex",
+ "serde",
+ "serde_json",
+ "surrealdb",
+ "tokio",
+ "tower",
+ "tower-http",
+ "utoipa",
+ "utoipa-swagger-ui",
+ "validator",
+]
+
 [[package]]
 name = "imphnen-utils"
 version = "0.1.0"
@@ -2004,7 +2134,7 @@ dependencies = [
 "chrono",
 "imphnen-entities",
 "imphnen-libs",
- "rand 0.9.0",
+ "rand 0.9.1",
 "serde",
 "serde_json",
 "surrealdb",
@@ -2048,6 +2178,12 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"

+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -2068,9 +2204,9 @@ dependencies = [

 [[package]]
 name = "itertools"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
 dependencies = [
 "either",
 ]
@@ -2081,6 +2217,30 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"

+[[package]]
+name = "jiff"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.77"
@@ -2145,9 +2305,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "lettre"
-version = "0.11.15"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bc2b8eabb6a30b235d6f716f7f36479f4b38cbe65b8747aefee51f89e8437"
+checksum = "87ffd14fa289730e3ad68edefdc31f603d56fe716ec38f2076bb7410e09147c2"
 dependencies = [
 "async-trait",
 "base64 0.22.1",
@@ -2559,23 +2719,26 @@ dependencies = [

 [[package]]
 name = "object_store"
-version = "0.10.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3"
+checksum = "d94ac16b433c0ccf75326388c893d2835ab7457ea35ab8ba5d745c053ef5fa16"
 dependencies = [
 "async-trait",
 "bytes",
 "chrono",
 "futures",
+ "http",
 "humantime",
- "itertools 0.13.0",
+ "itertools 0.14.0",
 "parking_lot",
 "percent-encoding",
- "snafu",
+ "thiserror 2.0.12",
 "tokio",
 "tracing",
 "url",
 "walkdir",
+ "wasm-bindgen-futures",
+ "web-time",
 ]

 [[package]]
@@ -2817,6 +2980,21 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"

+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -2977,7 +3155,7 @@ checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc"
 dependencies = [
 "bytes",
 "getrandom 0.3.2",
- "rand 0.9.0",
+ "rand 0.9.1",
 "ring",
 "rustc-hash",
 "rustls",
@@ -3054,13 +3232,12 @@ dependencies = [

 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
 "rand_chacha 0.9.0",
 "rand_core 0.9.3",
- "zerocopy 0.8.24",
 ]

 [[package]]
@@ -3101,6 +3278,16 @@ dependencies = [
 "getrandom 0.3.2",
 ]

+[[package]]
+name = "rand_distr"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
+dependencies = [
+ "num-traits",
+ "rand 0.9.1",
+]
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -3460,7 +3647,7 @@ dependencies = [
 "futures-util",
 "http",
 "mime",
- "rand 0.9.0",
+ "rand 0.9.1",
 "thiserror 2.0.12",
 ]

@@ -3854,28 +4041,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "snafu"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
-dependencies = [
- "doc-comment",
- "snafu-derive",
-]
-
-[[package]]
-name = "snafu-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "snap"
 version = "1.1.1"
@@ -3993,7 +4158,7 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.5.0",
+ "heck",
 "proc-macro2",
 "quote",
 "rustversion",
@@ -4008,9 +4173,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"

 [[package]]
 name = "surrealdb"
-version = "2.2.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa1aa87197bad9dd12c93350533a8da09bae064a411f445c97ca0e64faabc304"
+checksum = "12a5a2d3f0d40d8b0bc2e3a327663c0cdffe7d35508ccabc810dab8281cf251d"
 dependencies = [
 "arrayvec",
 "async-channel",
@@ -4019,6 +4184,7 @@ dependencies = [
 "dmp",
 "futures",
 "geo",
+ "getrandom 0.3.2",
 "indexmap 2.9.0",
 "path-clean",
 "pharos",
@@ -4049,9 +4215,9 @@ dependencies = [

 [[package]]
 name = "surrealdb-core"
-version = "2.2.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ceb9f421e07af67b06c57ea7a8b08c3b4e4677de483435ca6d69bd00600a571"
+checksum = "032f20c01cf3a5569f47c857da280abb7b6ff1e443bf58b993c3c28d2d802859"
 dependencies = [
 "addr",
 "affinitypool",
@@ -4080,6 +4246,7 @@ dependencies = [
 "fuzzy-matcher",
 "geo",
 "geo-types",
+ "getrandom 0.3.2",
 "hex",
 "http",
 "ipnet",
@@ -4140,24 +4307,21 @@ dependencies = [

 [[package]]
 name = "surrealkv"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28eec56aca077c245bf5f9e08876fdcce58b5361e77a0b94a92fd47e1990ad4"
+checksum = "6d43d55edab1e65c7704486016f98e9eac61c97474921dbac094af2cd16e16c3"
 dependencies = [
 "ahash 0.8.11",
- "async-channel",
 "bytes",
 "chrono",
 "crc32fast",
- "futures",
+ "double-ended-peekable",
 "getrandom 0.2.15",
 "lru",
 "parking_lot",
 "quick_cache 0.6.12",
 "revision 0.10.0",
- "tokio",
 "vart 0.9.2",
- "wasm-bindgen-futures",
 ]

 [[package]]
@@ -4265,7 +4429,7 @@ dependencies = [
 "axum-test",
 "chrono",
 "imphnen-entities",
- "imphnen-iam-service",
+ "imphnen-iam",
 "imphnen-libs",
 "imphnen-utils",
 "serde_json",
@@ -4390,9 +4554,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
 dependencies = [
 "backtrace",
 "bytes",
@@ -4500,9 +4664,9 @@ dependencies = [

 [[package]]
 name = "tower-http"
-version = "0.6.2"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
+checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
 dependencies = [
 "bitflags",
 "bytes",
@@ -4612,7 +4776,7 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "470dbf6591da1b39d43c14523b2b469c86879a53e8b758c8e090a470fe7b1fbe"
 dependencies = [
- "rand 0.9.0",
+ "rand 0.9.1",
 "serde",
 "web-time",
 ]
@@ -4713,6 +4877,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"

+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "utoipa"
 version = "5.3.1"
@@ -1,32 +1,46 @@
 [workspace]
 resolver = "2"
 members = [ 
-  "imphnen-*",
  "tests",
+  "imphnen-iam",
+  "imphnen-cms",
+  "imphnen-libs",
+  "imphnen-utils",
+  "imphnen-gacha",
+  "imphnen-gateway",
+  "imphnen-backend",
+  "imphnen-entities",
+  "imphnen-dimentorin",
+  "imphnen-middleware",
 ]

+
 [workspace.dependencies]
-axum = { version = "0.8.1", features = ["multipart"] }
+axum = { version = "0.8.4", features = ["multipart"] }
 log = "0.4.25"
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.138"
-tokio = { version = "1.43.0" }
+tokio = { version = "1.45.0" }
 argon2 = { version = "0.5.3", features = ["password-hash"] }
 jsonwebtoken = "9.3.1"
-chrono = "0.4.39"
+chrono = "0.4.41"
 utoipa = { version = "5.3.1", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.0", features = ["axum"] }
-lettre = { version = "0.11.12", features = ["tokio1-native-tls"] }
-surrealdb = { version = "2.2.1", features = ["kv-mem"] }
-thiserror = "2.0.11"
-anyhow = "1.0.97"
-rand = "0.9.0"
-tower-http = { version = "0.6.2", features = ["cors"] }
+lettre = { version = "0.11.16", features = ["tokio1-native-tls"] }
+surrealdb = { version = "2.3.2", features = ["kv-mem"] }
+thiserror = "2.0.12"
+anyhow = "1.0.98"
+rand = { version = "0.9.1", features = ["std", "alloc"] }
+rand_distr = "0.5.1"
+tower-http = { version = "0.6.4", features = ["cors"] }
 validator = { version = "0.12", features = ["derive"] }
 lazy_static = "1.4.0"
 regex = "1.11.1"
 axum-test = "17.2.0"
 fancy-regex = "0.14.0"
+futures = "0.3.31"
+tower = "0.5.2"
+env_logger = "0.11.8"

 [profile.release]
 lto = "fat"
@@ -1,78 +1,107 @@
-# Axum SurrealDB Boilerplate
+# IMPHNEN Backend Service

-## Features
+<p align="center">
+  <img src="docs/logo.svg" alt="IMPHNEN">
+</p>

- **Authentication Ready**: Preconfigured authentication and middleware for secure API access.
- **Database Integration**: SurrealDB seamlessly integrated as an Axum Extension.
- **CORS Handling**: Fine-tuned CORS management with Tower HTTP `CorsLayer`.
- **API Documentation**: Fully documented with OpenAPI and Swagger UI.
- **Optimized for Performance**: Asynchronous, lightweight, and scalable architecture.
+This repository serves as the **monorepo** for all backend services of IMPHNEN. It encompasses several main services:

-## Prerequisites
+1. **Core Service** - Provides fundamental functionalities and shared resources for other services.
+2. **IAM Service** - Handles identity and access management across IMPHNEN applications.
+3. **CMS Service** - Supports the cms services by IMPHNEN [Landing Page website](https://imphnen.dev/).
+4. **Gacha Service** - Supports the gacha services by IMPHNEN [Gacha website](https://gacha.imphnen.dev/).
+5. **Dimentorin Service** - Supports the mentoring services by IMPHNEN [Dimentorin website](https://dimentorin.imphnen.dev/).
+6. **Gateway Service** - Acts as the API gateway, routing requests to appropriate services.

- **Rust**: Install Rust from [rust-lang.org](https://www.rust-lang.org/).
- **Database**: Set up a SurrealDB instance and configure connection details.
- **Docker**: Required for containerized deployment, install from [docker.com](https://www.docker.com/).
- **Nix (Optional)**: For reproducible builds, install from [nixos.org](https://nixos.org/).
+## How to Install

-## Getting Started
+1. **Clone the repository**:

-1. **Clone the Repository**:
+   ```sh
+   git clone https://github.com/IMPHNEN/imphnen-backend-service.git
+   cd imphnen-backend-service
+   ```

-   - `git clone https://github.com/maulanasdqn/axum-surrealdb-boilerplate`
+2. **Set up the environment**:

-2. **Set Up Environment Variables**:
+   - Copy the example environment files:

-   - Copy `.env.example` and rename it to `.env`
+     ```sh
+     cp .env.example .env
+     ```

-   - **Windows**: Run the script: `./apply-env.ps1`
-   - **Unix-based systems (Linux, macOS, BSD)**: Run the script: `./apply-env.sh`
+     if you use windows based system

-3. **Install Dependencies**:
+     ```sh
+     ./apply-env.ps1
+     ```

-   - `cargo install .`
+     if you use unix based system

-4. **Setup Database**:
+     ```sh
+     sh apply-env.sh
+     ```

-   - Install the surrealDB
-   - **Windows**: `iwr https://windows.surrealdb.com -useb | iex`
-   - **Unix-based systems (Linux, macOS, BSD)**: `curl -sSf https://install.surrealdb.com | sh`
-   - Start the database `surreal start --user root --pass root`
+   - Modify the `.env` files with your specific configuration settings.

-5. **Start the Server**:
+3. **Install dependencies**:

-   - Install Cargo Watch `cargo install cargo-watch`
-   - Run it with cargo watch `cargo watch -x run`
+   Ensure you have [Rust](https://www.rust-lang.org/) installed. Then, run:

-   The API will be available at `http://localhost:3000/docs`.
+   ```sh
+   cargo build
+   ```

-## Docker
+## How to Run

-1. **Build the Docker Image**:
+### Development

-2. **Run the Docker Container**:
+To run the services in development mode:

-   The API will be accessible at `http://localhost:3000/docs`.
+1. **Start the database and other dependencies** using Docker Compose:

-## Using Nix as Builder (Optional)
+   ```sh
+   docker-compose up -d
+   ```

-1. **Install Nix**:
+2. **Run the desired service**. For example, to run the Core Service:

-2. **Enter Nix Shell or Use Nix Flakes**:
+   ```sh
+   cargo run -p imphnen-core-service --bin api
+   ```

-3. **Build the Project**:
+### Production

-4. **Run the Server**:
+For production deployment:

-## Contributing
+1. **Build the Docker image**:

-Contributions are welcome! Fork the repository and create a pull request with your improvements.
+   ```sh
+   docker build -t imphnen-backend-service .
+   ```

-## License
+2. **Run the Docker container**:

-This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.
+   ```sh
+   docker run -d --env-file .env -p 8080:8080 imphnen-backend-service
+   ```

-## Acknowledgements
+   Adjust the port and environment variables as needed.

- [Axum](https://github.com/tokio-rs/axum)
- [SurrealDB](https://github.com/surrealdb/surrealdb)
+## How to Contribute
+
+1. **Fork the repository** and clone it locally.
+2. **Create a new branch** for your feature or fix:
+
+   ```sh
+   git checkout -b feat/your-feature-name
+   ```
+
+3. **Make your changes**, commit them, and push to your forked repository.
+4. **Create a pull request** to the `develop` branch of this repository.
+
+If you encounter any issues or have questions, feel free to create a new issue in the repository.
+
+---
+
+_Note: For detailed API documentation, please refer to our [API Docs](https://api.imphnen.dev/docs)._
@@ -6,3 +6,11 @@ services:
    ports:
      - "${PORT}:${PORT}"
    env_file: ".env"
+    depends_on:
+      - surrealdb
+
+  surrealdb:
+    image: surrealdb/surrealdb:latest
+    command: start --log trace --user root --pass root
+    ports:
+      - "8000:8000"
@@ -0,0 +1,27 @@
+[package]
+name = "imphnen-backend"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+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
+utoipa.workspace = true
+lazy_static.workspace = true
+regex.workspace = true
+validator.workspace = true
+axum-test.workspace = true
+surrealdb.workspace = true
+rand.workspace = true
+tokio.workspace = true
+chrono.workspace = true
+anyhow.workspace = true
+tower-http.workspace = true
+utoipa-swagger-ui.workspace = true
+env_logger.workspace = true
@@ -1,8 +1,10 @@
-use imphnen_gateway_service::gateway_service;
+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
 	})
@@ -25,8 +25,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
 		(
 			"0269ed71-0ae0-4c43-ad29-e3d861d8f9a0",
 			"Create Permissions",
-			None,
-			None,
+			Some("2025-01-29T05:11:01.265+00"),
+			Some("2025-01-29T05:11:01.265001+00"),
 		),
 		(
 			"299cb4d5-6556-4cc9-b6c1-32e6d31e0f9b",
@@ -37,20 +37,20 @@ async fn main() -> Result<(), Box<dyn Error>> {
 		(
 			"319ee593-ff0a-4f29-bbaf-9feb3174a3a2",
 			"Create Roles",
-			None,
-			None,
+			Some("2025-01-29T05:11:01.265+00"),
+			Some("2025-01-29T05:11:01.265001+00"),
 		),
 		(
 			"319ee593-ff0a-4f29-bbaf-9feb3174a3a6",
 			"Read Detail Users",
-			None,
-			None,
+			Some("2025-01-29T05:11:01.265+00"),
+			Some("2025-01-29T05:11:01.265001+00"),
 		),
 		(
 			"35b0d992-65c8-4b62-b030-e6e0320e4048",
 			"Delete Roles",
-			None,
-			None,
+			Some("2025-01-29T05:34:40.621554+00"),
+			Some("2025-01-29T05:34:40.621555+00"),
 		),
 		(
 			"4da8b434-89f9-4d91-85ae-eebd63cdbeda",
@@ -91,8 +91,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
 		(
 			"9164ca6e-c7e3-4238-a15f-f36ab9577e7e",
 			"Read List Roles",
-			None,
-			None,
+			Some("2025-01-29T05:34:40.621554+00"),
+			Some("2025-01-29T05:34:40.621555+00"),
 		),
 		(
 			"96df0689-2ae9-4894-bf00-837c19415e5c",
@@ -109,8 +109,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
 		(
 			"a00d5608-4c48-4542-845c-dfe004687022",
 			"Update Roles",
-			None,
-			None,
+			Some("2025-01-29T05:34:40.621554+00"),
+			Some("2025-01-29T05:34:40.621555+00"),
 		),
 		(
 			"b2dc3928-86ba-4c59-a03d-0b57d5183ebc",
@@ -140,6 +140,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
 			.await?;
 		println!("✅ Inserted: {}", name);
 	}
-	println!("✅ Semua permissions berhasil disimpan ke SurrealDB!");
+	println!("✅ All Permissions seeded");
 	Ok(())
 }
@@ -65,6 +65,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
 			.await?;
 		println!("✅ Inserted role: {}", name);
 	}
-	println!("✅ Semua role berhasil disimpan ke SurrealDB!");
+	println!("✅ All Roles seeded");
 	Ok(())
 }
@@ -0,0 +1,57 @@
+use imphnen_iam::{get_iso_date, make_thing, Env};
+use std::error::Error;
+use surrealdb::{engine::remote::ws::Ws, opt::auth::Root, Surreal};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+	let env = Env::new();
+	let db = Surreal::new::<Ws>(env.surrealdb_url).await?;
+
+	db.signin(Root {
+		username: &env.surrealdb_username,
+		password: &env.surrealdb_password,
+	})
+	.await?;
+
+	db.use_ns(env.surrealdb_namespace)
+		.use_db(env.surrealdb_dbname)
+		.await?;
+
+	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",
+	];
+
+	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,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(),
@@ -90,6 +61,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
 		println!("✅ Inserted user: {} ({})", fullname, email);
 	}

-	println!("✅ Semua users berhasil disimpan ke SurrealDB!");
+	println!("✅ All Users seeded");
 	Ok(())
 }
@@ -1,4 +1,4 @@
-use imphnen_gateway_service::gateway_service;
+use imphnen_gateway::gateway_service;
 use imphnen_libs::axum_init;

 #[tokio::main]
@@ -1,12 +1,12 @@
 [package]
-name = "imphnen-iam-service"
+name = "imphnen-cms"
 version = "0.1.0"
 edition = "2024"

 [dependencies]
-imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
 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" }
 axum.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -21,4 +21,4 @@ tokio.workspace = true
 chrono.workspace = true
 anyhow.workspace = true
 tower-http.workspace = true
-utoipa-swagger-ui.workspace = true
+utoipa-swagger-ui.workspace = true
@@ -1,59 +0,0 @@
-use imphnen_utils::{get_iso_date, make_thing, Env};
-use std::error::Error;
-use surrealdb::{engine::remote::ws::Ws, opt::auth::Root, Surreal};
-
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
-	let env = Env::new();
-	let db = Surreal::new::<Ws>(env.surrealdb_url).await?;
-
-	db.signin(Root {
-		username: &env.surrealdb_username,
-		password: &env.surrealdb_password,
-	})
-	.await?;
-
-	db.use_ns(env.surrealdb_namespace)
-		.use_db(env.surrealdb_dbname)
-		.await?;
-
-	let role_permissions = vec![
-		(
-			"50133429-f4b1-4249-9f97-7b86e6ee9d86", // Staf
-			vec![
-				"7c15e31d-36e2-49f9-97db-138c03fb0cf6", // Read List Users
-				"319ee593-ff0a-4f29-bbaf-9feb3174a3a6", // Read Detail Users
-			],
-		),
-		(
-			"f6b03f25-e416-4893-ac88-caaa690afb07", // Admin
-			vec![
-				"023e2dfe-93c3-4008-94a8-b5dff403f73b", // Create Users
-				"96df0689-2ae9-4894-bf00-837c19415e5c", // Delete Users
-				"98b3dc4c-0124-461f-afcd-166637c5e6e8", // Update Users
-				"319ee593-ff0a-4f29-bbaf-9feb3174a3a6", // Read Detail Users
-				"7c15e31d-36e2-49f9-97db-138c03fb0cf6", // Read List Users
-				"9164ca6e-c7e3-4238-a15f-f36ab9577e7e", // Read List Roles
-				"319ee593-ff0a-4f29-bbaf-9feb3174a3a2", // Create Roles
-				"a00d5608-4c48-4542-845c-dfe004687022", // Update Roles
-				"35b0d992-65c8-4b62-b030-e6e0320e4048", // Delete Roles
-			],
-		),
-	];
-	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!("✅ Semua roles telah diperbarui dengan permissions di SurrealDB!");
-
-	Ok(())
-}
@@ -1,12 +1,12 @@
 [package]
-name = "imphnen-gacha-service"
+name = "imphnen-dimentorin"
 version = "0.1.0"
 edition = "2024"

 [dependencies]
-imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
 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" }
 axum.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -21,4 +21,4 @@ tokio.workspace = true
 chrono.workspace = true
 anyhow.workspace = true
 tower-http.workspace = true
-utoipa-swagger-ui.workspace = true
+utoipa-swagger-ui.workspace = true
@@ -0,0 +1,14 @@
+pub fn add(left: u64, right: u64) -> u64 {
+	left + right
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn it_works() {
+		let result = add(2, 2);
+		assert_eq!(result, 4);
+	}
+}
@@ -6,6 +6,6 @@ edition = "2024"
 [dependencies]
 axum.workspace = true
 serde.workspace = true
-surrealdb = { workspace = true, features = ["kv-mem"] }
-thiserror.workspace = true
 utoipa.workspace = true
+surrealdb.workspace = true
+thiserror.workspace = true
@@ -1,93 +0,0 @@
-use serde::{Deserialize, Serialize};
-use surrealdb::sql::Thing;
-use utoipa::ToSchema;
-use validator::Validate;
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
-pub struct GachaItemRequestDto {
-	#[validate(length(min = 1, message = "Item name must not be empty"))]
-	pub name: String,
-	#[validate(length(min = 1, message = "Image URL must not be empty"))]
-	pub image_url: String,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
-pub struct GachaClaimRequestDto {
-	#[validate(length(min = 1, message = "User ID must not be empty"))]
-	pub user_id: String,
-
-	#[validate(length(min = 1, message = "Item ID must not be empty"))]
-	pub item_id: String,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
-pub struct GachaRollRequestDto {
-	#[validate(length(min = 1, message = "Item ID must not be empty"))]
-	pub item_id: String,
-
-	#[validate(range(min = 1, message = "Weight must be greater than zero"))]
-	pub weight: f32,
-
-	#[validate(range(min = 1, message = "Quantity must be at least 1"))]
-	pub quantity: i32,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct GachaItemDto {
-	pub id: String,
-	pub name: String,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GachaItemDtoRaw {
-	pub id: Thing,
-	pub name: String,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct GachaClaimDto {
-	pub id: String,
-	pub user: String,
-	pub item: String,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GachaClaimDtoRaw {
-	pub id: Thing,
-	pub user: Thing,
-	pub item: Thing,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct GachaRollDto {
-	pub id: String,
-	pub item: String,
-	pub weight: String,
-	pub quantity: i32,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GachaRollDtoRaw {
-	pub id: Thing,
-	pub item: Thing,
-	pub weight: String,
-	pub quantity: i32,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
@@ -1,92 +0,0 @@
-use crate::{make_thing, ResourceEnum};
-use serde::{Deserialize, Serialize};
-use surrealdb::{sql::Thing, Uuid};
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GachaItemSchema {
-	pub id: Thing,
-	pub name: String,
-	pub image_url: String,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-impl Default for GachaItemSchema {
-	fn default() -> Self {
-		GachaItemSchema {
-			id: make_thing(
-				&ResourceEnum::GachaItems.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			name: String::new(),
-			image_url: String::new(),
-			is_deleted: false,
-			created_at: None,
-			updated_at: None,
-		}
-	}
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GachaClaimSchema {
-	pub id: Thing,
-	pub user: Thing,
-	pub item: Thing,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-impl Default for GachaClaimSchema {
-	fn default() -> Self {
-		GachaClaimSchema {
-			id: make_thing(
-				&ResourceEnum::GachaClaims.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			user: make_thing(
-				&ResourceEnum::Users.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			item: make_thing(
-				&ResourceEnum::GachaItems.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			is_deleted: false,
-			created_at: None,
-			updated_at: None,
-		}
-	}
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct GachaRollSchema {
-	pub id: Thing,
-	pub item: Thing,
-	pub weight: f32,
-	pub quantity: i32,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-impl Default for GachaRollSchema {
-	fn default() -> Self {
-		GachaRollSchema {
-			id: make_thing(
-				&ResourceEnum::GachaRolls.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			item: make_thing(
-				&ResourceEnum::GachaItems.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			weight: 0.2,
-			quantity: 2,
-			is_deleted: false,
-			created_at: None,
-			updated_at: None,
-		}
-	}
-}
@@ -1,6 +0,0 @@
-pub mod gacha_dto;
-pub mod gacha_repository;
-pub mod gacha_schema;
-
-pub use gacha_repository::*;
-pub use gacha_schema::*;
@@ -1,2 +0,0 @@
-pub mod gacha;
-pub use gacha::*;
@@ -1,12 +1,13 @@
 [package]
-name = "imphnen-backend-service"
+name = "imphnen-gacha"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"

 [dependencies]
-imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
+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" }
 axum.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -22,4 +23,4 @@ chrono.workspace = true
 anyhow.workspace = true
 tower-http.workspace = true
 utoipa-swagger-ui.workspace = true
-imphnen-gateway-service = { version = "0.1.0", path = "../imphnen-gateway-service" }
+rand_distr.workspace = true
@@ -3,6 +3,7 @@ use imphnen_libs::*;
 use imphnen_utils::*;

 pub mod v1;
+
 pub use imphnen_entities::*;
 pub use imphnen_libs::*;
 pub use imphnen_utils::*;
@@ -0,0 +1,66 @@
+use axum::Extension;
+use axum::http::HeaderMap;
+use axum::response::IntoResponse;
+use axum::{Json, extract::Path};
+use imphnen_iam::{PermissionsEnum, permissions_guard};
+use imphnen_libs::{AppState, MessageResponseDto, ResponseSuccessDto};
+
+use super::{GachaClaimItemDto, GachaClaimRequestDto, GachaClaimService};
+
+#[utoipa::path(
+	get,
+	path = "/v1/gacha/claims/detail/{id}",
+	security(
+        ("Bearer" = [])
+    ),
+	params(("id" = String, Path, description = "Gacha Claim ID")),
+	responses(
+		(status = 200, description = "Get Gacha Claim by ID", body = ResponseSuccessDto<GachaClaimItemDto>)
+	),
+	tag = "Gacha"
+)]
+pub async fn get_detail_gacha_claim(
+	headers: axum::http::HeaderMap,
+	Extension(state): Extension<AppState>,
+	Path(id): Path<String>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::CreateGachaClaims],
+	)
+	.await
+	{
+		Ok(_) => GachaClaimService::get_gacha_claim_by_id(&state, id).await,
+		Err(response) => response,
+	}
+}
+
+#[utoipa::path(
+	post,
+	security(
+        ("Bearer" = [])
+    ),
+	path = "/v1/gacha/claims/create",
+	request_body = GachaClaimRequestDto,
+	responses(
+		(status = 201, description = "Create new gacha claim", body = MessageResponseDto)
+	),
+	tag = "Gacha"
+)]
+pub async fn post_create_gacha_claim(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Json(payload): Json<GachaClaimRequestDto>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::CreateGachaClaims],
+	)
+	.await
+	{
+		Ok(_) => GachaClaimService::create_gacha_claim(&state, payload).await,
+		Err(response) => response,
+	}
+}
@@ -0,0 +1,47 @@
+use crate::{GachaItemDto, GachaItemSchema};
+use imphnen_iam::{UsersDetailItemDto, UsersDetailQueryDto};
+use serde::{Deserialize, Serialize};
+use surrealdb::sql::Thing;
+use utoipa::ToSchema;
+use validator::Validate;
+
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
+pub struct GachaClaimRequestDto {
+	#[validate(length(min = 1, message = "User ID must not be empty"))]
+	pub user_id: String,
+	#[validate(length(min = 1, message = "Item ID must not be empty"))]
+	pub item_id: String,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
+pub struct GachaClaimItemDto {
+	pub id: String,
+	pub user: UsersDetailItemDto,
+	pub item: GachaItemDto,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GachaClaimQueryDto {
+	pub id: Thing,
+	pub user: UsersDetailQueryDto,
+	pub item: GachaItemSchema,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+impl GachaClaimItemDto {
+	pub fn from(dto: &GachaClaimQueryDto) -> Self {
+		Self {
+			id: dto.id.id.to_raw(),
+			user: UsersDetailItemDto::from(&dto.user),
+			item: GachaItemDto::from(&dto.item),
+			is_deleted: dto.is_deleted,
+			created_at: dto.created_at.clone(),
+			updated_at: dto.updated_at.clone(),
+		}
+	}
+}
@@ -0,0 +1,48 @@
+use super::{GachaClaimQueryDto, GachaClaimSchema};
+use crate::{AppState, ResourceEnum};
+use anyhow::{Result, bail};
+use imphnen_iam::DetailQueryBuilder;
+
+pub struct GachaClaimRepository<'a> {
+	state: &'a AppState,
+}
+
+impl<'a> GachaClaimRepository<'a> {
+	pub fn new(state: &'a AppState) -> Self {
+		Self { state }
+	}
+
+	pub async fn query_gacha_claim_by_id(
+		&self,
+		id: String,
+	) -> Result<GachaClaimQueryDto> {
+		let db = &self.state.surrealdb_ws;
+		let builder = DetailQueryBuilder::new(ResourceEnum::GachaClaims.to_string())
+			.with_id(id.clone())
+			.with_select_fields(vec!["*"])
+			.with_fetch("item")
+			.with_fetch("user");
+		let sql = builder.build();
+		let result: Option<GachaClaimQueryDto> =
+			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+		match result {
+			Some(claim) if !claim.is_deleted => Ok(claim),
+			_ => bail!("Gacha Claim not found"),
+		}
+	}
+
+	pub async fn query_create_gacha_claim(
+		&self,
+		data: GachaClaimSchema,
+	) -> Result<String> {
+		let db = &self.state.surrealdb_ws;
+		let record: Option<GachaClaimSchema> = db
+			.create(ResourceEnum::GachaClaims.to_string())
+			.content(data)
+			.await?;
+		match record {
+			Some(_) => Ok("Success create Gacha Claim".into()),
+			None => bail!("Failed to create Gacha Claim"),
+		}
+	}
+}
@@ -0,0 +1,53 @@
+use crate::{ResourceEnum, make_thing};
+use serde::{Deserialize, Serialize};
+use surrealdb::{Uuid, sql::Thing};
+
+use super::GachaClaimRequestDto;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GachaClaimSchema {
+	pub id: Thing,
+	pub user: Thing,
+	pub item: Thing,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+impl Default for GachaClaimSchema {
+	fn default() -> Self {
+		GachaClaimSchema {
+			id: make_thing(
+				&ResourceEnum::GachaClaims.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			user: make_thing(
+				&ResourceEnum::Users.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			item: make_thing(
+				&ResourceEnum::GachaItems.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			is_deleted: false,
+			created_at: None,
+			updated_at: None,
+		}
+	}
+}
+
+impl GachaClaimSchema {
+	pub fn from(dto: GachaClaimRequestDto) -> Self {
+		Self {
+			id: make_thing(
+				&ResourceEnum::GachaClaims.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			user: make_thing(&ResourceEnum::Users.to_string(), &dto.user_id),
+			item: make_thing(&ResourceEnum::GachaItems.to_string(), &dto.item_id),
+			is_deleted: false,
+			created_at: None,
+			updated_at: None,
+		}
+	}
+}
@@ -0,0 +1,36 @@
+use crate::{
+	AppState, GachaClaimItemDto, GachaClaimRepository, GachaClaimRequestDto,
+	GachaClaimSchema, ResponseSuccessDto, common_response, success_response,
+	validate_request,
+};
+use axum::http::StatusCode;
+use axum::response::Response;
+
+pub struct GachaClaimService;
+
+impl GachaClaimService {
+	pub async fn get_gacha_claim_by_id(state: &AppState, id: String) -> Response {
+		let repo = GachaClaimRepository::new(state);
+		match repo.query_gacha_claim_by_id(id).await {
+			Ok(claim) => success_response(ResponseSuccessDto {
+				data: GachaClaimItemDto::from(&claim),
+			}),
+			Err(e) => common_response(StatusCode::NOT_FOUND, &e.to_string()),
+		}
+	}
+
+	pub async fn create_gacha_claim(
+		state: &AppState,
+		payload: GachaClaimRequestDto,
+	) -> Response {
+		if let Err((status, message)) = validate_request(&payload) {
+			return common_response(status, &message);
+		}
+		let repo = GachaClaimRepository::new(state);
+		let schema = GachaClaimSchema::from(payload);
+		match repo.query_create_gacha_claim(schema).await {
+			Ok(msg) => common_response(StatusCode::CREATED, &msg),
+			Err(e) => common_response(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
+		}
+	}
+}
@@ -0,0 +1,22 @@
+use axum::{
+	Router,
+	routing::{get, post},
+};
+
+pub mod gacha_claim_controller;
+pub mod gacha_claim_dto;
+pub mod gacha_claim_repository;
+pub mod gacha_claim_schema;
+pub mod gacha_claim_service;
+
+pub use gacha_claim_controller::*;
+pub use gacha_claim_dto::*;
+pub use gacha_claim_repository::*;
+pub use gacha_claim_schema::*;
+pub use gacha_claim_service::*;
+
+pub fn gacha_claim_router() -> Router {
+	Router::new()
+		.route("/create", post(post_create_gacha_claim))
+		.route("/detail/{id}", get(get_detail_gacha_claim))
+}
@@ -0,0 +1,166 @@
+use crate::{
+	AppState, MessageResponseDto, MetaRequestDto, ResponseListSuccessDto,
+	ResponseSuccessDto,
+	gacha_item_dto::{GachaItemDto, GachaItemRequestDto},
+	gacha_item_service::GachaItemService,
+};
+use axum::{
+	Extension, Json,
+	extract::{Path, Query},
+	http::HeaderMap,
+	response::IntoResponse,
+};
+use imphnen_iam::{PermissionsEnum, permissions_guard};
+
+#[utoipa::path(
+    get,
+    path = "/v1/gacha/items",
+    security(
+        ("Bearer" = [])
+    ),
+    params(
+        ("page" = Option<i64>, Query, description = "Page number"),
+        ("per_page" = Option<i64>, Query, description = "Items per page"),
+        ("search" = Option<String>, Query, description = "Search keyword"),
+        ("sort_by" = Option<String>, Query, description = "Sort by field"),
+        ("order" = Option<String>, Query, description = "Order ASC or DESC"),
+        ("filter" = Option<String>, Query, description = "Filter value"),
+        ("filter_by" = Option<String>, Query, description = "Field to filter by"),
+    ),
+    responses(
+        (status = 200, description = "Get gacha item list", body = ResponseListSuccessDto<Vec<GachaItemDto>>)
+    ),
+    tag = "Gacha"
+)]
+pub async fn get_gacha_item_list(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Query(meta): Query<MetaRequestDto>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::ReadListGachaItems],
+	)
+	.await
+	{
+		Ok(_) => GachaItemService::get_gacha_item_list(&state, meta).await,
+		Err(response) => response,
+	}
+}
+
+#[utoipa::path(
+    get,
+    path = "/v1/gacha/items/detail/{id}",
+    security(
+        ("Bearer" = [])
+    ),
+    params(("id" = String, Path, description = "Gacha Item ID")),
+    responses(
+        (status = 200, description = "Get gacha item by ID", body = ResponseSuccessDto<GachaItemDto>)
+    ),
+    tag = "Gacha"
+)]
+pub async fn get_gacha_item_by_id(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Path(id): Path<String>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::ReadDetailGachaItems],
+	)
+	.await
+	{
+		Ok(_) => GachaItemService::get_gacha_item_by_id(&state, id).await,
+		Err(response) => response,
+	}
+}
+
+#[utoipa::path(
+    post,
+    path = "/v1/gacha/items/create",
+    security(
+        ("Bearer" = [])
+    ),
+    request_body = GachaItemRequestDto,
+    responses(
+        (status = 201, description = "Create gacha item", body = MessageResponseDto)
+    ),
+    tag = "Gacha"
+)]
+pub async fn post_create_gacha_item(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Json(payload): Json<GachaItemRequestDto>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::CreateGachaItems],
+	)
+	.await
+	{
+		Ok(_) => GachaItemService::create_gacha_item(&state, payload).await,
+		Err(response) => response,
+	}
+}
+
+#[utoipa::path(
+    put,
+    path = "/v1/gacha/items/update/{id}",
+    security(
+        ("Bearer" = [])
+    ),
+    request_body = GachaItemRequestDto,
+    responses(
+        (status = 200, description = "Update gacha item", body = MessageResponseDto)
+    ),
+    tag = "Gacha"
+)]
+pub async fn put_update_gacha_item(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Path(id): Path<String>,
+	Json(payload): Json<GachaItemRequestDto>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::UpdateGachaItems],
+	)
+	.await
+	{
+		Ok(_) => GachaItemService::update_gacha_item(&state, payload, id).await,
+		Err(response) => response,
+	}
+}
+
+#[utoipa::path(
+    delete,
+    path = "/v1/gacha/items/delete/{id}",
+    security(
+        ("Bearer" = [])
+    ),
+    responses(
+        (status = 200, description = "Delete gacha item", body = MessageResponseDto)
+    ),
+    tag = "Gacha"
+)]
+pub async fn delete_gacha_item(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Path(id): Path<String>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::DeleteGachaItems],
+	)
+	.await
+	{
+		Ok(_) => GachaItemService::delete_gacha_item(&state, id).await,
+		Err(response) => response,
+	}
+}
@@ -0,0 +1,33 @@
+use super::GachaItemSchema;
+use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
+use validator::Validate;
+
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
+pub struct GachaItemRequestDto {
+	#[validate(length(min = 1, message = "Item name must not be empty"))]
+	pub name: String,
+	#[validate(length(min = 1, message = "Image URL must not be empty"))]
+	pub image_url: String,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
+pub struct GachaItemDto {
+	pub id: String,
+	pub name: String,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+impl GachaItemDto {
+	pub fn from(dto: &GachaItemSchema) -> Self {
+		Self {
+			id: dto.id.id.to_raw(),
+			name: dto.name.clone(),
+			is_deleted: dto.is_deleted,
+			created_at: dto.created_at.clone(),
+			updated_at: dto.updated_at.clone(),
+		}
+	}
+}
@@ -1,15 +1,15 @@
-use super::{GachaClaimSchema, GachaItemSchema, GachaRollSchema};
+use super::GachaItemSchema;
 use crate::{
-	AppState, MetaRequestDto, ResourceEnum, ResponseListSuccessDto, get_id,
-	make_thing, query_list_with_meta,
+	AppState, GachaItemDto, MetaRequestDto, ResourceEnum, ResponseListSuccessDto,
+	get_id, make_thing, query_list_with_meta,
 };
 use anyhow::{Result, bail};

-pub struct GachaRepository<'a> {
+pub struct GachaItemRepository<'a> {
 	state: &'a AppState,
 }

-impl<'a> GachaRepository<'a> {
+impl<'a> GachaItemRepository<'a> {
 	pub fn new(state: &'a AppState) -> Self {
 		Self { state }
 	}
@@ -17,19 +17,28 @@ impl<'a> GachaRepository<'a> {
 	pub async fn query_gacha_item_list(
 		&self,
 		meta: MetaRequestDto,
-	) -> Result<ResponseListSuccessDto<Vec<GachaItemSchema>>> {
-		let mut conditions = vec!["is_deleted = false".into()];
-		if meta.search.is_some() {
-			conditions.push("string::contains(name, $search)".into());
-		}
-		query_list_with_meta(
-			&self.state.surrealdb_ws,
-			&ResourceEnum::GachaItems.to_string(),
-			&meta,
-			conditions,
-			None,
-		)
-		.await
+	) -> Result<ResponseListSuccessDto<Vec<GachaItemDto>>> {
+		let raw_result: ResponseListSuccessDto<Vec<GachaItemSchema>> =
+			query_list_with_meta(
+				&self.state.surrealdb_ws,
+				&ResourceEnum::GachaItems.to_string(),
+				&meta,
+				vec!["is_deleted = false".into()],
+				None,
+				"name",
+				Some(vec!["*"]),
+				None,
+			)
+			.await?;
+		let transformed_data = raw_result
+			.data
+			.into_iter()
+			.map(|gacha_item| GachaItemDto::from(&gacha_item))
+			.collect();
+		Ok(ResponseListSuccessDto {
+			data: transformed_data,
+			meta: raw_result.meta,
+		})
 	}

 	pub async fn query_gacha_item_by_id(&self, id: String) -> Result<GachaItemSchema> {
@@ -97,59 +106,4 @@ impl<'a> GachaRepository<'a> {
 			None => bail!("Failed to delete Gacha Item"),
 		}
 	}
-
-	pub async fn query_gacha_claim_by_id(
-		&self,
-		id: String,
-	) -> Result<GachaClaimSchema> {
-		let db = &self.state.surrealdb_ws;
-		let result: Option<GachaClaimSchema> = db
-			.select((ResourceEnum::GachaClaims.to_string(), id.clone()))
-			.await?;
-		match result {
-			Some(claim) if !claim.is_deleted => Ok(claim),
-			_ => bail!("Gacha Claim not found"),
-		}
-	}
-
-	pub async fn query_create_gacha_claim(
-		&self,
-		data: GachaClaimSchema,
-	) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let record: Option<GachaClaimSchema> = db
-			.create(ResourceEnum::GachaClaims.to_string())
-			.content(data)
-			.await?;
-		match record {
-			Some(_) => Ok("Success create Gacha Claim".into()),
-			None => bail!("Failed to create Gacha Claim"),
-		}
-	}
-
-	pub async fn query_gacha_roll_by_id(&self, id: String) -> Result<GachaRollSchema> {
-		let db = &self.state.surrealdb_ws;
-		let result: Option<GachaRollSchema> = db
-			.select((ResourceEnum::GachaRolls.to_string(), id.clone()))
-			.await?;
-		match result {
-			Some(roll) if !roll.is_deleted => Ok(roll),
-			_ => bail!("Gacha Roll not found"),
-		}
-	}
-
-	pub async fn query_create_gacha_roll(
-		&self,
-		data: GachaRollSchema,
-	) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let record: Option<GachaRollSchema> = db
-			.create(ResourceEnum::GachaRolls.to_string())
-			.content(data)
-			.await?;
-		match record {
-			Some(_) => Ok("Success create Gacha Roll".into()),
-			None => bail!("Failed to create Gacha Roll"),
-		}
-	}
 }
@@ -0,0 +1,48 @@
+use crate::{ResourceEnum, make_thing};
+use imphnen_iam::get_iso_date;
+use serde::{Deserialize, Serialize};
+use surrealdb::{Uuid, sql::Thing};
+
+use super::GachaItemRequestDto;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GachaItemSchema {
+	pub id: Thing,
+	pub name: String,
+	pub image_url: String,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+impl Default for GachaItemSchema {
+	fn default() -> Self {
+		GachaItemSchema {
+			id: make_thing(
+				&ResourceEnum::GachaItems.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			name: String::new(),
+			image_url: String::new(),
+			is_deleted: false,
+			created_at: Some(get_iso_date()),
+			updated_at: Some(get_iso_date()),
+		}
+	}
+}
+
+impl GachaItemSchema {
+	pub fn from(dto: GachaItemRequestDto) -> Self {
+		Self {
+			id: make_thing(
+				&ResourceEnum::GachaItems.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			name: dto.name,
+			image_url: dto.image_url,
+			is_deleted: false,
+			created_at: Some(get_iso_date()),
+			updated_at: Some(get_iso_date()),
+		}
+	}
+}
@@ -0,0 +1,95 @@
+use crate::{
+	AppState, GachaItemDto, GachaItemRepository, GachaItemRequestDto, GachaItemSchema,
+	MetaRequestDto, ResourceEnum, ResponseListSuccessDto, ResponseSuccessDto,
+	common_response, make_thing, success_list_response, success_response,
+	validate_request,
+};
+use axum::http::StatusCode;
+use axum::response::Response;
+
+pub struct GachaItemService;
+
+impl GachaItemService {
+	pub async fn get_gacha_item_list(
+		state: &AppState,
+		meta: MetaRequestDto,
+	) -> Response {
+		let repo = GachaItemRepository::new(state);
+		match repo.query_gacha_item_list(meta).await {
+			Ok(data) => {
+				let response = ResponseListSuccessDto {
+					data: data.data,
+					meta: data.meta,
+				};
+				success_list_response(response)
+			}
+			Err(e) => common_response(StatusCode::BAD_REQUEST, &e.to_string()),
+		}
+	}
+
+	pub async fn get_gacha_item_by_id(state: &AppState, id: String) -> Response {
+		let repo = GachaItemRepository::new(state);
+		match repo.query_gacha_item_by_id(id).await {
+			Ok(item) => success_response(ResponseSuccessDto {
+				data: GachaItemDto::from(&item),
+			}),
+			Err(e) => common_response(StatusCode::NOT_FOUND, &e.to_string()),
+		}
+	}
+
+	pub async fn create_gacha_item(
+		state: &AppState,
+		payload: GachaItemRequestDto,
+	) -> Response {
+		if let Err((status, message)) = validate_request(&payload) {
+			return common_response(status, &message);
+		}
+		let repo = GachaItemRepository::new(state);
+		let schema = GachaItemSchema::from(payload);
+		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()),
+		}
+	}
+
+	pub async fn update_gacha_item(
+		state: &AppState,
+		payload: GachaItemRequestDto,
+		id: String,
+	) -> Response {
+		if let Err((status, message)) = validate_request(&payload) {
+			return common_response(status, &message);
+		}
+		let repo = GachaItemRepository::new(state);
+		let schema = GachaItemSchema {
+			id: make_thing(&ResourceEnum::GachaItems.to_string(), &id),
+			name: payload.name,
+			image_url: payload.image_url,
+			..Default::default()
+		};
+		match repo.query_update_gacha_item(schema).await {
+			Ok(msg) => common_response(StatusCode::OK, &msg),
+			Err(e) => {
+				if e.to_string().contains("not found") {
+					common_response(StatusCode::NOT_FOUND, "Gacha Item not found")
+				} else {
+					common_response(StatusCode::BAD_REQUEST, &e.to_string())
+				}
+			}
+		}
+	}
+
+	pub async fn delete_gacha_item(state: &AppState, id: String) -> Response {
+		let repo = GachaItemRepository::new(state);
+		match repo.query_delete_gacha_item(id).await {
+			Ok(msg) => common_response(StatusCode::OK, &msg),
+			Err(e) => {
+				if e.to_string().contains("not found") {
+					common_response(StatusCode::NOT_FOUND, "Gacha Item not found")
+				} else {
+					common_response(StatusCode::BAD_REQUEST, &e.to_string())
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,25 @@
+use axum::{
+	Router,
+	routing::{delete, get, post, put},
+};
+
+pub mod gacha_item_controller;
+pub mod gacha_item_dto;
+pub mod gacha_item_repository;
+pub mod gacha_item_schema;
+pub mod gacha_item_service;
+
+pub use gacha_item_controller::*;
+pub use gacha_item_dto::*;
+pub use gacha_item_repository::*;
+pub use gacha_item_schema::*;
+pub use gacha_item_service::*;
+
+pub fn gacha_item_router() -> Router {
+	Router::new()
+		.route("/", get(get_gacha_item_list))
+		.route("/create", post(post_create_gacha_item))
+		.route("/detail/{id}", get(get_gacha_item_by_id))
+		.route("/update/{id}", put(put_update_gacha_item))
+		.route("/delete/{id}", delete(delete_gacha_item))
+}
@@ -0,0 +1,94 @@
+use crate::{
+	AppState, MessageResponseDto, ResponseSuccessDto,
+	gacha_roll_dto::{GachaRollItemDto, GachaRollRequestDto},
+	gacha_roll_service::GachaRollService,
+};
+use axum::{
+	Extension, Json, extract::Path, http::HeaderMap, response::IntoResponse,
+};
+use imphnen_iam::{PermissionsEnum, permissions_guard};
+
+#[utoipa::path(
+    get,
+    path = "/v1/gacha/rolls/detail/{id}",
+    security(
+        ("Bearer" = [])
+    ),
+    params(("id" = String, Path, description = "Gacha Roll ID")),
+    responses(
+        (status = 200, description = "Get Gacha Roll by ID", body = ResponseSuccessDto<GachaRollItemDto>)
+    ),
+    tag = "Gacha"
+)]
+pub async fn get_detail_gacha_roll(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Path(id): Path<String>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::ReadDetailGachaRolls],
+	)
+	.await
+	{
+		Ok(_) => GachaRollService::get_gacha_roll_by_id(&state, id).await,
+		Err(response) => response,
+	}
+}
+
+#[utoipa::path(
+    post,
+    path = "/v1/gacha/rolls/create",
+    security(
+        ("Bearer" = [])
+    ),
+    request_body = GachaRollRequestDto,
+    responses(
+        (status = 201, description = "Create new gacha roll", body = MessageResponseDto)
+    ),
+    tag = "Gacha"
+)]
+pub async fn post_create_gacha_roll(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+	Json(payload): Json<GachaRollRequestDto>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::CreateGachaRolls],
+	)
+	.await
+	{
+		Ok(_) => GachaRollService::create_gacha_roll(&state, payload).await,
+		Err(response) => response,
+	}
+}
+
+#[utoipa::path(
+    post,
+    path = "/v1/gacha/rolls/execute",
+    security(
+        ("Bearer" = [])
+    ),
+    responses(
+        (status = 200, description = "Execute and get 1 gacha result", body = ResponseSuccessDto<GachaRollItemDto>)
+    ),
+    tag = "Gacha"
+)]
+pub async fn post_execute_gacha_roll(
+	headers: HeaderMap,
+	Extension(state): Extension<AppState>,
+) -> impl IntoResponse {
+	match permissions_guard(
+		&headers,
+		state.clone(),
+		vec![PermissionsEnum::ExecuteGachaRolls],
+	)
+	.await
+	{
+		Ok(_) => GachaRollService::execute_roll_once(&state).await,
+		Err(response) => response,
+	}
+}
@@ -0,0 +1,51 @@
+use crate::{GachaItemDto, GachaItemSchema};
+use serde::{Deserialize, Serialize};
+use surrealdb::sql::Thing;
+use utoipa::ToSchema;
+use validator::Validate;
+
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
+pub struct GachaRollRequestDto {
+	#[validate(length(min = 1, message = "Item ID must not be empty"))]
+	pub item_id: String,
+	#[validate(range(min = 1, message = "Weight must be greater than zero"))]
+	pub weight: f32,
+	#[validate(range(min = 1, message = "Quantity must be at least 1"))]
+	pub quantity: i32,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
+pub struct GachaRollItemDto {
+	pub id: String,
+	pub item: GachaItemDto,
+	pub weight: String,
+	pub quantity: i32,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+impl GachaRollItemDto {
+	pub fn from(dto: &GachaRollQueryDto) -> Self {
+		Self {
+			id: dto.id.id.to_raw(),
+			item: GachaItemDto::from(&dto.item),
+			weight: dto.weight.to_string(),
+			quantity: dto.quantity,
+			is_deleted: dto.is_deleted,
+			created_at: dto.created_at.clone(),
+			updated_at: dto.updated_at.clone(),
+		}
+	}
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GachaRollQueryDto {
+	pub id: Thing,
+	pub item: GachaItemSchema,
+	pub weight: f32,
+	pub quantity: i32,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
@@ -0,0 +1,80 @@
+use super::GachaRollQueryDto;
+use super::GachaRollSchema;
+use crate::{AppState, DetailQueryBuilder, ResourceEnum};
+use anyhow::{Result, bail};
+use rand::prelude::*;
+use rand::rng;
+use rand_distr::weighted::WeightedIndex;
+
+pub struct GachaRollRepository<'a> {
+	state: &'a AppState,
+}
+
+impl<'a> GachaRollRepository<'a> {
+	pub fn new(state: &'a AppState) -> Self {
+		Self { state }
+	}
+
+	pub async fn query_gacha_roll_by_id(
+		&self,
+		id: String,
+	) -> Result<GachaRollQueryDto> {
+		let db = &self.state.surrealdb_ws;
+		let builder = DetailQueryBuilder::new(ResourceEnum::GachaRolls.to_string())
+			.with_id(id.clone())
+			.with_select_fields(vec!["*"])
+			.with_fetch("item");
+		let sql = builder.build();
+		let result: Option<GachaRollQueryDto> =
+			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+		match result {
+			Some(roll) if !roll.is_deleted => Ok(roll),
+			_ => bail!("Gacha Roll not found"),
+		}
+	}
+
+	pub async fn query_create_gacha_roll(
+		&self,
+		data: GachaRollSchema,
+	) -> Result<String> {
+		let db = &self.state.surrealdb_ws;
+		let record: Option<GachaRollSchema> = db
+			.create(ResourceEnum::GachaRolls.to_string())
+			.content(data)
+			.await?;
+		match record {
+			Some(_) => Ok("Success create Gacha Roll".into()),
+			None => bail!("Failed to create Gacha Roll"),
+		}
+	}
+
+	pub async fn query_all_active_rolls(&self) -> Result<Vec<GachaRollQueryDto>> {
+		let db = &self.state.surrealdb_ws;
+		let sql = DetailQueryBuilder::new(ResourceEnum::GachaRolls.to_string())
+			.with_where("is_deleted")
+			.where_value("false")
+			.with_select_fields(vec!["*"])
+			.with_fetch("item")
+			.build();
+		let result: Vec<GachaRollQueryDto> = db.query(sql).await?.take(0)?;
+		Ok(result)
+	}
+
+	pub fn roll_once(rolls: &[GachaRollQueryDto]) -> Option<GachaRollQueryDto> {
+		let filtered: Vec<_> = rolls
+			.iter()
+			.filter(|r| !r.is_deleted && r.quantity > 0)
+			.collect();
+		let weights: Vec<f32> = filtered
+			.iter()
+			.map(|r| r.weight * r.quantity as f32)
+			.collect();
+		if weights.iter().all(|&w| w <= 0.0) {
+			return None;
+		}
+		let dist = WeightedIndex::new(&weights).ok()?;
+		let mut rng = rng();
+		let index = dist.sample(&mut rng);
+		Some(filtered[index].clone())
+	}
+}
@@ -0,0 +1,54 @@
+use crate::{ResourceEnum, make_thing};
+use imphnen_iam::get_iso_date;
+use serde::{Deserialize, Serialize};
+use surrealdb::{Uuid, sql::Thing};
+
+use super::GachaRollRequestDto;
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct GachaRollSchema {
+	pub id: Thing,
+	pub item: Thing,
+	pub weight: f32,
+	pub quantity: i32,
+	pub is_deleted: bool,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+impl Default for GachaRollSchema {
+	fn default() -> Self {
+		GachaRollSchema {
+			id: make_thing(
+				&ResourceEnum::GachaRolls.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			item: make_thing(
+				&ResourceEnum::GachaItems.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			weight: 0.0,
+			quantity: 0,
+			is_deleted: false,
+			created_at: Some(get_iso_date()),
+			updated_at: Some(get_iso_date()),
+		}
+	}
+}
+
+impl GachaRollSchema {
+	pub fn create(dto: GachaRollRequestDto) -> Self {
+		Self {
+			id: make_thing(
+				&ResourceEnum::GachaRolls.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			item: make_thing(&ResourceEnum::GachaItems.to_string(), &dto.item_id),
+			weight: dto.weight,
+			quantity: dto.quantity,
+			is_deleted: false,
+			created_at: Some(get_iso_date()),
+			updated_at: Some(get_iso_date()),
+		}
+	}
+}
@@ -0,0 +1,49 @@
+use crate::{
+	AppState, GachaRollItemDto, GachaRollRepository, GachaRollRequestDto,
+	GachaRollSchema, ResponseSuccessDto, common_response, success_response,
+	validate_request,
+};
+use axum::http::StatusCode;
+use axum::response::Response;
+
+pub struct GachaRollService;
+
+impl GachaRollService {
+	pub async fn get_gacha_roll_by_id(state: &AppState, id: String) -> Response {
+		let repo = GachaRollRepository::new(state);
+		match repo.query_gacha_roll_by_id(id).await {
+			Ok(roll) => success_response(ResponseSuccessDto {
+				data: GachaRollItemDto::from(&roll),
+			}),
+			Err(e) => common_response(StatusCode::NOT_FOUND, &e.to_string()),
+		}
+	}
+
+	pub async fn create_gacha_roll(
+		state: &AppState,
+		payload: GachaRollRequestDto,
+	) -> Response {
+		if let Err((status, message)) = validate_request(&payload) {
+			return common_response(status, &message);
+		}
+		let schema = GachaRollSchema::create(payload);
+		let repo = GachaRollRepository::new(state);
+		match repo.query_create_gacha_roll(schema).await {
+			Ok(msg) => common_response(StatusCode::CREATED, &msg),
+			Err(e) => common_response(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
+		}
+	}
+
+	pub async fn execute_roll_once(state: &AppState) -> Response {
+		let repo = GachaRollRepository::new(state);
+		match repo.query_all_active_rolls().await {
+			Ok(rolls) => match GachaRollRepository::roll_once(&rolls) {
+				Some(roll) => success_response(ResponseSuccessDto {
+					data: GachaRollItemDto::from(&roll),
+				}),
+				None => common_response(StatusCode::NOT_FOUND, "No rollable item available"),
+			},
+			Err(e) => common_response(StatusCode::INTERNAL_SERVER_ERROR, &e.to_string()),
+		}
+	}
+}
@@ -0,0 +1,22 @@
+pub mod gacha_roll_controller;
+pub mod gacha_roll_dto;
+pub mod gacha_roll_repository;
+pub mod gacha_roll_schema;
+pub mod gacha_roll_service;
+
+use axum::{
+	Router,
+	routing::{get, post},
+};
+pub use gacha_roll_controller::*;
+pub use gacha_roll_dto::*;
+pub use gacha_roll_repository::*;
+pub use gacha_roll_schema::*;
+pub use gacha_roll_service::*;
+
+pub fn gacha_roll_router() -> Router {
+	Router::new()
+		.route("/create", post(post_create_gacha_roll))
+		.route("/execute", post(post_execute_gacha_roll))
+		.route("/detail/{id}", get(get_detail_gacha_roll))
+}
@@ -0,0 +1,16 @@
+use axum::Router;
+
+pub mod gacha_claim;
+pub mod gacha_item;
+pub mod gacha_roll;
+
+pub use gacha_claim::*;
+pub use gacha_item::*;
+pub use gacha_roll::*;
+
+pub fn gacha_router() -> Router {
+	Router::new()
+		.nest("/gacha/claims", gacha_claim_router())
+		.nest("/gacha/items", gacha_item_router())
+		.nest("/gacha/rolls", gacha_roll_router())
+}
@@ -1,73 +0,0 @@
-use axum::{
-	Extension,
-	extract::Request,
-	http::{HeaderValue, Method, StatusCode, header},
-	middleware::Next,
-	response::Response,
-};
-use imphnen_iam_service::{UsersItemDtoRaw, UsersRepository};
-use imphnen_libs::{AppState, Env};
-use imphnen_utils::{common_response, extract_email};
-use std::convert::Infallible;
-use tower_http::cors::CorsLayer;
-
-pub async fn auth_middleware(
-	Extension(state): Extension<AppState>,
-	mut req: Request,
-	next: Next,
-) -> Result<Response, Infallible> {
-	let headers = req.headers();
-	let email = match extract_email(headers) {
-		Some(email) => email,
-		None => {
-			return Ok(common_response(
-				StatusCode::UNAUTHORIZED,
-				"Invalid or expired token",
-			));
-		}
-	};
-	let repository = UsersRepository::new(&state);
-	let user: Option<UsersItemDtoRaw> =
-		match repository.query_user_by_email(email).await {
-			Ok(user) => Some(user),
-			Err(err) => {
-				return Ok(common_response(
-					StatusCode::INTERNAL_SERVER_ERROR,
-					&err.to_string(),
-				));
-			}
-		};
-	if user.is_none() {
-		return Ok(common_response(
-			StatusCode::UNAUTHORIZED,
-			"Unauthorized user",
-		));
-	}
-	req.extensions_mut().insert(user.unwrap());
-	Ok(next.run(req).await)
-}
-
-pub fn cors_middleware() -> CorsLayer {
-	let env = Env::new();
-	let cors_origins = match env.rust_env.as_str() {
-		"development" => vec!["http://localhost:3000"],
-		"production" => {
-			vec!["https://gacha.imphnen.dev", "https://imphnen.dev"]
-		}
-		_ => vec![
-			"http://localhost:3000",
-			"https://gacha.imphnen.dev",
-			"https://imphnen.dev",
-		],
-	};
-	let allowed_origins: Vec<HeaderValue> = cors_origins
-		.into_iter()
-		.filter_map(|origin| origin.parse::<HeaderValue>().ok())
-		.collect();
-
-	CorsLayer::new()
-		.allow_origin(allowed_origins)
-		.allow_methods([Method::GET, Method::POST, Method::PUT, Method::DELETE])
-		.allow_headers([header::AUTHORIZATION, header::CONTENT_TYPE])
-		.allow_credentials(true)
-}
@@ -0,0 +1,27 @@
+[package]
+name = "imphnen-gateway"
+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-gacha = { version = "0.1.0", path = "../imphnen-gacha" }
+imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
+imphnen-middleware = { version = "0.1.0", path = "../imphnen-middleware" }
+axum.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+utoipa.workspace = true
+lazy_static.workspace = true
+regex.workspace = true
+validator.workspace = true
+axum-test.workspace = true
+surrealdb.workspace = true
+rand.workspace = true
+tokio.workspace = true
+chrono.workspace = true
+anyhow.workspace = true
+tower-http.workspace = true
+utoipa-swagger-ui.workspace = true
@@ -1,11 +1,11 @@
-use imphnen_iam_service::{
-auth, permissions, roles, users, AuthLoginRequestDto, AuthLoginResponsetDto, AuthResendOtpRequestDto, AuthVerifyEmailRequestDto,
- AuthNewPasswordRequestDto, AuthRefreshTokenRequestDto, MessageResponseDto, MetaRequestDto, MetaResponseDto, PermissionsItemDto, PermissionsRequestDto, ResponseListSuccessDto, ResponseSuccessDto, RolesItemDto, RolesRequestCreateDto, RolesRequestUpdateDto, TokenDto, UsersCreateRequestDto, UsersDetailItemDto, UsersItemDto, UsersListItemDto, UsersUpdateRequestDto
+use imphnen_iam::{
+auth, permissions, roles, users, AuthLoginRequestDto, AuthLoginResponsetDto, AuthNewPasswordRequestDto, AuthRefreshTokenRequestDto, AuthResendOtpRequestDto, AuthVerifyEmailRequestDto, MessageResponseDto, MetaRequestDto, MetaResponseDto, PermissionsItemDto, PermissionsRequestDto, ResponseListSuccessDto, ResponseSuccessDto, RolesDetailItemDto, RolesListItemDto, RolesRequestCreateDto, RolesRequestUpdateDto, TokenDto, UsersCreateRequestDto, UsersDetailItemDto, UsersListItemDto, UsersUpdateRequestDto
 };
 use utoipa::{
 	openapi::security::{Http, HttpAuthScheme, SecurityScheme},
 	Modify, OpenApi,
 };
+use imphnen_gacha::{gacha_claim, gacha_item, gacha_roll, GachaClaimItemDto, GachaClaimRequestDto, GachaItemDto, GachaItemRequestDto, GachaRollItemDto, GachaRollRequestDto};

 #[derive(OpenApi)]
 #[openapi(
@@ -34,7 +34,17 @@ use utoipa::{
     permissions::permissions_controller::get_permission_by_id,
     permissions::permissions_controller::post_create_permission,
     permissions::permissions_controller::put_update_permission,
-     permissions::permissions_controller::delete_permission
+     permissions::permissions_controller::delete_permission,
+     gacha_claim::get_detail_gacha_claim,
+     gacha_claim::post_create_gacha_claim,
+     gacha_item::get_gacha_item_list,
+     gacha_item::get_gacha_item_by_id,
+     gacha_item::post_create_gacha_item,
+     gacha_item::put_update_gacha_item,
+     gacha_item::delete_gacha_item,
+     gacha_roll::get_detail_gacha_roll,
+     gacha_roll::post_create_gacha_roll,
+     gacha_roll::post_execute_gacha_roll,
    ),
    components(
        schemas(
@@ -48,18 +58,28 @@ use utoipa::{
           AuthNewPasswordRequestDto,
           AuthRefreshTokenRequestDto,
           ResponseSuccessDto<TokenDto>,
-           RolesItemDto,
+           RolesListItemDto,
           RolesRequestCreateDto, 
           RolesRequestUpdateDto,
           PermissionsRequestDto,
           PermissionsItemDto,
-           UsersItemDto,
+           UsersDetailItemDto,
           UsersListItemDto,
           UsersUpdateRequestDto,
           UsersCreateRequestDto,
+           GachaClaimItemDto,
+           GachaClaimRequestDto,
+           GachaItemDto,
+           GachaItemRequestDto,
+           GachaRollItemDto,
+           GachaRollRequestDto,
+           ResponseListSuccessDto<Vec<GachaItemDto>>,
+           ResponseSuccessDto<GachaRollItemDto>,
+           ResponseSuccessDto<GachaItemDto>,
+           ResponseSuccessDto<GachaClaimItemDto>,
           ResponseSuccessDto<AuthLoginResponsetDto>,
-           ResponseListSuccessDto<Vec<RolesItemDto>>,
-           ResponseSuccessDto<RolesItemDto>,
+           ResponseListSuccessDto<Vec<RolesListItemDto>>,
+           ResponseSuccessDto<RolesDetailItemDto>,
           ResponseListSuccessDto<Vec<UsersListItemDto>>,
           ResponseSuccessDto<UsersDetailItemDto>,
           ResponseListSuccessDto<Vec<PermissionsItemDto>>,
@@ -102,4 +122,4 @@ impl Modify for SecurityAddon {

 pub fn docs_router() -> utoipa::openapi::OpenApi {
 	ApiDoc::openapi()
-}
+}
@@ -2,14 +2,13 @@ use axum::{
 	Extension, Router, middleware::from_fn, response::Redirect, routing::get,
 };
 use imphnen_entities::{AppState, SurrealMemClient, SurrealWsClient};
-use imphnen_iam_service::{iam_protected_routes, iam_public_routes};
+use imphnen_gacha::gacha_router;
+use imphnen_iam::{iam_protected_routes, iam_public_routes};
+use imphnen_middleware::{auth_middleware, cors_middleware};
+use utoipa_swagger_ui::SwaggerUi;

 pub mod docs;
-pub mod middleware;
-
 pub use docs::*;
-pub use middleware::*;
-use utoipa_swagger_ui::SwaggerUi;

 pub async fn gateway_service(
 	surrealdb_ws: SurrealWsClient,
@@ -21,12 +20,16 @@ pub async fn gateway_service(
 	};

 	let public_routes = iam_public_routes();
-	let protected_routes = iam_protected_routes().layer(from_fn(auth_middleware));
+
+	let protected_routes = Router::new()
+		.merge(iam_protected_routes())
+		.merge(gacha_router())
+		.layer(from_fn(auth_middleware));

 	Router::new()
 		.route("/", get(Redirect::to("/docs")))
 		.nest("/v1", public_routes.merge(protected_routes))
 		.merge(SwaggerUi::new("/docs").url("/openapi.json", docs_router()))
 		.layer(cors_middleware())
-		.layer(Extension(state.clone()))
+		.layer(Extension(state))
 }
@@ -1,33 +0,0 @@
-use serde::{Deserialize, Serialize};
-use surrealdb::{sql::Thing, Uuid};
-
-use crate::{make_thing, ResourceEnum};
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RolesSchema {
-	pub id: Thing,
-	pub name: String,
-	pub is_deleted: bool,
-	pub permissions: Vec<Thing>,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-impl Default for RolesSchema {
-	fn default() -> Self {
-		RolesSchema {
-			id: make_thing(
-				&ResourceEnum::Roles.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			permissions: vec![make_thing(
-				&ResourceEnum::Permissions.to_string(),
-				&Uuid::new_v4().to_string(),
-			)],
-			name: String::new(),
-			is_deleted: false,
-			created_at: None,
-			updated_at: None,
-		}
-	}
-}
@@ -1,317 +0,0 @@
-use super::{
-	UsersActiveInactiveSchema, UsersItemDto, UsersItemDtoRaw, UsersListItemDto,
-	UsersListItemDtoRaw, UsersSchema, UsersSetNewPasswordSchema,
-};
-use crate::{
-	extract_id, get_id, make_thing, query_list_with_meta, AppState, MetaRequestDto,
-	PermissionsItemDto, PermissionsItemDtoRaw, ResourceEnum, ResponseListSuccessDto,
-	RolesItemDto, RolesItemDtoRaw,
-};
-use anyhow::{anyhow, bail, Result};
-
-pub struct UsersRepository<'a> {
-	state: &'a AppState,
-}
-
-impl<'a> UsersRepository<'a> {
-	pub fn new(state: &'a AppState) -> Self {
-		Self { state }
-	}
-
-	pub async fn query_user_list(
-		&self,
-		meta: MetaRequestDto,
-	) -> Result<ResponseListSuccessDto<Vec<UsersListItemDto>>> {
-		let db = &self.state.surrealdb_ws;
-		let mut conditions = vec!["is_deleted = false".to_string()];
-		if let Some(search) = meta.search.as_deref() {
-			if !search.is_empty() {
-				conditions.push("string::contains(fullname ?? '', $search)".to_string());
-			}
-		}
-		if let (Some(filter_by), Some(_filter)) =
-			(meta.filter_by.as_ref(), meta.filter.as_ref())
-		{
-			conditions.push(format!("{} = $filter", filter_by));
-		}
-		let where_clause = if !conditions.is_empty() {
-			format!("WHERE {}", conditions.join(" AND "))
-		} else {
-			String::new()
-		};
-		let limit = meta.per_page.unwrap_or(10);
-		let page = meta.page.unwrap_or(1);
-		if page < 1 || limit < 1 {
-			return Err(anyhow!("Invalid pagination parameters"));
-		}
-		let start = (page - 1) * limit;
-		let select_query = format!(
-			"
-			SELECT
-				id,
-				role.name AS role,
-				fullname,
-				email,
-				avatar,
-				phone_number,
-				is_active,
-				gender,
-				birthdate,
-				created_at,
-				updated_at
-			FROM {}
-			{}
-			LIMIT {} START {}
-			FETCH role 
-			",
-			ResourceEnum::Users.to_string(),
-			where_clause,
-			limit,
-			start
-		);
-		let raw_result = query_list_with_meta::<UsersListItemDtoRaw>(
-			db,
-			&ResourceEnum::Users.to_string(),
-			&meta,
-			vec![],
-			Some(select_query),
-		)
-		.await?;
-		let transformed_data = raw_result
-			.data
-			.into_iter()
-			.map(|user| UsersListItemDto {
-				id: extract_id(&user.id),
-				fullname: user.fullname,
-				email: user.email,
-				avatar: user.avatar,
-				phone_number: user.phone_number,
-				is_active: user.is_active,
-				role: user.role.unwrap_or_else(|| "-".into()),
-				created_at: user.created_at,
-				updated_at: user.updated_at,
-			})
-			.collect::<Vec<_>>();
-		Ok(ResponseListSuccessDto {
-			data: transformed_data,
-			meta: raw_result.meta,
-		})
-	}
-
-	pub async fn query_user_by_email(&self, email: String) -> Result<UsersItemDtoRaw> {
-		let db = &self.state.surrealdb_ws;
-		let sql = format!(
-			"SELECT *, role AS role FROM {} WHERE email = $email AND is_deleted = false LIMIT 1 FETCH role, role.permissions",
-			ResourceEnum::Users.to_string()
-		);
-
-		let response: Option<UsersItemDtoRaw> = db
-			.query(sql)
-			.bind(("email", email.clone()))
-			.await?
-			.take(0)?;
-
-		match response {
-			Some(user) if !user.role.is_deleted => {
-				let permissions = user
-					.role
-					.permissions
-					.into_iter()
-					.map(|perm| PermissionsItemDtoRaw {
-						id: perm.id,
-						name: perm.name,
-						created_at: perm.created_at,
-						updated_at: perm.updated_at,
-					})
-					.collect::<Vec<_>>();
-				Ok(UsersItemDtoRaw {
-					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: RolesItemDtoRaw {
-						id: user.role.id,
-						name: user.role.name,
-						permissions,
-						created_at: user.role.created_at,
-						updated_at: user.role.updated_at,
-						is_deleted: user.role.is_deleted,
-					},
-				})
-			}
-			_ => bail!("User not found"),
-		}
-	}
-
-	pub async fn query_user_by_id(&self, id: String) -> Result<UsersItemDto> {
-		let db = &self.state.surrealdb_ws;
-
-		let query = format!(
-			"SELECT *, role AS role FROM app_users:⟨{}⟩ FETCH role, role.permissions",
-			id
-		);
-
-		let mut result = db.query(query).await?;
-
-		let response: Option<UsersItemDtoRaw> = result.take(0)?;
-
-		match response {
-			Some(user) if !user.role.is_deleted => {
-				let permissions = user
-					.role
-					.permissions
-					.into_iter()
-					.map(|perm| PermissionsItemDto {
-						id: extract_id(&perm.id),
-						name: perm.name,
-						created_at: perm.created_at,
-						updated_at: perm.updated_at,
-					})
-					.collect::<Vec<_>>();
-
-				Ok(UsersItemDto {
-					id: extract_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,
-					role: RolesItemDto {
-						id: extract_id(&user.role.id),
-						name: user.role.name,
-						permissions,
-						created_at: user.role.created_at,
-						updated_at: user.role.updated_at,
-					},
-					created_at: user.created_at,
-					updated_at: user.updated_at,
-				})
-			}
-			_ => bail!("User not found"),
-		}
-	}
-
-	pub async fn query_create_user(&self, data: UsersSchema) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let record: Option<UsersSchema> = db
-			.create(ResourceEnum::Users.to_string())
-			.content(data)
-			.await?;
-		match record {
-			Some(_) => Ok("Success create user".into()),
-			None => bail!("Failed to create user"),
-		}
-	}
-
-	pub async fn query_update_user(&self, data: UsersSchema) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let record_key = get_id(&data.id)?;
-		let existing = self.query_user_by_id(data.id.id.to_raw()).await?;
-		if existing.is_deleted {
-			bail!("User already deleted");
-		}
-		let merged = UsersSchema {
-			password: existing.password,
-			created_at: existing.created_at,
-			role: make_thing("app_roles", &existing.role.id),
-			..data.clone()
-		};
-		let record: Option<UsersSchema> = db.update(record_key).merge(merged).await?;
-		match record {
-			Some(_) => Ok("Success update user".into()),
-			None => bail!("Failed to update user"),
-		}
-	}
-
-	pub async fn query_active_inactive_user(
-		&self,
-		email: String,
-		data: UsersActiveInactiveSchema,
-	) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let user = self.query_user_by_email(email.clone()).await?;
-		if user.is_deleted {
-			bail!("User already deleted");
-		}
-		let record_key = get_id(&user.id)?;
-		let record: Option<UsersSchema> = db
-			.update(record_key)
-			.merge(UsersActiveInactiveSchema {
-				is_active: data.is_active,
-			})
-			.await?;
-		match record {
-			Some(_) => Ok("Success update user".into()),
-			None => bail!("Failed to update user"),
-		}
-	}
-
-	pub async fn query_active_inactive_user_by_id(
-		&self,
-		id: String,
-		data: UsersActiveInactiveSchema,
-	) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let record: Option<UsersSchema> = db
-			.update((ResourceEnum::Users.to_string(), id))
-			.merge(UsersActiveInactiveSchema {
-				is_active: data.is_active,
-			})
-			.await?;
-		match record {
-			Some(_) => Ok("Success update user".into()),
-			None => bail!("Failed to update user"),
-		}
-	}
-
-	pub async fn query_update_password_user(
-		&self,
-		email: String,
-		data: UsersSetNewPasswordSchema,
-	) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let user = self.query_user_by_email(email).await?;
-		let record: Option<UsersSetNewPasswordSchema> = db
-			.update((ResourceEnum::Users.to_string(), user.id.id.to_raw()))
-			.merge(UsersSetNewPasswordSchema {
-				password: data.password.clone(),
-			})
-			.await?;
-		dbg!(record.clone());
-		match record {
-			Some(_) => Ok("Success update password user".into()),
-			None => bail!("Failed to update password user"),
-		}
-	}
-
-	pub async fn query_delete_user(&self, id: String) -> Result<String> {
-		let db = &self.state.surrealdb_ws;
-		let user_id = make_thing(&ResourceEnum::Users.to_string(), &id);
-		let user = self.query_user_by_id(user_id.id.to_raw()).await?;
-		if user.is_deleted {
-			bail!("User already deleted");
-		}
-		let id = make_thing(&ResourceEnum::Users.to_string(), &user.id);
-		let record_key = get_id(&id)?;
-		let record: Option<UsersSchema> = db
-			.update(record_key)
-			.merge(serde_json::json!({ "is_deleted": true }))
-			.await?;
-		match record {
-			Some(_) => Ok("Success delete user".into()),
-			None => bail!("Failed to delete user"),
-		}
-	}
-}
@@ -1,56 +0,0 @@
-use crate::{get_iso_date, make_thing, ResourceEnum};
-use serde::{Deserialize, Serialize};
-use surrealdb::{sql::Thing, Uuid};
-
-#[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 is_active: bool,
-	pub is_deleted: bool,
-	pub gender: Option<String>,
-	pub birthdate: Option<String>,
-	pub role: Thing,
-	pub created_at: String,
-	pub updated_at: String,
-}
-
-impl Default for UsersSchema {
-	fn default() -> Self {
-		UsersSchema {
-			id: make_thing(
-				&ResourceEnum::Users.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			fullname: String::new(),
-			email: String::new(),
-			password: String::new(),
-			avatar: None,
-			phone_number: String::new(),
-			is_active: false,
-			is_deleted: false,
-			gender: None,
-			birthdate: None,
-			role: make_thing(
-				&ResourceEnum::Roles.to_string(),
-				&Uuid::new_v4().to_string(),
-			),
-			created_at: get_iso_date(),
-			updated_at: get_iso_date(),
-		}
-	}
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct UsersSetNewPasswordSchema {
-	pub password: String,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct UsersActiveInactiveSchema {
-	pub is_active: bool,
-}
@@ -1,12 +1,12 @@
 [package]
-name = "imphnen-dimentorin-service"
+name = "imphnen-iam"
 version = "0.1.0"
 edition = "2024"

 [dependencies]
-imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
 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" }
 axum.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -21,4 +21,4 @@ tokio.workspace = true
 chrono.workspace = true
 anyhow.workspace = true
 tower-http.workspace = true
-utoipa-swagger-ui.workspace = true
+utoipa-swagger-ui.workspace = true
@@ -7,6 +7,7 @@ pub mod v1;

 pub use imphnen_entities::*;
 pub use imphnen_libs::*;
+pub use imphnen_utils::*;
 pub use v1::*;

 pub fn create_test_user(
@@ -27,6 +28,7 @@ pub fn create_test_user(
 		gender: None,
 		birthdate: None,
 		role: make_thing("app_roles", role_id),
-		..Default::default()
+		created_at: get_iso_date(),
+		updated_at: get_iso_date(),
 	}
 }
@@ -1,25 +1,29 @@
-use crate::RolesItemDto;
 use lazy_static::lazy_static;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 use validator::{Validate, ValidationError};

+use crate::UsersDetailItemDto;
+
 lazy_static! {
-	static ref PASSWORD_REGEX: Regex = Regex::new(r"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$").unwrap();
+	static ref PASSWORD_REGEX: Regex = Regex::new(
+		r"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$"
+	)
+	.unwrap();
 }

 fn validate_password_complexity(password: &str) -> Result<(), ValidationError> {
-    let has_uppercase = password.chars().any(|c| c.is_ascii_uppercase());
-    let has_lowercase = password.chars().any(|c| c.is_ascii_lowercase());
-    let has_digit = password.chars().any(|c| c.is_ascii_digit());
-    let has_special = password.chars().any(|c| "@$!%*?&".contains(c));
+	let has_uppercase = password.chars().any(|c| c.is_ascii_uppercase());
+	let has_lowercase = password.chars().any(|c| c.is_ascii_lowercase());
+	let has_digit = password.chars().any(|c| c.is_ascii_digit());
+	let has_special = password.chars().any(|c| "@$!%*?&".contains(c));

-    if has_uppercase && has_lowercase && has_digit && has_special {
-        Ok(())
-    } else {
-        Err(ValidationError::new("complexity"))
-    }
+	if has_uppercase && has_lowercase && has_digit && has_special {
+		Ok(())
+	} else {
+		Err(ValidationError::new("complexity"))
+	}
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
@@ -33,23 +37,10 @@ pub struct AuthLoginRequestDto {
 	pub password: String,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct AuthUserItemDto {
-	pub id: String,
-	pub role: RolesItemDto,
-	pub fullname: String,
-	pub email: String,
-	pub avatar: Option<String>,
-	pub phone_number: String,
-	pub is_active: bool,
-	pub gender: Option<String>,
-	pub birthdate: Option<String>,
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
 pub struct AuthLoginResponsetDto {
 	pub token: TokenDto,
-	pub user: AuthUserItemDto,
+	pub user: UsersDetailItemDto,
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
@@ -77,28 +68,7 @@ pub struct AuthRegisterRequestDto {
 	#[validate(length(min = 2, message = "Fullname at least have 2 character"))]
 	pub fullname: String,
 	#[validate(length(min = 1, message = "Student type is required"))]
-	pub student_type: String,
-	#[validate(length(
-		min = 10,
-		message = "Phone number at least have 10 character"
-	))]
 	pub phone_number: String,
-	#[validate(length(
-		max = 4,
-		message = "Referal code cannot be more than 4 character"
-	))]
-	pub referral_code: Option<String>,
-	pub referred_by: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
-pub struct AuthActiveInactiveRequestDto {
-	pub is_active: bool,
-	#[validate(
-		length(min = 1, message = "Email cannot be empty"),
-		email(message = "Email not valid")
-	)]
-	pub email: String,
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
@@ -1,6 +1,6 @@
 use super::AuthOtpSchema;
-use crate::{make_thing, AppState, ResourceEnum, UsersItemDtoRaw};
-use anyhow::{anyhow, bail, Result};
+use crate::{AppState, ResourceEnum, UsersDetailQueryDto, make_thing};
+use anyhow::{Result, anyhow, bail};
 use chrono::{Duration, Utc};

 pub struct AuthRepository<'a> {
@@ -12,7 +12,7 @@ impl<'a> AuthRepository<'a> {
 		Self { state }
 	}

-	pub async fn query_store_user(&self, user: UsersItemDtoRaw) -> Result<String> {
+	pub async fn query_store_user(&self, user: UsersDetailQueryDto) -> Result<String> {
 		if user.email.trim().is_empty() {
 			bail!("Email is required");
 		}
@@ -22,11 +22,11 @@ impl<'a> AuthRepository<'a> {
 		let _ = self
 			.state
 			.surrealdb_mem
-			.delete::<Option<UsersItemDtoRaw>>((table.clone(), user_id.clone()))
+			.delete::<Option<UsersDetailQueryDto>>((table.clone(), user_id.clone()))
 			.await?;
 		let mut user_to_store = user.clone();
 		user_to_store.id = id.clone();
-		let record: Option<UsersItemDtoRaw> = self
+		let record: Option<UsersDetailQueryDto> = self
 			.state
 			.surrealdb_mem
 			.create((table, user_id))
@@ -41,8 +41,8 @@ impl<'a> AuthRepository<'a> {
 	pub async fn query_get_stored_user(
 		&self,
 		email: String,
-	) -> Result<UsersItemDtoRaw> {
-		let user: Option<UsersItemDtoRaw> = self
+	) -> Result<UsersDetailQueryDto> {
+		let user: Option<UsersDetailQueryDto> = self
 			.state
 			.surrealdb_mem
 			.select((ResourceEnum::UsersCache.to_string(), email))
@@ -54,7 +54,7 @@ impl<'a> AuthRepository<'a> {
 	}

 	pub async fn query_delete_stored_user(&self, email: String) -> Result<String> {
-		let record: Option<UsersItemDtoRaw> = self
+		let record: Option<UsersDetailQueryDto> = self
 			.state
 			.surrealdb_mem
 			.delete((ResourceEnum::UsersCache.to_string(), email))
@@ -1,15 +1,15 @@
 use super::{
 	AuthLoginRequestDto, AuthLoginResponsetDto, AuthNewPasswordRequestDto,
 	AuthRefreshTokenRequestDto, AuthRegisterRequestDto, AuthRepository,
-	AuthResendOtpRequestDto, AuthUserItemDto, AuthVerifyEmailRequestDto, TokenDto,
+	AuthResendOtpRequestDto, AuthVerifyEmailRequestDto, TokenDto,
 };
 use crate::{
-	common_response, decode_refresh_token, encode_access_token, encode_refresh_token,
+	AppState, Env, ResourceEnum, ResponseSuccessDto, RolesEnum, RolesRepository,
+	UsersDetailItemDto, UsersRepository, UsersSchema, common_response,
+	decode_refresh_token, encode_access_token, encode_refresh_token,
 	encode_reset_password_token, extract_email_token, generate_otp, get_iso_date,
 	hash_password, make_thing, send_email, success_response, validate_request,
-	verify_password, AppState, Env, ResourceEnum, ResponseSuccessDto, RolesEnum,
-	RolesItemDto, RolesRepository, UsersActiveInactiveSchema, UsersRepository,
-	UsersSchema, UsersSetNewPasswordSchema,
+	verify_password,
 };
 use axum::{http::StatusCode, response::Response};
 use surrealdb::Uuid;
@@ -27,7 +27,6 @@ impl AuthService {

 		let user_repo = UsersRepository::new(state);
 		let auth_repo = AuthRepository::new(state);
-		let role_repo = RolesRepository::new(state);

 		match user_repo.query_user_by_email(payload.email.clone()).await {
 			Ok(user) => {
@@ -54,7 +53,7 @@ impl AuthService {
 						return common_response(
 							StatusCode::INTERNAL_SERVER_ERROR,
 							"Failed to generate access token",
-						)
+						);
 					}
 				};

@@ -64,34 +63,13 @@ impl AuthService {
 						return common_response(
 							StatusCode::INTERNAL_SERVER_ERROR,
 							"Failed to generate refresh token",
-						)
+						);
 					}
 				};

-				let role_response = role_repo
-					.query_role_by_id(user.role.id.id.to_raw())
-					.await
-					.unwrap();
-
 				let response = ResponseSuccessDto {
 					data: AuthLoginResponsetDto {
-						user: AuthUserItemDto {
-							id: user.id.id.to_raw(),
-							fullname: user.fullname.clone(),
-							email: user.email.clone(),
-							is_active: user.is_active.clone(),
-							avatar: user.avatar.clone(),
-							phone_number: user.phone_number.clone(),
-							gender: user.gender.clone(),
-							birthdate: user.birthdate.clone(),
-							role: RolesItemDto {
-								id: role_response.id,
-								name: role_response.name,
-								permissions: role_response.permissions,
-								created_at: role_response.created_at,
-								updated_at: role_response.updated_at,
-							},
-						},
+						user: UsersDetailItemDto::from(&user),
 						token: TokenDto {
 							access_token,
 							refresh_token,
@@ -116,6 +94,7 @@ impl AuthService {
 		if let Err((status, message)) = validate_request(&payload) {
 			return common_response(status, &message);
 		}
+
 		let user_repo = UsersRepository::new(state);
 		let auth_repo = AuthRepository::new(state);
 		let role_repo = RolesRepository::new(state);
@@ -126,6 +105,7 @@ impl AuthService {
 			Ok(role) => role,
 			Err(_) => return common_response(StatusCode::BAD_REQUEST, "Role Not Found"),
 		};
+
 		if user_repo
 			.query_user_by_email(payload.email.clone())
 			.await
@@ -133,6 +113,7 @@ impl AuthService {
 		{
 			return common_response(StatusCode::BAD_REQUEST, "User already exists");
 		}
+
 		let hashed_password = match hash_password(&payload.password) {
 			Ok(hash) => hash,
 			Err(_) => {
@@ -142,16 +123,16 @@ impl AuthService {
 				);
 			}
 		};
+
 		let new_user = AuthRegisterRequestDto {
 			email: payload.email,
 			password: hashed_password,
 			fullname: payload.fullname,
-			student_type: payload.student_type,
 			phone_number: payload.phone_number,
-			referral_code: payload.referral_code,
-			referred_by: payload.referred_by,
 		};
+
 		let otp = generate_otp::OtpManager::generate_otp();
+
 		match auth_repo
 			.query_store_otp(new_user.email.clone(), otp.clone())
 			.await
@@ -169,11 +150,13 @@ impl AuthService {
 				return common_response(StatusCode::INTERNAL_SERVER_ERROR, &err.to_string());
 			}
 		}
+
 		let role_thing = make_thing(&ResourceEnum::Roles.to_string(), &role.id);
 		let user_thing = make_thing(
 			&ResourceEnum::Users.to_string(),
 			&Uuid::new_v4().to_string(),
 		);
+
 		match user_repo
 			.query_create_user(UsersSchema {
 				id: user_thing,
@@ -202,14 +185,18 @@ impl AuthService {
 		if let Err((status, message)) = validate_request(&payload) {
 			return common_response(status, &message);
 		}
-		
+
 		let user_repo = UsersRepository::new(state);
-		if user_repo.query_user_by_email(payload.email.clone()).await.is_err() {
+		if user_repo
+			.query_user_by_email(payload.email.clone())
+			.await
+			.is_err()
+		{
 			return common_response(StatusCode::BAD_REQUEST, "User not found");
 		}

 		let auth_repo = AuthRepository::new(state);
-		let  _ = auth_repo.query_get_stored_otp(payload.email.clone()).await;
+		let _ = auth_repo.query_get_stored_otp(payload.email.clone()).await;

 		let otp = generate_otp::OtpManager::generate_otp();
 		let message = format!("Your OTP code is {}", otp);
@@ -273,10 +260,10 @@ impl AuthService {
 		let user = match user_result {
 			Ok(user) => user,
 			Err(err) if err.to_string().contains("User not found") => {
-				return common_response(StatusCode::BAD_REQUEST, "User not found")
+				return common_response(StatusCode::BAD_REQUEST, "User not found");
 			}
 			Err(err) => {
-				return common_response(StatusCode::INTERNAL_SERVER_ERROR, &err.to_string())
+				return common_response(StatusCode::INTERNAL_SERVER_ERROR, &err.to_string());
 			}
 		};
 		let token = match encode_reset_password_token(user.email) {
@@ -285,7 +272,7 @@ impl AuthService {
 				return common_response(
 					StatusCode::INTERNAL_SERVER_ERROR,
 					"Failed to generate access token",
-				)
+				);
 			}
 		};
 		let env = Env::new();
@@ -310,15 +297,18 @@ impl AuthService {
 		let user_repo = UsersRepository::new(state);
 		let auth_repo = AuthRepository::new(state);
 		let email = payload.email.clone();
+		let user = match user_repo.query_user_by_email(email.clone()).await {
+			Ok(user) if !user.is_deleted => user,
+			_ => return common_response(StatusCode::NOT_FOUND, "User not found"),
+		};
+		let patch = UsersSchema {
+			id: user.id.clone(),
+			is_active: true,
+			..UsersSchema::from(user)
+		};
 		match auth_repo.query_get_stored_otp(email.clone()).await {
 			Ok(stored_otp) => match stored_otp == payload.otp {
-				true => match user_repo
-					.query_active_inactive_user(
-						email.clone(),
-						UsersActiveInactiveSchema { is_active: true },
-					)
-					.await
-				{
+				true => match user_repo.query_update_user(patch).await {
 					Ok(_) => match auth_repo.query_delete_stored_otp(email).await {
 						Ok(_) => common_response(StatusCode::OK, "Email verified successfully"),
 						Err(e) => {
@@ -346,7 +336,7 @@ impl AuthService {
 		if let Err((status, message)) = validate_request(&payload) {
 			return common_response(status, &message);
 		}
-		let user_repo = UsersRepository::new(state);
+		let repo = UsersRepository::new(state);
 		let email = match extract_email_token(payload.token.clone()) {
 			Some(email) => email,
 			None => {
@@ -362,12 +352,18 @@ impl AuthService {
 				);
 			}
 		};
-		match user_repo
-			.query_update_password_user(email, UsersSetNewPasswordSchema { password })
-			.await
-		{
+		let user = match repo.query_user_by_email(email.clone()).await {
+			Ok(user) if !user.is_deleted => user,
+			_ => return common_response(StatusCode::NOT_FOUND, "User not found"),
+		};
+		let patch = UsersSchema {
+			id: user.id.clone(),
+			password,
+			..Default::default()
+		};
+		match repo.query_update_user(patch).await {
 			Ok(msg) => common_response(StatusCode::OK, &msg),
-			Err(err) => common_response(StatusCode::BAD_REQUEST, &err.to_string()),
+			Err(e) => common_response(StatusCode::BAD_REQUEST, &e.to_string()),
 		}
 	}
 }
@@ -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"),
@@ -17,8 +17,19 @@ pub struct PermissionsItemDto {
 	pub updated_at: Option<String>,
 }

+impl PermissionsItemDto {
+	pub fn from(dto: &PermissionsQueryDto) -> Self {
+		Self {
+			id: dto.id.id.to_raw(),
+			name: dto.name.clone(),
+			created_at: dto.created_at.clone(),
+			updated_at: dto.updated_at.clone(),
+		}
+	}
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct PermissionsItemDtoRaw {
+pub struct PermissionsQueryDto {
 	pub id: Thing,
 	pub name: String,
 	pub created_at: Option<String>,
@@ -7,6 +7,7 @@ pub enum PermissionsEnum {
 	CreateUsers,
 	DeleteUsers,
 	UpdateUsers,
+	ActivateUsers,
 	ReadListRoles,
 	ReadDetailRoles,
 	CreateRoles,
@@ -17,6 +18,16 @@ pub enum PermissionsEnum {
 	CreatePermissions,
 	DeletePermissions,
 	UpdatePermissions,
+	CreateGachaClaims,
+	ReadDetailGachaClaims,
+	ReadListGachaItems,
+	ReadDetailGachaItems,
+	CreateGachaItems,
+	DeleteGachaItems,
+	UpdateGachaItems,
+	ReadDetailGachaRolls,
+	CreateGachaRolls,
+	ExecuteGachaRolls,
 }

 impl fmt::Display for PermissionsEnum {
@@ -27,6 +38,7 @@ impl fmt::Display for PermissionsEnum {
 			PermissionsEnum::CreateUsers => "Create Users",
 			PermissionsEnum::DeleteUsers => "Delete Users",
 			PermissionsEnum::UpdateUsers => "Update Users",
+			PermissionsEnum::ActivateUsers => "Activate Users",
 			PermissionsEnum::ReadListRoles => "Read List Roles",
 			PermissionsEnum::ReadDetailRoles => "Read Detail Roles",
 			PermissionsEnum::CreateRoles => "Create Roles",
@@ -37,6 +49,16 @@ impl fmt::Display for PermissionsEnum {
 			PermissionsEnum::CreatePermissions => "Create Permissions",
 			PermissionsEnum::DeletePermissions => "Delete Permissions",
 			PermissionsEnum::UpdatePermissions => "Update Permissions",
+			PermissionsEnum::CreateGachaClaims => "Create Gacha Claims",
+			PermissionsEnum::ReadDetailGachaClaims => "Read Detail Gacha Claims",
+			PermissionsEnum::ReadListGachaItems => "Read List Gacha Items",
+			PermissionsEnum::ReadDetailGachaItems => "Read Detail Gacha Items",
+			PermissionsEnum::CreateGachaItems => "Create Gacha Items",
+			PermissionsEnum::DeleteGachaItems => "Delete Gacha Items",
+			PermissionsEnum::UpdateGachaItems => "Update Gacha Items",
+			PermissionsEnum::ReadDetailGachaRolls => "Read Detail Gacha Rolls",
+			PermissionsEnum::CreateGachaRolls => "Create Gacha Rolls",
+			PermissionsEnum::ExecuteGachaRolls => "Execute Gacha Rolls",
 		};
 		write!(f, "{}", permission_str)
 	}
@@ -1,9 +1,10 @@
-use super::PermissionsSchema;
+use super::{PermissionsItemDto, PermissionsSchema};
 use crate::{
-	get_id, make_thing, query_list_with_meta, AppState, MetaRequestDto, ResourceEnum,
-	ResponseListSuccessDto,
+	AppState, MetaRequestDto, ResourceEnum, ResponseListSuccessDto, get_id,
+	make_thing, query_list_with_meta,
 };
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
+use imphnen_utils::{DetailQueryBuilder, extract_id};

 pub struct PermissionsRepository<'a> {
 	state: &'a AppState,
@@ -17,23 +18,28 @@ impl<'a> PermissionsRepository<'a> {
 	pub async fn query_permission_list(
 		&self,
 		meta: MetaRequestDto,
-	) -> Result<ResponseListSuccessDto<Vec<PermissionsSchema>>> {
-		let mut conditions = vec!["is_deleted = false".into()];
-		if meta.search.is_some() {
-			conditions.push("string::contains(name, $search)".into());
-		}
-		if meta.filter_by.is_some() && meta.filter.is_some() {
-			let filter_by = meta.filter_by.as_ref().unwrap();
-			conditions.push(format!("{} = $filter", filter_by));
-		}
-		query_list_with_meta(
-			&self.state.surrealdb_ws,
-			&ResourceEnum::Permissions.to_string(),
-			&meta,
-			conditions,
-			None,
-		)
-		.await
+	) -> Result<ResponseListSuccessDto<Vec<PermissionsItemDto>>> {
+		let raw_result: ResponseListSuccessDto<Vec<PermissionsSchema>> =
+			query_list_with_meta(
+				&self.state.surrealdb_ws,
+				&ResourceEnum::Permissions.to_string(),
+				&meta,
+				vec!["is_deleted = false".into()],
+				None,
+				"name",
+				Some(vec!["*"]),
+				None,
+			)
+			.await?;
+		let transformed_data = raw_result
+			.data
+			.into_iter()
+			.map(|permission| PermissionsSchema::list(&permission))
+			.collect();
+		Ok(ResponseListSuccessDto {
+			data: transformed_data,
+			meta: raw_result.meta,
+		})
 	}

 	pub async fn query_permission_by_id(
@@ -50,21 +56,35 @@ impl<'a> PermissionsRepository<'a> {
 		}
 	}

+	pub async fn transformed_query_permission_by_id(
+		&self,
+		id: String,
+	) -> Result<PermissionsItemDto> {
+		let raw_result = self.query_permission_by_id(id.clone()).await?;
+		let transformed_data = PermissionsItemDto {
+			id: extract_id(&raw_result.id),
+			name: raw_result.name,
+			created_at: raw_result.created_at,
+			updated_at: raw_result.updated_at,
+		};
+		Ok(transformed_data)
+	}
+
 	pub async fn query_permission_by_name(
 		&self,
 		name: String,
 	) -> Result<PermissionsSchema> {
 		let db = &self.state.surrealdb_ws;
-		let sql = format!(
-			"SELECT * FROM {} WHERE name = $name AND is_deleted = false",
-			ResourceEnum::Permissions.to_string()
-		);
-		let result: Vec<PermissionsSchema> =
-			db.query(sql).bind(("name", name.clone())).await?.take(0)?;
-		if let Some(permission) = result.into_iter().next() {
-			Ok(permission.into())
-		} else {
-			bail!("Permission not found")
+		let builder = DetailQueryBuilder::new(ResourceEnum::Permissions.to_string())
+			.with_where("name")
+			.where_value(name.clone())
+			.with_select_fields(vec!["*"]);
+		let sql = builder.build();
+		let result: Option<PermissionsSchema> =
+			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+		match result {
+			Some(permission) => Ok(permission),
+			None => bail!("Permission not found"),
 		}
 	}

@@ -1,6 +1,8 @@
-use crate::{make_thing, ResourceEnum};
+use crate::{ResourceEnum, make_thing};
 use serde::{Deserialize, Serialize};
-use surrealdb::{sql::Thing, Uuid};
+use surrealdb::{Uuid, sql::Thing};
+
+use super::PermissionsItemDto;

 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct PermissionsSchema {
@@ -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(),
+		}
+	}
+}
@@ -30,7 +30,7 @@ impl PermissionsService {

 	pub async fn get_permission_by_id(state: &AppState, id: String) -> Response {
 		let repo = PermissionsRepository::new(state);
-		match repo.query_permission_by_id(id).await {
+		match repo.transformed_query_permission_by_id(id).await {
 			Ok(permission) => success_response(ResponseSuccessDto { data: permission }),
 			Err(e) => common_response(StatusCode::NOT_FOUND, &e.to_string()),
 		}
@@ -1,13 +1,16 @@
 use axum::{
+	Extension, Json,
 	extract::{Path, Query},
 	response::IntoResponse,
-	Extension, Json,
 };

-use super::{RolesItemDto, RolesRequestCreateDto, RolesRequestUpdateDto};
+use super::{
+	RolesDetailItemDto, RolesListItemDto, RolesRequestCreateDto, RolesRequestUpdateDto,
+};
 use crate::{
-	permissions_guard, v1::roles_service::RolesService, AppState, MessageResponseDto,
-	MetaRequestDto, PermissionsEnum, ResponseListSuccessDto, ResponseSuccessDto,
+	AppState, MessageResponseDto, MetaRequestDto, PermissionsEnum,
+	ResponseListSuccessDto, ResponseSuccessDto, permissions_guard,
+	v1::roles_service::RolesService,
 };

 #[utoipa::path(
@@ -26,7 +29,7 @@ use crate::{
        ("filter_by" = Option<String>, Query, description = "Field to filter by"),
    ),
    responses(
-        (status = 200, description = "Get role list", body = ResponseListSuccessDto<Vec<RolesItemDto>>)
+        (status = 200, description = "Get role list", body = ResponseListSuccessDto<Vec<RolesListItemDto>>)
    ),
    tag = "Roles"
 )]
@@ -55,7 +58,7 @@ pub async fn get_role_list(
    path = "/v1/roles/detail/{id}",
    params(("id" = String, Path, description = "Role ID")),
    responses(
-        (status = 200, description = "Get role by ID", body = ResponseSuccessDto<RolesItemDto>)
+        (status = 200, description = "Get role by ID", body = ResponseSuccessDto<RolesDetailItemDto>)
    ),
    tag = "Roles"
 )]
@@ -1,4 +1,4 @@
-use crate::{PermissionsItemDto, PermissionsItemDtoRaw};
+use crate::{PermissionsItemDto, PermissionsQueryDto};
 use serde::{Deserialize, Serialize};
 use surrealdb::sql::Thing;
 use utoipa::ToSchema;
@@ -9,6 +9,7 @@ pub struct RolesRequestUpdateDto {
 	#[validate(length(min = 1, message = "Role name must not be empty"))]
 	pub name: Option<String>,
 	pub permissions: Option<Vec<String>>,
+	pub overwrite: Option<bool>,
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
@@ -19,24 +20,16 @@ pub struct RolesRequestCreateDto {
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct RolesItemListDto {
+pub struct RolesListItemDto {
 	pub id: String,
 	pub name: String,
+	pub permissions_count: usize,
 	pub created_at: Option<String>,
 	pub updated_at: Option<String>,
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct RolesItemDto {
-	pub id: String,
-	pub name: String,
-	pub permissions: Vec<PermissionsItemDto>,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct RolesItemByIdDto {
+pub struct RolesDetailItemDto {
 	pub id: String,
 	pub name: String,
 	pub is_deleted: bool,
@@ -45,21 +38,28 @@ pub struct RolesItemByIdDto {
 	pub updated_at: Option<String>,
 }

-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RolesItemByIdDtoRaw {
-	pub id: Thing,
-	pub name: String,
-	pub permissions: Vec<PermissionsItemDtoRaw>,
-	pub is_deleted: bool,
-	pub created_at: Option<String>,
-	pub updated_at: Option<String>,
+impl RolesDetailItemDto {
+	pub fn from(dto: &RolesDetailQueryDto) -> Self {
+		Self {
+			id: dto.id.id.to_raw(),
+			name: dto.name.clone(),
+			is_deleted: dto.is_deleted,
+			permissions: dto
+				.permissions
+				.iter()
+				.map(PermissionsItemDto::from)
+				.collect(),
+			created_at: dto.created_at.clone(),
+			updated_at: dto.updated_at.clone(),
+		}
+	}
 }

 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RolesItemDtoRaw {
+pub struct RolesDetailQueryDto {
 	pub id: Thing,
 	pub name: String,
-	pub permissions: Vec<PermissionsItemDtoRaw>,
+	pub permissions: Vec<PermissionsQueryDto>,
 	pub is_deleted: bool,
 	pub created_at: Option<String>,
 	pub updated_at: Option<String>,
@@ -4,7 +4,7 @@ use std::fmt;
 pub enum RolesEnum {
 	Admin,
 	User,
-	Staf,
+	Staff,
 }

 impl fmt::Display for RolesEnum {
@@ -12,7 +12,7 @@ impl fmt::Display for RolesEnum {
 		let roles_str = match self {
 			RolesEnum::Admin => "Admin",
 			RolesEnum::User => "User",
-			RolesEnum::Staf => "Staf",
+			RolesEnum::Staff => "Staff",
 		};
 		write!(f, "{}", roles_str)
 	}
@@ -1,14 +1,15 @@
 use super::{
-	RolesItemByIdDto, RolesItemByIdDtoRaw, RolesRequestCreateDto,
+	RolesDetailItemDto, RolesDetailQueryDto, RolesListItemDto, RolesRequestCreateDto,
 	RolesRequestUpdateDto, RolesSchema,
 };
 use crate::{
-	extract_id, get_id, make_thing, query_list_with_meta, AppState, MetaRequestDto,
-	PermissionsItemDto, ResourceEnum, ResponseListSuccessDto,
+	AppState, MetaRequestDto, PermissionsItemDto, ResourceEnum,
+	ResponseListSuccessDto, extract_id, get_id, make_thing, query_list_with_meta,
 };
-use anyhow::{bail, Result};
-use surrealdb::sql::Thing;
+use anyhow::{Result, bail};
+use imphnen_utils::DetailQueryBuilder;
 use surrealdb::Uuid;
+use surrealdb::sql::Thing;

 pub struct RolesRepository<'a> {
 	state: &'a AppState,
@@ -19,47 +20,67 @@ impl<'a> RolesRepository<'a> {
 		Self { state }
 	}

-	pub async fn query_raw_role_by_id(&self, id: &str) -> Result<RolesSchema> {
-		let db = &self.state.surrealdb_ws;
-		let role: Option<RolesSchema> =
-			db.select((ResourceEnum::Roles.to_string(), id)).await?;
-		match role {
-			Some(r) if !r.is_deleted => Ok(r),
-			_ => bail!("Role not found"),
-		}
-	}
-
 	pub async fn query_role_list(
 		&self,
 		meta: MetaRequestDto,
-	) -> Result<ResponseListSuccessDto<Vec<RolesSchema>>> {
+	) -> Result<ResponseListSuccessDto<Vec<RolesListItemDto>>> {
 		let mut conditions = vec!["is_deleted = false".into()];
-		if meta.search.is_some() {
-			conditions.push("string::contains(name, $search)".into());
+		if let Some(_search) = meta.search.as_deref().filter(|s| !s.is_empty()) {
+			conditions.push("string::contains(name ?? '', $search)".into());
 		}
-		if meta.filter_by.is_some() && meta.filter.is_some() {
-			let filter_by = meta.filter_by.as_ref().unwrap();
-			conditions.push(format!("{} = $filter", filter_by));
+		if let (Some(filter_by), Some(filter_val)) =
+			(meta.filter_by.as_ref(), meta.filter.as_ref())
+		{
+			if !filter_val.is_empty() {
+				conditions.push(format!("{} = $filter", filter_by));
+			}
 		}
-		query_list_with_meta(
+		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
+		.await?;
+		let data = raw_result
+			.data
+			.into_iter()
+			.map(|role| RolesSchema::list(&role))
+			.collect();
+		Ok(ResponseListSuccessDto {
+			data,
+			meta: raw_result.meta,
+		})
 	}

-	pub async fn query_role_by_name(&self, name: String) -> Result<RolesItemByIdDto> {
+	pub async fn query_role_by_name(
+		&self,
+		name: String,
+	) -> Result<RolesDetailItemDto> {
 		let db = &self.state.surrealdb_ws;
-		let sql = format!(
-			"SELECT *, permissions FROM {} WHERE name = $name AND is_deleted = false LIMIT 1 FETCH permissions",
-			ResourceEnum::Roles.to_string()
-		);
-		let mut result = db.query(sql).bind(("name", name.clone())).await?;
-		let role: Option<RolesItemByIdDtoRaw> = result.take(0)?;
-		let role = match role {
+		let builder = DetailQueryBuilder::new(ResourceEnum::Roles.to_string())
+			.with_where("name")
+			.where_value(name.clone())
+			.with_select_fields(vec![
+				"id",
+				"name",
+				"permissions",
+				"created_at",
+				"updated_at",
+				"is_deleted",
+			])
+			.with_fetch("permissions");
+
+		let sql = builder.build();
+		let result: Option<RolesDetailQueryDto> = builder
+			.apply_bindings(db.query(sql).bind(("name", name)))
+			.await?
+			.take(0)?;
+		let role = match result {
 			Some(r) if !r.is_deleted => r,
 			_ => bail!("Role not found"),
 		};
@@ -72,8 +93,8 @@ impl<'a> RolesRepository<'a> {
 				created_at: perm.created_at,
 				updated_at: perm.updated_at,
 			})
-			.collect::<Vec<_>>();
-		Ok(RolesItemByIdDto {
+			.collect();
+		Ok(RolesDetailItemDto {
 			id: extract_id(&role.id),
 			name: role.name,
 			is_deleted: role.is_deleted,
@@ -83,16 +104,23 @@ impl<'a> RolesRepository<'a> {
 		})
 	}

-	pub async fn query_role_by_id(&self, id: String) -> Result<RolesItemByIdDto> {
+	pub async fn query_role_by_id(&self, id: String) -> Result<RolesDetailItemDto> {
 		let db = &self.state.surrealdb_ws;
-		let query = format!(
-			"SELECT *, permissions.* AS permissions
-			FROM app_roles:⟨{}⟩ WHERE is_deleted = false FETCH permissions",
-			id
-		);
-		let mut result = db.query(query).await?;
-		let role: Option<RolesItemByIdDtoRaw> = result.take(0)?;
-		let role = match role {
+		let builder = DetailQueryBuilder::new(ResourceEnum::Roles.to_string())
+			.with_id(&id)
+			.with_select_fields(vec![
+				"id",
+				"name",
+				"is_deleted",
+				"permissions",
+				"created_at",
+				"updated_at",
+			])
+			.with_fetch("permissions");
+		let sql = builder.build();
+		let result: Option<RolesDetailQueryDto> =
+			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+		let role = match result {
 			Some(r) if !r.is_deleted => r,
 			_ => bail!("Role not found"),
 		};
@@ -105,8 +133,8 @@ impl<'a> RolesRepository<'a> {
 				created_at: perm.created_at,
 				updated_at: perm.updated_at,
 			})
-			.collect::<Vec<_>>();
-		Ok(RolesItemByIdDto {
+			.collect();
+		Ok(RolesDetailItemDto {
 			id: extract_id(&role.id),
 			name: role.name,
 			is_deleted: role.is_deleted,
@@ -121,14 +149,12 @@ impl<'a> RolesRepository<'a> {
 		payload: RolesRequestCreateDto,
 	) -> Result<String> {
 		let db = &self.state.surrealdb_ws;
-
 		let role_id = Uuid::new_v4().to_string();
 		let permission_things: Vec<Thing> = payload
 			.permissions
 			.iter()
 			.map(|id| make_thing(&ResourceEnum::Permissions.to_string(), id))
 			.collect();
-
 		let role = RolesSchema {
 			id: make_thing(&ResourceEnum::Roles.to_string(), &role_id),
 			name: payload.name,
@@ -137,12 +163,10 @@ impl<'a> RolesRepository<'a> {
 			created_at: Some(crate::get_iso_date()),
 			updated_at: Some(crate::get_iso_date()),
 		};
-
 		let _: Option<RolesSchema> = db
 			.create((&ResourceEnum::Roles.to_string(), role_id))
 			.content(role)
 			.await?;
-
 		Ok("Role with permissions created successfully".into())
 	}

@@ -152,31 +176,11 @@ impl<'a> RolesRepository<'a> {
 		data: RolesRequestUpdateDto,
 	) -> Result<String> {
 		let db = &self.state.surrealdb_ws;
-		let thing_id = make_thing(&ResourceEnum::Roles.to_string(), &id);
-		let existing = self.query_raw_role_by_id(&id).await?;
+		let existing = self.query_role_by_id(id.clone()).await?;
 		if existing.is_deleted {
 			bail!("Role already deleted");
 		}
-		let permissions: Vec<Thing> = if let Some(permission_ids) = &data.permissions {
-			permission_ids
-				.iter()
-				.map(|id| make_thing(&ResourceEnum::Permissions.to_string(), id))
-				.collect()
-		} else {
-			existing
-				.permissions
-				.iter()
-				.map(|p| make_thing(&ResourceEnum::Permissions.to_string(), &p.id.to_raw()))
-				.collect()
-		};
-		let merged = RolesSchema {
-			id: thing_id,
-			name: data.name.unwrap_or(existing.name),
-			permissions,
-			is_deleted: existing.is_deleted,
-			created_at: existing.created_at,
-			updated_at: Some(crate::get_iso_date()),
-		};
+		let merged = RolesSchema::update(data, id.clone(), existing);
 		let record: Option<RolesSchema> =
 			db.update(get_id(&merged.id)?).content(merged).await?;
 		match record {
@@ -0,0 +1,125 @@
+use super::{
+	RolesDetailItemDto, RolesDetailQueryDto, RolesListItemDto, RolesRequestCreateDto,
+	RolesRequestUpdateDto,
+};
+use crate::{ResourceEnum, make_thing};
+use imphnen_utils::get_iso_date;
+use serde::{Deserialize, Serialize};
+use std::collections::HashSet;
+use surrealdb::{Uuid, sql::Thing};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct RolesSchema {
+	pub id: Thing,
+	pub name: String,
+	pub is_deleted: bool,
+	pub permissions: Vec<Thing>,
+	pub created_at: Option<String>,
+	pub updated_at: Option<String>,
+}
+
+impl Default for RolesSchema {
+	fn default() -> Self {
+		RolesSchema {
+			id: make_thing(
+				&ResourceEnum::Roles.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			permissions: vec![make_thing(
+				&ResourceEnum::Permissions.to_string(),
+				&Uuid::new_v4().to_string(),
+			)],
+			name: String::new(),
+			is_deleted: false,
+			created_at: None,
+			updated_at: None,
+		}
+	}
+}
+
+impl RolesSchema {
+	pub fn from(dto: RolesDetailQueryDto) -> Self {
+		Self {
+			id: dto.id,
+			name: dto.name,
+			permissions: dto
+				.permissions
+				.into_iter()
+				.map(|perm| {
+					make_thing(&ResourceEnum::Permissions.to_string(), &perm.id.to_raw())
+				})
+				.collect(),
+			is_deleted: dto.is_deleted,
+			created_at: dto.created_at,
+			updated_at: dto.updated_at,
+		}
+	}
+
+	pub fn create(dto: RolesRequestCreateDto) -> Self {
+		let permissions: Vec<Thing> = dto
+			.permissions
+			.into_iter()
+			.map(|id| make_thing(&ResourceEnum::Permissions.to_string(), &id))
+			.collect();
+		Self {
+			id: make_thing(
+				&ResourceEnum::Roles.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			name: dto.name,
+			permissions,
+			is_deleted: false,
+			created_at: Some(get_iso_date()),
+			updated_at: Some(get_iso_date()),
+		}
+	}
+
+	pub fn update(
+		dto: RolesRequestUpdateDto,
+		id: String,
+		existing: RolesDetailItemDto,
+	) -> Self {
+		let name = dto.name.unwrap_or(existing.name);
+		let permissions: Vec<Thing> =
+			match (dto.permissions, dto.overwrite.unwrap_or(false)) {
+				(Some(new_ids), true) => new_ids
+					.iter()
+					.map(|id| make_thing(&ResourceEnum::Permissions.to_string(), id))
+					.collect(),
+				(Some(new_ids), false) => {
+					let mut all_ids: HashSet<String> =
+						existing.permissions.iter().map(|p| p.id.clone()).collect();
+					for id in new_ids {
+						all_ids.insert(id);
+					}
+					all_ids
+						.into_iter()
+						.map(|id| make_thing(&ResourceEnum::Permissions.to_string(), &id))
+						.collect()
+				}
+				(None, _) => existing
+					.permissions
+					.iter()
+					.map(|p| make_thing(&ResourceEnum::Permissions.to_string(), &p.id))
+					.collect(),
+			};
+		Self {
+			id: make_thing(&ResourceEnum::Roles.to_string(), &id),
+			name,
+			permissions,
+			is_deleted: existing.is_deleted,
+			created_at: existing.created_at,
+			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(),
+		}
+	}
+}
@@ -1,7 +1,7 @@
 use super::{RolesRepository, RolesRequestCreateDto, RolesRequestUpdateDto};
 use crate::{
-	common_response, success_list_response, success_response, validate_request,
 	AppState, MetaRequestDto, ResponseListSuccessDto, ResponseSuccessDto,
+	common_response, success_list_response, success_response, validate_request,
 };
 use axum::{http::StatusCode, response::Response};

@@ -1,16 +1,16 @@
+use crate::{AppState, MetaRequestDto, v1::users_service::UsersService};
+use crate::{
+	MessageResponseDto, PermissionsEnum, ResponseListSuccessDto, ResponseSuccessDto,
+	UsersCreateRequestDto, UsersDetailItemDto, permissions_guard,
+};
 use axum::extract::{Path, Query};
 use axum::http::HeaderMap;
 use axum::response::IntoResponse;
 use axum::{Extension, Json};

-use crate::{
-	permissions_guard, MessageResponseDto, PermissionsEnum, ResponseListSuccessDto,
-	ResponseSuccessDto, UsersActiveInactiveRequestDto, UsersCreateRequestDto,
-	UsersDetailItemDto,
+use super::{
+	UsersActiveInactiveRequestDto, UsersListItemDto, UsersUpdateRequestDto,
 };
-use crate::{v1::users_service::UsersService, AppState, MetaRequestDto};
-
-use super::{UsersListItemDto, UsersUpdateRequestDto};

 #[utoipa::path(
 	get,
@@ -204,7 +204,7 @@ pub async fn patch_user_active_status(
 	match permissions_guard(
 		&headers,
 		state.clone(),
-		vec![PermissionsEnum::UpdateUsers],
+		vec![PermissionsEnum::ActivateUsers],
 	)
 	.await
 	{
@@ -1,3 +1,4 @@
+use crate::{RolesDetailItemDto, RolesDetailQueryDto};
 use lazy_static::lazy_static;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
@@ -5,8 +6,6 @@ use surrealdb::sql::Thing;
 use utoipa::ToSchema;
 use validator::Validate;

-use crate::{RolesItemDto, RolesItemDtoRaw};
-
 lazy_static! {
 	static ref PASSWORD_REGEX: Regex = Regex::new(r"^[A-Za-z\d@$!%*?&]{8,}$").unwrap();
 }
@@ -16,6 +15,12 @@ pub struct UsersActiveInactiveRequestDto {
 	pub is_active: bool,
 }

+#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
+pub struct UsersSetNewPasswordRequestDto {
+	pub password: String,
+	pub old_password: String,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema, Validate)]
 pub struct UsersCreateRequestDto {
 	#[validate(
@@ -23,6 +28,7 @@ pub struct UsersCreateRequestDto {
 		email(message = "Email not valid")
 	)]
 	pub email: String,
+
 	#[validate(length(
 		min = 8,
 		message = "Password must have at least 8 characters"
@@ -32,8 +38,10 @@ pub struct UsersCreateRequestDto {
 		message = "Password must include uppercase, lowercase, number, and special character"
 	))]
 	pub password: String,
+
 	#[validate(length(min = 2, message = "Fullname at least have 2 character"))]
 	pub fullname: String,
+
 	#[validate(length(
 		min = 10,
 		message = "Phone number at least have 10 character"
@@ -72,33 +80,36 @@ pub struct UsersUpdateRequestDto {
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct UsersItemDto {
+pub struct UsersDetailItemDto {
 	pub id: String,
-	pub role: RolesItemDto,
+	pub role: RolesDetailItemDto,
 	pub fullname: String,
 	pub email: String,
 	pub avatar: Option<String>,
 	pub phone_number: String,
 	pub is_active: bool,
-	pub is_deleted: bool,
 	pub gender: Option<String>,
 	pub birthdate: Option<String>,
-	pub password: String,
 	pub created_at: String,
 	pub updated_at: String,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct UsersDetailItemDto {
-	pub id: String,
-	pub role: RolesItemDto,
-	pub fullname: String,
-	pub email: String,
-	pub avatar: Option<String>,
-	pub phone_number: String,
-	pub is_active: bool,
-	pub gender: Option<String>,
-	pub birthdate: Option<String>,
+impl UsersDetailItemDto {
+	pub fn from(dto: &UsersDetailQueryDto) -> Self {
+		Self {
+			id: dto.id.id.to_raw().clone(),
+			role: RolesDetailItemDto::from(&dto.role),
+			fullname: dto.fullname.clone(),
+			email: dto.email.clone(),
+			avatar: dto.avatar.clone(),
+			phone_number: dto.phone_number.clone(),
+			is_active: dto.is_active.clone(),
+			gender: dto.gender.clone(),
+			birthdate: dto.birthdate.clone(),
+			created_at: dto.created_at.clone(),
+			updated_at: dto.updated_at.clone(),
+		}
+	}
 }

 #[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
@@ -115,9 +126,9 @@ pub struct UsersListItemDto {
 }

 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct UsersListItemDtoRaw {
+pub struct UsersListQueryDto {
 	pub id: Thing,
-	pub role: Option<String>,
+	pub role: RolesDetailQueryDto,
 	pub fullname: String,
 	pub email: String,
 	pub avatar: Option<String>,
@@ -127,8 +138,24 @@ pub struct UsersListItemDtoRaw {
 	pub updated_at: String,
 }

+impl UsersListQueryDto {
+	pub fn from(&self) -> UsersListItemDto {
+		UsersListItemDto {
+			id: self.id.id.to_raw(),
+			role: self.role.name.clone(),
+			fullname: self.fullname.clone(),
+			email: self.email.clone(),
+			avatar: self.avatar.clone(),
+			phone_number: self.phone_number.clone(),
+			is_active: self.is_active,
+			created_at: self.created_at.clone(),
+			updated_at: self.updated_at.clone(),
+		}
+	}
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct UsersItemDtoRaw {
+pub struct UsersDetailQueryDto {
 	pub id: Thing,
 	pub fullname: String,
 	pub email: String,
@@ -138,8 +165,28 @@ pub struct UsersItemDtoRaw {
 	pub is_deleted: bool,
 	pub gender: Option<String>,
 	pub birthdate: Option<String>,
-	pub role: RolesItemDtoRaw,
 	pub password: String,
+	pub role: RolesDetailQueryDto,
 	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(),
+		}
+	}
+}
@@ -0,0 +1,171 @@
+use super::{UsersDetailQueryDto, UsersListItemDto, UsersListQueryDto, UsersSchema};
+use crate::{
+	AppState, MetaRequestDto, ResourceEnum, ResponseListSuccessDto, get_id,
+	make_thing, query_list_with_meta,
+};
+use anyhow::{Result, bail};
+use imphnen_utils::DetailQueryBuilder;
+use surrealdb::{Surreal, engine::remote::ws::Client};
+
+pub struct UsersRepository<'a> {
+	state: &'a AppState,
+}
+
+pub async fn update_partial_schema(
+	db: &Surreal<Client>,
+	table: &str,
+	id: &str,
+	patch: UsersSchema,
+) -> Result<String> {
+	let thing = make_thing(table, id);
+	let record_key = get_id(&thing)?;
+	let result: Option<UsersSchema> = db.update(record_key).merge(patch).await?;
+	match result {
+		Some(_) => Ok("Success update".into()),
+		None => bail!("Failed to update"),
+	}
+}
+
+impl<'a> UsersRepository<'a> {
+	pub fn new(state: &'a AppState) -> Self {
+		Self { state }
+	}
+
+	pub async fn query_user_list(
+		&self,
+		meta: MetaRequestDto,
+	) -> Result<ResponseListSuccessDto<Vec<UsersListItemDto>>> {
+		let db = &self.state.surrealdb_ws;
+
+		let raw_result = query_list_with_meta::<UsersListQueryDto>(
+			db,
+			&ResourceEnum::Users.to_string(),
+			&meta,
+			vec!["is_deleted = false".into()],
+			None,
+			"fullname",
+			Some(vec!["*"]),
+			Some(vec!["role", "role.permissions"]),
+		)
+		.await?;
+
+		let data = raw_result
+			.data
+			.into_iter()
+			.map(|schema| UsersListQueryDto::from(&schema))
+			.collect::<Vec<_>>();
+
+		Ok(ResponseListSuccessDto {
+			data,
+			meta: raw_result.meta,
+		})
+	}
+
+	pub async fn query_user_by_email(
+		&self,
+		email: String,
+	) -> Result<UsersDetailQueryDto> {
+		let db = &self.state.surrealdb_ws;
+
+		let builder = DetailQueryBuilder::new(ResourceEnum::Users.to_string())
+			.with_where("email")
+			.where_value(email.clone())
+			.with_select_fields(vec!["*"])
+			.with_fetch("role")
+			.with_fetch("role.permissions");
+
+		let sql = builder.build();
+
+		let user_opt: Option<UsersDetailQueryDto> =
+			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+
+		let Some(user) = user_opt else {
+			bail!("User not found");
+		};
+
+		if user.role.is_deleted {
+			bail!("User not found");
+		}
+
+		Ok(UsersDetailQueryDto::from(&user))
+	}
+
+	pub async fn query_user_by_id(&self, id: String) -> Result<UsersDetailQueryDto> {
+		let db = &self.state.surrealdb_ws;
+
+		let builder = DetailQueryBuilder::new(ResourceEnum::Users.to_string())
+			.with_id(&id)
+			.with_select_fields(vec!["*"])
+			.with_fetch("role")
+			.with_fetch("role.permissions");
+
+		let sql = builder.build();
+
+		let result: Option<UsersDetailQueryDto> =
+			builder.apply_bindings(db.query(sql)).await?.take(0)?;
+
+		let Some(user) = result else {
+			bail!("User not found");
+		};
+
+		if user.role.is_deleted {
+			bail!("User not found");
+		}
+
+		Ok(UsersDetailQueryDto::from(&user))
+	}
+
+	pub async fn query_create_user(&self, data: UsersSchema) -> Result<String> {
+		let db = &self.state.surrealdb_ws;
+		let record: Option<UsersSchema> = db
+			.create(ResourceEnum::Users.to_string())
+			.content(data)
+			.await?;
+		match record {
+			Some(_) => Ok("Success create user".into()),
+			None => bail!("Failed to create user"),
+		}
+	}
+
+	pub async fn query_update_user(&self, data: UsersSchema) -> Result<String> {
+		let db = &self.state.surrealdb_ws;
+		let record_key = get_id(&data.id)?;
+		let existing = self.query_user_by_id(data.id.id.to_raw()).await?;
+		if existing.is_deleted {
+			bail!("User already deleted");
+		}
+		let role_thing = if data.role == existing.role.id {
+			existing.role.id
+		} else {
+			data.clone().role
+		};
+		let merged = UsersSchema {
+			password: existing.password,
+			created_at: existing.created_at,
+			role: role_thing,
+			..data.clone()
+		};
+		let record: Option<UsersSchema> = db.update(record_key).merge(merged).await?;
+		match record {
+			Some(_) => Ok("Success update user".into()),
+			None => bail!("Failed to update user"),
+		}
+	}
+
+	pub async fn query_delete_user(&self, id: String) -> Result<String> {
+		let db = &self.state.surrealdb_ws;
+		let user = self.query_user_by_id(id).await?;
+		if user.is_deleted {
+			bail!("User already deleted");
+		}
+		let record_key = get_id(&user.id)?;
+		let record: Option<UsersSchema> = db
+			.update(record_key)
+			.merge(serde_json::json!({ "is_deleted": true }))
+			.await?;
+		match record {
+			Some(_) => Ok("Success delete user".into()),
+			None => bail!("Failed to delete user"),
+		}
+	}
+}
@@ -0,0 +1,109 @@
+use super::{UsersCreateRequestDto, UsersDetailQueryDto, UsersUpdateRequestDto};
+use imphnen_libs::{ResourceEnum, hash_password};
+use imphnen_utils::{get_iso_date, make_thing};
+use serde::{Deserialize, Serialize};
+use surrealdb::{Uuid, sql::Thing};
+
+#[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 is_active: bool,
+	pub is_deleted: bool,
+	pub gender: Option<String>,
+	pub birthdate: Option<String>,
+	pub role: Thing,
+	pub created_at: String,
+	pub updated_at: String,
+}
+
+impl Default for UsersSchema {
+	fn default() -> Self {
+		Self {
+			id: Thing::from(("app_users", "dummy")),
+			fullname: "".into(),
+			email: "".into(),
+			password: "".into(),
+			avatar: None,
+			phone_number: "".into(),
+			is_active: false,
+			is_deleted: false,
+			gender: None,
+			birthdate: None,
+			role: Thing::from(("app_roles", "dummy")),
+			created_at: "".into(),
+			updated_at: "".into(),
+		}
+	}
+}
+
+impl UsersSchema {
+	pub fn from(dto: UsersDetailQueryDto) -> Self {
+		Self {
+			id: dto.id,
+			fullname: dto.fullname,
+			email: dto.email,
+			avatar: dto.avatar,
+			phone_number: dto.phone_number,
+			is_active: dto.is_active,
+			is_deleted: dto.is_deleted,
+			gender: dto.gender,
+			birthdate: dto.birthdate,
+			password: dto.password,
+			created_at: dto.created_at,
+			updated_at: dto.updated_at,
+			role: make_thing(&ResourceEnum::Roles.to_string(), &dto.role.id.to_string()),
+		}
+	}
+
+	pub fn update(user: UsersUpdateRequestDto, id: String) -> Self {
+		Self {
+			id: make_thing(&ResourceEnum::Users.to_string(), &id),
+			fullname: user.fullname,
+			email: user.email,
+			phone_number: user.phone_number,
+			is_active: user.is_active,
+			gender: user.gender,
+			birthdate: user.birthdate,
+			avatar: user.avatar,
+			is_deleted: false,
+			role: make_thing(&ResourceEnum::Roles.to_string(), &user.role_id),
+			updated_at: get_iso_date(),
+			..Default::default()
+		}
+	}
+
+	pub fn create(user: UsersCreateRequestDto) -> Self {
+		let password = hash_password(&user.password).unwrap();
+		Self {
+			id: make_thing(
+				&ResourceEnum::Users.to_string(),
+				&Uuid::new_v4().to_string(),
+			),
+			fullname: user.fullname,
+			email: user.email,
+			password,
+			phone_number: user.phone_number,
+			is_active: false,
+			gender: None,
+			birthdate: None,
+			avatar: None,
+			is_deleted: false,
+			role: make_thing(&ResourceEnum::Roles.to_string(), &user.role_id),
+			created_at: get_iso_date(),
+			updated_at: get_iso_date(),
+		}
+	}
+
+	pub fn patch_password(dto: UsersDetailQueryDto, password: String) -> Self {
+		Self {
+			password,
+			id: dto.id.clone(),
+			..Self::from(dto)
+		}
+	}
+}
@@ -1,19 +1,17 @@
-use crate::{
-	common_response, extract_email, get_iso_date, hash_password, make_thing,
-	success_list_response, success_response, validate_request, ResourceEnum,
-	ResponseSuccessDto,
+use super::{
+	UsersActiveInactiveRequestDto, UsersCreateRequestDto, UsersDetailItemDto,
+	UsersSetNewPasswordRequestDto, UsersUpdateRequestDto,
 };
 use crate::{
-	AppState, MetaRequestDto, ResponseListSuccessDto, UsersActiveInactiveSchema,
-	UsersRepository, UsersSchema, UsersSetNewPasswordSchema,
+	AppState, MetaRequestDto, ResponseListSuccessDto, UsersRepository, UsersSchema,
+};
+use crate::{
+	ResourceEnum, ResponseSuccessDto, common_response, extract_email, make_thing,
+	success_list_response, success_response, validate_request,
 };
 use axum::http::HeaderMap;
 use axum::{http::StatusCode, response::Response};
-
-use super::{
-	UsersActiveInactiveRequestDto, UsersCreateRequestDto, UsersDetailItemDto,
-	UsersUpdateRequestDto,
-};
+use imphnen_libs::{hash_password, verify_password};

 pub struct UsersService;

@@ -36,17 +34,7 @@ impl UsersService {
 		let repo = UsersRepository::new(state);
 		match repo.query_user_by_id(id).await {
 			Ok(user) if !user.is_deleted => success_response(ResponseSuccessDto {
-				data: UsersDetailItemDto {
-					id: user.id,
-					role: user.role,
-					fullname: user.fullname,
-					email: user.email,
-					avatar: user.avatar,
-					phone_number: user.phone_number,
-					is_active: user.is_active,
-					gender: user.gender,
-					birthdate: user.birthdate,
-				},
+				data: UsersDetailItemDto::from(&user),
 			}),
 			Ok(_) => common_response(StatusCode::NOT_FOUND, "User not found"),
 			Err(e) => common_response(StatusCode::NOT_FOUND, &e.to_string()),
@@ -55,22 +43,15 @@ impl UsersService {

 	pub async fn get_user_me(headers: HeaderMap, state: &AppState) -> Response {
 		let repo = UsersRepository::new(state);
-		let email = extract_email(&headers).unwrap();
-		let user = repo.query_user_by_email(email).await.unwrap();
-		match repo.query_user_by_id(user.id.id.to_raw()).await {
-			Ok(user) => success_response(ResponseSuccessDto {
-				data: UsersDetailItemDto {
-					id: user.id,
-					role: user.role,
-					fullname: user.fullname,
-					email: user.email,
-					avatar: user.avatar,
-					phone_number: user.phone_number,
-					is_active: user.is_active,
-					gender: user.gender,
-					birthdate: user.birthdate,
-				},
+		let email = match extract_email(&headers) {
+			Some(email) => email,
+			None => return common_response(StatusCode::UNAUTHORIZED, "Invalid token"),
+		};
+		match repo.query_user_by_email(email).await {
+			Ok(user) if !user.is_deleted => success_response(ResponseSuccessDto {
+				data: UsersDetailItemDto::from(&user),
 			}),
+			Ok(_) => common_response(StatusCode::NOT_FOUND, "User not found"),
 			Err(e) => common_response(StatusCode::NOT_FOUND, &e.to_string()),
 		}
 	}
@@ -90,19 +71,7 @@ impl UsersService {
 		{
 			return common_response(StatusCode::BAD_REQUEST, "User already exists");
 		}
-		let role_thing = make_thing(&ResourceEnum::Roles.to_string(), &new_user.role_id);
-		match repo
-			.query_create_user(UsersSchema {
-				email: new_user.email.clone(),
-				fullname: new_user.fullname.clone(),
-				password: hash_password(&new_user.password).unwrap(),
-				phone_number: new_user.phone_number.clone(),
-				is_active: new_user.is_active.clone(),
-				role: role_thing,
-				..Default::default()
-			})
-			.await
-		{
+		match repo.query_create_user(UsersSchema::create(new_user)).await {
 			Ok(msg) => common_response(StatusCode::CREATED, &msg),
 			Err(err) => {
 				common_response(StatusCode::INTERNAL_SERVER_ERROR, &err.to_string())
@@ -116,28 +85,10 @@ impl UsersService {
 		user: UsersUpdateRequestDto,
 	) -> Response {
 		let repo = UsersRepository::new(state);
-
 		if let Err((status, message)) = validate_request(&user) {
 			return common_response(status, &message);
 		}
-
-		let user_id = make_thing(&ResourceEnum::Users.to_string(), &id);
-		let role_id = make_thing(&ResourceEnum::Roles.to_string(), "");
-
-		let updated_user = UsersSchema {
-			id: user_id,
-			fullname: user.fullname,
-			email: user.email,
-			phone_number: user.phone_number,
-			is_active: user.is_active,
-			gender: user.gender,
-			birthdate: user.birthdate,
-			avatar: user.avatar,
-			role: role_id,
-			updated_at: get_iso_date(),
-			..Default::default()
-		};
-
+		let updated_user = UsersSchema::update(user, id);
 		match repo.query_update_user(updated_user).await {
 			Ok(msg) => common_response(StatusCode::OK, &msg),
 			Err(e) => common_response(StatusCode::BAD_REQUEST, &e.to_string()),
@@ -150,30 +101,18 @@ impl UsersService {
 		user: UsersUpdateRequestDto,
 	) -> Response {
 		let repo = UsersRepository::new(state);
-		let email = extract_email(&headers).unwrap();
-		let user_data = repo.query_user_by_email(email).await.unwrap();
+		let email = match extract_email(&headers) {
+			Some(email) => email,
+			None => return common_response(StatusCode::UNAUTHORIZED, "Unauthorized"),
+		};
+		let user_data = match repo.query_user_by_email(email.clone()).await {
+			Ok(user) => user,
+			Err(_) => return common_response(StatusCode::NOT_FOUND, "User not found"),
+		};
 		if let Err((status, message)) = validate_request(&user) {
 			return common_response(status, &message);
 		}
-		let user_id =
-			make_thing(&ResourceEnum::Users.to_string(), &user_data.id.id.to_raw());
-		let role_id = make_thing(&ResourceEnum::Roles.to_string(), "");
-		let updated_user = UsersSchema {
-			id: user_id,
-			fullname: user.fullname,
-			email: user.email,
-			phone_number: user.phone_number,
-
-			is_active: user.is_active,
-
-			gender: user.gender,
-			birthdate: user.birthdate,
-			avatar: user.avatar,
-
-			role: role_id,
-			updated_at: get_iso_date(),
-			..Default::default()
-		};
+		let updated_user = UsersSchema::update(user, user_data.id.id.to_raw());
 		match repo.query_update_user(updated_user).await {
 			Ok(msg) => common_response(StatusCode::OK, &msg),
 			Err(e) => common_response(StatusCode::BAD_REQUEST, &e.to_string()),
@@ -183,23 +122,23 @@ impl UsersService {
 	pub async fn set_user_active_status(
 		state: &AppState,
 		id: String,
-		status: UsersActiveInactiveRequestDto,
+		payload: UsersActiveInactiveRequestDto,
 	) -> Response {
 		let repo = UsersRepository::new(state);
 		let thing_id = make_thing(&ResourceEnum::Users.to_string(), &id);
 		match repo.query_user_by_id(thing_id.id.to_raw()).await {
-			Ok(_) => match repo
-				.query_active_inactive_user_by_id(
-					id,
-					UsersActiveInactiveSchema {
-						is_active: status.is_active,
-					},
-				)
-				.await
-			{
-				Ok(msg) => common_response(StatusCode::OK, &msg),
-				Err(e) => common_response(StatusCode::BAD_REQUEST, &e.to_string()),
-			},
+			Ok(user) if !user.is_deleted => {
+				let patch = UsersSchema {
+					id: user.id.clone(),
+					is_active: payload.is_active,
+					..UsersSchema::from(user)
+				};
+				match repo.query_update_user(patch).await {
+					Ok(msg) => common_response(StatusCode::OK, &msg),
+					Err(e) => common_response(StatusCode::BAD_REQUEST, &e.to_string()),
+				}
+			}
+			Ok(_) => common_response(StatusCode::NOT_FOUND, "User not found"),
 			Err(err) => common_response(StatusCode::BAD_REQUEST, &err.to_string()),
 		}
 	}
@@ -207,10 +146,41 @@ impl UsersService {
 	pub async fn update_user_password(
 		state: &AppState,
 		email: String,
-		new_password: UsersSetNewPasswordSchema,
+		payload: UsersSetNewPasswordRequestDto,
 	) -> Response {
 		let repo = UsersRepository::new(state);
-		match repo.query_update_password_user(email, new_password).await {
+		let user = match repo.query_user_by_email(email.clone()).await {
+			Ok(user) if !user.is_deleted => user,
+			_ => return common_response(StatusCode::NOT_FOUND, "User not found"),
+		};
+		let verify_result = match verify_password(&payload.old_password, &user.password)
+		{
+			Ok(result) => result,
+			Err(_) => {
+				return common_response(
+					StatusCode::BAD_REQUEST,
+					"Old password is incorrect",
+				);
+			}
+		};
+		if !verify_result {
+			return common_response(StatusCode::BAD_REQUEST, "Old password is incorrect");
+		}
+		let new_password = match hash_password(&payload.password) {
+			Ok(pw) => pw,
+			Err(_) => {
+				return common_response(
+					StatusCode::INTERNAL_SERVER_ERROR,
+					"Failed to hash password",
+				);
+			}
+		};
+		let patch = UsersSchema {
+			id: user.id.clone(),
+			password: new_password,
+			..Default::default()
+		};
+		match repo.query_update_user(patch).await {
 			Ok(msg) => common_response(StatusCode::OK, &msg),
 			Err(e) => common_response(StatusCode::BAD_REQUEST, &e.to_string()),
 		}
@@ -5,11 +5,12 @@ edition = "2024"

 [dependencies]
 imphnen-entities = { path = "../imphnen-entities" }
-argon2.workspace = true
+log.workspace = true
 axum.workspace = true
 tokio.workspace = true
-chrono.workspace = true
-jsonwebtoken.workspace = true
 serde.workspace = true
+argon2.workspace = true
 lettre.workspace = true
-surrealdb = { workspace = true, features = ["kv-mem"] }
+chrono.workspace = true
+surrealdb.workspace = true
+jsonwebtoken.workspace = true
@@ -1,7 +1,7 @@
-use crate::{
-	surrealdb_init_mem, surrealdb_init_ws, Env, SurrealMemClient, SurrealWsClient,
-};
-use axum::{serve, Router};
+use crate::{Env, surrealdb_init_mem, surrealdb_init_ws};
+use axum::{Router, serve};
+use imphnen_entities::{SurrealMemClient, SurrealWsClient};
+use log::{debug, error, info};
 use std::{future::Future, net::SocketAddr};
 use tokio::net::TcpListener;

@@ -11,15 +11,24 @@ where
 	Fut: Future<Output = Router>,
 {
 	let env = Env::new();
+	info!("Environment loaded with port: {}", env.port);
+
 	let surrealdb_ws = surrealdb_init_ws().await.expect("Failed surrealdb ws");
+	info!("SurrealDB WS client initialized");
+
 	let surrealdb_mem = surrealdb_init_mem().await.expect("Failed surrealdb mem");
+	info!("SurrealDB MEM client initialized");
+
 	let router = router_fn(surrealdb_ws, surrealdb_mem).await;
+	debug!("Router created successfully");
+
 	let port = env.port;
 	let addr = SocketAddr::from(([0, 0, 0, 0], port));
 	let listener = TcpListener::bind(&addr).await.unwrap();
-	println!("Listening on http://{}", addr);
+	info!("Listening on http://{}", addr);
+
 	match serve(listener, router).await {
-		Ok(_) => println!("Server stopped gracefully."),
-		Err(err) => println!("Server encountered an error: {}", err),
+		Ok(_) => info!("Server stopped gracefully."),
+		Err(err) => error!("Server encountered an error: {}", err),
 	}
 }
@@ -1,13 +1,13 @@
 [package]
-name = "imphnen-gateway-service"
+name = "imphnen-middleware"
 version = "0.1.0"
 edition = "2024"

 [dependencies]
-imphnen-iam-service = { version = "0.1.0", path = "../imphnen-iam-service" }
-imphnen-entities = { version = "0.1.0", path = "../imphnen-entities" }
+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" }
 axum.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -22,4 +22,6 @@ tokio.workspace = true
 chrono.workspace = true
 anyhow.workspace = true
 tower-http.workspace = true
-utoipa-swagger-ui.workspace = true
+futures.workspace = true
+tower.workspace = true
+utoipa-swagger-ui.workspace = true
@@ -0,0 +1,44 @@
+use axum::{
+	Extension, extract::Request, http::StatusCode, middleware::Next,
+	response::Response,
+};
+use imphnen_iam::{UsersDetailQueryDto, UsersRepository};
+use imphnen_libs::AppState;
+use imphnen_utils::{common_response, extract_email};
+use std::convert::Infallible;
+
+pub async fn auth_middleware(
+	Extension(state): Extension<AppState>,
+	mut req: Request,
+	next: Next,
+) -> Result<Response, Infallible> {
+	let headers = req.headers();
+	let email = match extract_email(headers) {
+		Some(email) => email,
+		None => {
+			return Ok(common_response(
+				StatusCode::UNAUTHORIZED,
+				"Invalid or expired token",
+			));
+		}
+	};
+	let repository = UsersRepository::new(&state);
+	let user: Option<UsersDetailQueryDto> =
+		match repository.query_user_by_email(email).await {
+			Ok(user) => Some(user),
+			Err(err) => {
+				return Ok(common_response(
+					StatusCode::INTERNAL_SERVER_ERROR,
+					&err.to_string(),
+				));
+			}
+		};
+	if user.is_none() {
+		return Ok(common_response(
+			StatusCode::UNAUTHORIZED,
+			"Unauthorized user",
+		));
+	}
+	req.extensions_mut().insert(user.unwrap());
+	Ok(next.run(req).await)
+}
@@ -0,0 +1,33 @@
+use axum::http::{HeaderValue, Method, header};
+use imphnen_libs::Env;
+use tower_http::cors::CorsLayer;
+
+pub fn cors_middleware() -> CorsLayer {
+	let env = Env::new();
+	let cors_origins = match env.rust_env.as_str() {
+		"development" => vec!["http://localhost:3000"],
+		"production" => {
+			vec![
+				"https://gacha.imphnen.dev",
+				"https://imphnen.dev",
+				"https://dimentorin.imphnen.dev",
+			]
+		}
+		_ => vec![
+			"http://localhost:3000",
+			"https://gacha.imphnen.dev",
+			"https://imphnen.dev",
+			"https://dimentorin.imphnen.dev",
+		],
+	};
+	let allowed_origins: Vec<HeaderValue> = cors_origins
+		.into_iter()
+		.filter_map(|origin| origin.parse::<HeaderValue>().ok())
+		.collect();
+
+	CorsLayer::new()
+		.allow_origin(allowed_origins)
+		.allow_methods([Method::GET, Method::POST, Method::PUT, Method::DELETE])
+		.allow_headers([header::AUTHORIZATION, header::CONTENT_TYPE])
+		.allow_credentials(true)
+}
@@ -0,0 +1,7 @@
+pub mod auth_middleware;
+pub mod cors_middleware;
+pub mod permissions_middleware;
+
+pub use auth_middleware::*;
+pub use cors_middleware::*;
+pub use permissions_middleware::*;
@@ -0,0 +1,102 @@
+use axum::{
+	body::Body,
+	http::{Request, Response, StatusCode},
+};
+use futures::future::BoxFuture;
+use imphnen_iam::{AuthRepository, PermissionsEnum};
+use imphnen_libs::AppState;
+use imphnen_utils::{common_response, extract_email};
+use std::task::{Context, Poll};
+use tower::{Layer, Service};
+
+#[derive(Clone)]
+pub struct PermissionsMiddlewareLayer {
+	app_state: AppState,
+	permissions: Vec<PermissionsEnum>,
+}
+
+impl PermissionsMiddlewareLayer {
+	pub fn new(app_state: AppState, permissions: Vec<PermissionsEnum>) -> Self {
+		Self {
+			app_state,
+			permissions,
+		}
+	}
+}
+
+impl<S> Layer<S> for PermissionsMiddlewareLayer {
+	type Service = PermissionsMiddleware<S>;
+	fn layer(&self, inner: S) -> Self::Service {
+		PermissionsMiddleware {
+			inner,
+			app_state: self.app_state.clone(),
+			permissions: self.permissions.clone(),
+		}
+	}
+}
+
+#[derive(Clone)]
+pub struct PermissionsMiddleware<S> {
+	inner: S,
+	app_state: AppState,
+	permissions: Vec<PermissionsEnum>,
+}
+
+impl<S> Service<Request<Body>> for PermissionsMiddleware<S>
+where
+	S: Service<Request<Body>, Response = Response<Body>> + Clone + Send + 'static,
+	S::Future: Send + 'static,
+{
+	type Response = S::Response;
+	type Error = S::Error;
+	type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
+
+	fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+		self.inner.poll_ready(cx)
+	}
+
+	fn call(&mut self, req: Request<Body>) -> Self::Future {
+		let mut inner = self.inner.clone();
+		let app_state = self.app_state.clone();
+		let permissions = self.permissions.clone();
+
+		Box::pin(async move {
+			let headers = req.headers();
+			let email = match extract_email(headers) {
+				Some(email) => email,
+				None => {
+					return Ok(common_response(
+						StatusCode::UNAUTHORIZED,
+						"Invalid or missing authorization token",
+					));
+				}
+			};
+
+			let auth_repo = AuthRepository::new(&app_state);
+			let user = match auth_repo.query_get_stored_user(email).await {
+				Ok(user) => user,
+				Err(_) => {
+					return Ok(common_response(
+						StatusCode::UNAUTHORIZED,
+						"User session expired or not found",
+					));
+				}
+			};
+
+			let user_permissions: Vec<String> =
+				user.role.permissions.into_iter().map(|p| p.name).collect();
+			let allowed = permissions
+				.iter()
+				.all(|p| user_permissions.contains(&p.to_string()));
+
+			if !allowed {
+				return Ok(common_response(
+					StatusCode::FORBIDDEN,
+					"You don't have the required permissions",
+				));
+			}
+
+			inner.call(req).await
+		})
+	}
+}
@@ -14,4 +14,4 @@ anyhow.workspace = true
 axum-test.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-validator.workspace = true
+validator.workspace = true
@@ -4,11 +4,5 @@ pub fn bind_filter_value(
 	query: Query<'_, Client>,
 	val: String,
 ) -> Query<'_, Client> {
-	if let Ok(b) = val.parse::<bool>() {
-		query.bind(("filter", b))
-	} else if let Ok(i) = val.parse::<i64>() {
-		query.bind(("filter", i))
-	} else {
-		query.bind(("filter", val))
-	}
+	query.bind(("filter", val)) // langsung string aja, udah cukup
 }
@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use surrealdb::sql::Thing;

 pub fn get_id(thing: &Thing) -> Result<(&str, &str)> {
@@ -8,6 +8,7 @@ pub mod generate_otp;
 pub mod get_id;
 pub mod make_thing;
 pub mod mock_test;
+pub mod query_builder;
 pub mod query_list;
 pub mod response_format;
 pub mod validator;
@@ -21,6 +22,7 @@ pub use imphnen_entities::*;
 pub use imphnen_libs::*;
 pub use make_thing::*;
 pub use mock_test::*;
+pub use query_builder::*;
 pub use query_list::*;
 pub use response_format::*;
 pub use validator::*;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Maulana Sodiqin	e63658c082	feat: add gacha and init cms	2025-05-20 10:45:01 +07:00
Maulana SodiqinandGitHub	f4b0ed0a4a	Merge pull request #24 from IMPHNEN/chore/normalize-code chore: normalize code	2025-05-20 01:50:58 +07:00
Maulana Sodiqin	1e5ed26f76	chore: cleaning code	2025-05-20 01:49:50 +07:00
Maulana Sodiqin	d97095a38d	chore: cleaning code	2025-05-20 00:26:24 +07:00
Maulana Sodiqin	e48507901e	chore: normalize code #2	2025-05-18 03:12:20 +07:00
Maulana Sodiqin	a43ef8ec04	chore: normalize code	2025-05-17 02:08:59 +07:00
Maulana SodiqinandGitHub	874f25aa80	Merge pull request #23 from bakunya/develop transform id(thing) to id(string) on get role, permission, users	2025-05-04 17:24:13 +07:00
Bakunya	12a730a394	transform id(thing) to id(string) on get role, permission, users	2025-05-04 17:07:20 +07:00
Bakunya	bdcd41f54d	transform id(thing) to id(string) on get role, permission, users	2025-05-04 16:37:11 +07:00
Maulana SodiqinandGitHub	96fb8eb7d3	Merge pull request #22 from IMPHNEN/feat/split-middleware feat: split middleware	2025-04-07 20:43:59 +07:00
Maulana Sodiqin	d2c333dbd6	feat: split middleware	2025-04-07 20:41:14 +07:00
Maulana Sodiqin	054f0f63ff	chore: adjust README.md	2025-04-07 20:08:26 +07:00
Maulana Sodiqin	eb05ea5994	feat: add gacha service	2025-04-07 00:50:57 +07:00