diff --git a/api/src/controller/mod.rs b/api/src/controller/mod.rs index d613d5a..fcb7558 100644 --- a/api/src/controller/mod.rs +++ b/api/src/controller/mod.rs @@ -1 +1 @@ -pub mod game_account; \ No newline at end of file +pub mod player_info; \ No newline at end of file diff --git a/api/src/controller/game_account.rs b/api/src/controller/player_info.rs similarity index 67% rename from api/src/controller/game_account.rs rename to api/src/controller/player_info.rs index 1d13870..f6740c3 100644 --- a/api/src/controller/game_account.rs +++ b/api/src/controller/player_info.rs @@ -1,17 +1,17 @@ use axum::Json; use axum_extra::extract::WithRejection; -use domain::dto::game_account::GameAccountCreate; +use domain::dto::player_info::PlayerInfoRegister; use library::resp::{rejection::IRejection, response::{ResErr, ResOK, ResResult}}; use validator::Validate; pub async fn create( - WithRejection(Json(req), _): IRejection> + WithRejection(Json(req), _): IRejection> ) -> ResResult> { if let Err(err) = req.validate() { return Err(ResErr::ErrParams(Some(err.to_string()))); } - service::game_account::create(req).await?; + service::player_info::register(req).await?; Ok(ResOK(None)) } diff --git a/api/src/router.rs b/api/src/router.rs index 0a52ef1..2e50768 100644 --- a/api/src/router.rs +++ b/api/src/router.rs @@ -8,7 +8,7 @@ use tower_http::trace::TraceLayer; pub(crate) fn init() -> Router { let open = Router::new().route("/", get(|| async { "hello" })); - let auth = Router::new().route("/game_accounts", post(controller::game_account::create)); + let auth = Router::new().route("/game_accounts", post(controller::player_info::create)); Router::new() .nest("/", open) diff --git a/domain/src/dto/mod.rs b/domain/src/dto/mod.rs index d613d5a..fcb7558 100644 --- a/domain/src/dto/mod.rs +++ b/domain/src/dto/mod.rs @@ -1 +1 @@ -pub mod game_account; \ No newline at end of file +pub mod player_info; \ No newline at end of file diff --git a/domain/src/dto/game_account.rs b/domain/src/dto/player_info.rs similarity index 95% rename from domain/src/dto/game_account.rs rename to domain/src/dto/player_info.rs index e8a012c..8c0c4a5 100644 --- a/domain/src/dto/game_account.rs +++ b/domain/src/dto/player_info.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use validator::Validate; #[derive(Debug, Validate, Deserialize, Serialize)] -pub struct GameAccountCreate { +pub struct PlayerInfoRegister { #[validate(required(message = "用户名称不能为空"), length(min = 1, message = "用户名称不能为空"))] pub username: Option, #[validate(required, length(min = 1, message = "电子邮箱不能为空"))] diff --git a/domain/src/entities/mod.rs b/domain/src/entities/mod.rs index 6ca4aeb..e5f48d8 100644 --- a/domain/src/entities/mod.rs +++ b/domain/src/entities/mod.rs @@ -2,4 +2,4 @@ pub mod prelude; pub mod account; -pub mod game_account; +pub mod player_info; diff --git a/domain/src/entities/game_account.rs b/domain/src/entities/player_info.rs similarity index 93% rename from domain/src/entities/game_account.rs rename to domain/src/entities/player_info.rs index 7984e1c..c822c8a 100644 --- a/domain/src/entities/game_account.rs +++ b/domain/src/entities/player_info.rs @@ -3,7 +3,7 @@ use sea_orm::entity::prelude::*; #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)] -#[sea_orm(table_name = "game_account")] +#[sea_orm(table_name = "player_info")] pub struct Model { #[sea_orm(primary_key)] pub id: u64, diff --git a/domain/src/entities/prelude.rs b/domain/src/entities/prelude.rs index 3159e65..4897c2e 100644 --- a/domain/src/entities/prelude.rs +++ b/domain/src/entities/prelude.rs @@ -1,4 +1,4 @@ //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.14 pub use super::account::Entity as Account; -pub use super::game_account::Entity as GameAccount; +pub use super::player_info::Entity as PlayerInfo; diff --git a/service/src/lib.rs b/service/src/lib.rs index d613d5a..fcb7558 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -1 +1 @@ -pub mod game_account; \ No newline at end of file +pub mod player_info; \ No newline at end of file diff --git a/service/src/game_account.rs b/service/src/player_info.rs similarity index 70% rename from service/src/game_account.rs rename to service/src/player_info.rs index af097eb..bd08225 100644 --- a/service/src/game_account.rs +++ b/service/src/player_info.rs @@ -1,14 +1,14 @@ -use domain::entities::game_account; -use domain::entities::prelude::GameAccount; -use domain::dto::game_account::GameAccountCreate; +use domain::entities::player_info; +use domain::entities::prelude::PlayerInfo; +use domain::dto::player_info::PlayerInfoRegister; use library::db; use library::resp::response::ResErr::{ErrPerm, ErrSystem}; use library::resp::response::{ResOK, ResResult}; use sea_orm::{ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, Set}; -pub async fn create(req: GameAccountCreate) -> ResResult> { - match GameAccount::find() - .filter(game_account::Column::PlatformId.eq(req.platform_id.clone().unwrap())) +pub async fn register(req: PlayerInfoRegister) -> ResResult> { + match PlayerInfo::find() + .filter(player_info::Column::PlatformId.eq(req.platform_id.clone().unwrap())) .count(db!()) .await { @@ -25,7 +25,7 @@ pub async fn create(req: GameAccountCreate) -> ResResult> { let now = chrono::Local::now().naive_local(); - let model = game_account::ActiveModel { + let model = player_info::ActiveModel { username: Set(req.username.unwrap()), email: Set(Option::from(req.email)), platform_id: Set(req.platform_id.unwrap()), @@ -35,7 +35,7 @@ pub async fn create(req: GameAccountCreate) -> ResResult> { ..Default::default() }; - if let Err(err) = GameAccount::insert(model).exec(db!()).await { + if let Err(err) = PlayerInfo::insert(model).exec(db!()).await { tracing::error!(error = ?err, "err insert game account"); return Err(ErrSystem(None)); }