diff --git a/api/src/controller/player_info.rs b/api/src/controller/player_info.rs index f6740c3..7194aab 100644 --- a/api/src/controller/player_info.rs +++ b/api/src/controller/player_info.rs @@ -11,7 +11,7 @@ pub async fn create( return Err(ResErr::ErrParams(Some(err.to_string()))); } - service::player_info::register(req).await?; + service::player::register(req).await?; Ok(ResOK(None)) } diff --git a/domain/src/entities/mod.rs b/domain/src/entities/mod.rs index 4b2ec30..1aaf1c2 100644 --- a/domain/src/entities/mod.rs +++ b/domain/src/entities/mod.rs @@ -1,4 +1,4 @@ pub mod account; -pub mod player_info; +pub mod player; pub mod feedback; diff --git a/domain/src/entities/player_info.rs b/domain/src/entities/player.rs similarity index 73% rename from domain/src/entities/player_info.rs rename to domain/src/entities/player.rs index 95a3e59..3d2c802 100644 --- a/domain/src/entities/player_info.rs +++ b/domain/src/entities/player.rs @@ -3,7 +3,7 @@ use sqlx::PgPool; use sqlx::types::chrono; #[derive(Debug, Clone, Default)] -pub struct PlayerInfo { +pub struct Player { pub id: i64, pub username: String, pub email: String, @@ -11,25 +11,26 @@ pub struct PlayerInfo { pub user_type: String, pub country_code: String, pub created_at: NaiveDateTime, + pub updated_at: NaiveDateTime, } -impl PlayerInfo { - pub async fn find_by_platform_id(platform_id: &str, db_pool: &PgPool) -> Result { +impl Player { + pub async fn find_by_platform_id(platform_id: &str, db_pool: &PgPool) -> Result { sqlx::query_as!( - PlayerInfo, - r#"select * from player_info where platform_id = $1"#, + Player, + r#"select * from player where platform_id = $1"#, platform_id ) .fetch_one(db_pool) .await } - pub async fn add_player_info(player_info: &mut PlayerInfo, db_pool: &PgPool) -> Result { + pub async fn add_player_info(player_info: &mut Player, db_pool: &PgPool) -> Result { player_info.created_at = chrono::Local::now().naive_local(); sqlx::query_as!( - PlayerInfo, + Player, r#" - insert into player_info + insert into player (username, email, platform_id, user_type, country_code, created_at) values ($1, $2, $3, $4, $5, $6) returning *"#, diff --git a/service/src/lib.rs b/service/src/lib.rs index 0ff037a..e159cbd 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -1,2 +1,2 @@ -pub mod player_info; +pub mod player; pub mod feedback; diff --git a/service/src/player_info.rs b/service/src/player.rs similarity index 84% rename from service/src/player_info.rs rename to service/src/player.rs index c04a296..94e3c27 100644 --- a/service/src/player_info.rs +++ b/service/src/player.rs @@ -1,11 +1,11 @@ use domain::dto::player_info::PlayerInfoRegister; -use domain::entities::player_info::PlayerInfo; +use domain::entities::player::Player; use library::db; use library::resp::response::ResErr::{ErrPerm, ErrSystem}; use library::resp::response::{ResOK, ResResult}; pub async fn register(req: PlayerInfoRegister) -> ResResult> { - match PlayerInfo::find_by_platform_id(req.platform_id.clone().unwrap().as_mut_str(), db!()) + match Player::find_by_platform_id(req.platform_id.clone().unwrap().as_mut_str(), db!()) .await { Err(err) => { @@ -19,8 +19,8 @@ pub async fn register(req: PlayerInfoRegister) -> ResResult> { } } - match PlayerInfo::add_player_info( - &mut PlayerInfo{ + match Player::add_player_info( + &mut Player { username: req.username.unwrap(), email: req.email.unwrap(), platform_id: req.platform_id.unwrap(),