代码优化

This commit is contained in:
liyunjia 2024-11-01 09:16:13 +08:00
parent 82b0f2d363
commit 79fabc6bcc

View File

@ -95,14 +95,14 @@ impl Account {
.await .await
{ {
Ok(account) => { Ok(account) => {
return Ok(Some(account)); Ok(Some(account))
} }
Err(Error::RowNotFound) => { Err(Error::RowNotFound) => {
return Ok(None); Ok(None)
} }
Err(e) => { Err(e) => {
tracing::error!("find_by_apple_id error: {:?}", e); tracing::error!("find_by_apple_id error: {:?}", e);
return Err(e); Err(e)
} }
} }
} }
@ -116,18 +116,18 @@ impl Account {
r#"select * from account where custom_id = $1"#, r#"select * from account where custom_id = $1"#,
custom_id custom_id
) )
.fetch_one(db_pool) .fetch_one(db_pool)
.await .await
{ {
Ok(account) => { Ok(account) => {
return Ok(Some(account)); Ok(Some(account))
} }
Err(Error::RowNotFound) => { Err(Error::RowNotFound) => {
return Ok(None); Ok(None)
} }
Err(e) => { Err(e) => {
tracing::error!("find_by_custom_id error: {:?}", e); tracing::error!("find_by_custom_id error: {:?}", e);
return Err(e); Err(e)
} }
} }
} }
@ -141,18 +141,18 @@ impl Account {
r#"select * from account where facebook_id = $1"#, r#"select * from account where facebook_id = $1"#,
facebook_id facebook_id
) )
.fetch_one(db_pool) .fetch_one(db_pool)
.await .await
{ {
Ok(account) => { Ok(account) => {
return Ok(Some(account)); Ok(Some(account))
} }
Err(Error::RowNotFound) => { Err(Error::RowNotFound) => {
return Ok(None); Ok(None)
} }
Err(e) => { Err(e) => {
tracing::error!("find_by_facebook_id error: {:?}", e); tracing::error!("find_by_facebook_id error: {:?}", e);
return Err(e); Err(e)
} }
} }
} }
@ -166,18 +166,18 @@ impl Account {
r#"select * from account where google_id = $1"#, r#"select * from account where google_id = $1"#,
google_id google_id
) )
.fetch_one(db_pool) .fetch_one(db_pool)
.await .await
{ {
Ok(account) => { Ok(account) => {
return Ok(Some(account)); Ok(Some(account))
} }
Err(Error::RowNotFound) => { Err(Error::RowNotFound) => {
return Ok(None); Ok(None)
} }
Err(e) => { Err(e) => {
tracing::error!("find_by_google_id error: {:?}", e); tracing::error!("find_by_google_id error: {:?}", e);
return Err(e); Err(e)
} }
} }
} }
@ -217,18 +217,18 @@ impl Account {
username, username,
password.as_bytes().to_vec(), password.as_bytes().to_vec(),
) )
.fetch_one(db_pool) .fetch_one(db_pool)
.await .await
{ {
Ok(account) => { Ok(account) => {
return Ok(Some(account)); Ok(Some(account))
} }
Err(Error::RowNotFound) => { Err(Error::RowNotFound) => {
return Ok(None); Ok(None)
} }
Err(e) => { Err(e) => {
tracing::error!("find_by_google_id error: {:?}", e); tracing::error!("find_by_google_id error: {:?}", e);
return Err(e); Err(e)
} }
} }
} }
@ -252,18 +252,18 @@ impl Account {
self.wallet, self.wallet,
self.metadata self.metadata
) )
.fetch_one(&mut **transaction) .fetch_one(&mut **transaction)
.await .await
{ {
Ok(account) => { Ok(account) => {
return Ok(Some(account)); Ok(Some(account))
} }
Err(Error::RowNotFound) => { Err(Error::RowNotFound) => {
return Ok(None); Ok(None)
} }
Err(e) => { Err(e) => {
tracing::error!("add_account error: {:?}", e); tracing::error!("add_account error: {:?}", e);
return Err(e); Err(e)
} }
} }
} }