PlayerInfo 改为 Player

This commit is contained in:
李运家 2024-05-24 09:45:21 +08:00
parent 0dabb67544
commit 4c2f64e4eb
5 changed files with 16 additions and 15 deletions

View File

@ -11,7 +11,7 @@ pub async fn create(
return Err(ResErr::ErrParams(Some(err.to_string()))); return Err(ResErr::ErrParams(Some(err.to_string())));
} }
service::player_info::register(req).await?; service::player::register(req).await?;
Ok(ResOK(None)) Ok(ResOK(None))
} }

View File

@ -1,4 +1,4 @@
pub mod account; pub mod account;
pub mod player_info; pub mod player;
pub mod feedback; pub mod feedback;

View File

@ -3,7 +3,7 @@ use sqlx::PgPool;
use sqlx::types::chrono; use sqlx::types::chrono;
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
pub struct PlayerInfo { pub struct Player {
pub id: i64, pub id: i64,
pub username: String, pub username: String,
pub email: String, pub email: String,
@ -11,25 +11,26 @@ pub struct PlayerInfo {
pub user_type: String, pub user_type: String,
pub country_code: String, pub country_code: String,
pub created_at: NaiveDateTime, pub created_at: NaiveDateTime,
pub updated_at: NaiveDateTime,
} }
impl PlayerInfo { impl Player {
pub async fn find_by_platform_id(platform_id: &str, db_pool: &PgPool) -> Result<PlayerInfo, sqlx::Error> { pub async fn find_by_platform_id(platform_id: &str, db_pool: &PgPool) -> Result<Player, sqlx::Error> {
sqlx::query_as!( sqlx::query_as!(
PlayerInfo, Player,
r#"select * from player_info where platform_id = $1"#, r#"select * from player where platform_id = $1"#,
platform_id platform_id
) )
.fetch_one(db_pool) .fetch_one(db_pool)
.await .await
} }
pub async fn add_player_info(player_info: &mut PlayerInfo, db_pool: &PgPool) -> Result<PlayerInfo, sqlx::Error> { pub async fn add_player_info(player_info: &mut Player, db_pool: &PgPool) -> Result<Player, sqlx::Error> {
player_info.created_at = chrono::Local::now().naive_local(); player_info.created_at = chrono::Local::now().naive_local();
sqlx::query_as!( sqlx::query_as!(
PlayerInfo, Player,
r#" r#"
insert into player_info insert into player
(username, email, platform_id, user_type, country_code, created_at) (username, email, platform_id, user_type, country_code, created_at)
values values
($1, $2, $3, $4, $5, $6) returning *"#, ($1, $2, $3, $4, $5, $6) returning *"#,

View File

@ -1,2 +1,2 @@
pub mod player_info; pub mod player;
pub mod feedback; pub mod feedback;

View File

@ -1,11 +1,11 @@
use domain::dto::player_info::PlayerInfoRegister; use domain::dto::player_info::PlayerInfoRegister;
use domain::entities::player_info::PlayerInfo; use domain::entities::player::Player;
use library::db; use library::db;
use library::resp::response::ResErr::{ErrPerm, ErrSystem}; use library::resp::response::ResErr::{ErrPerm, ErrSystem};
use library::resp::response::{ResOK, ResResult}; use library::resp::response::{ResOK, ResResult};
pub async fn register(req: PlayerInfoRegister) -> ResResult<ResOK<()>> { pub async fn register(req: PlayerInfoRegister) -> ResResult<ResOK<()>> {
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 .await
{ {
Err(err) => { Err(err) => {
@ -19,8 +19,8 @@ pub async fn register(req: PlayerInfoRegister) -> ResResult<ResOK<()>> {
} }
} }
match PlayerInfo::add_player_info( match Player::add_player_info(
&mut PlayerInfo{ &mut Player {
username: req.username.unwrap(), username: req.username.unwrap(),
email: req.email.unwrap(), email: req.email.unwrap(),
platform_id: req.platform_id.unwrap(), platform_id: req.platform_id.unwrap(),