OxideTalis/oxidetalis
OxideTalis/oxidetalis
1
Fork 1
Code Issues 10 Pull requests Projects 1 Releases Activity Actions

refactor: Update public key column type from String to PublicKey #29

Manually merged
awiteb merged 6 commits from awiteb/refactor-entities-public-key into master 2024-07-24 00:20:10 +02:00 AGit
Conversation 1 Commits 6 Files changed 19 +5 -9
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 35a7354de1 - Show all commits

14
crates/oxidetalis_core/src/types/impl_sea_orm.rs
View file

@ -44,24 +44,20 @@ impl From<PublicKey> for Value {
impl TryGetable for PublicKey { impl TryGetable for PublicKey {
fn try_get_by<I: sea_orm::ColIdx>(res: &QueryResult, idx: I) -> Result<Self, TryGetError> { fn try_get_by<I: sea_orm::ColIdx>(res: &QueryResult, idx: I) -> Result<Self, TryGetError> {
<String as TryGetable>::try_get_by(res, idx) <String as TryGetable>::try_get_by(res, idx).and_then(|v| {
.map(|v| { PublicKey::from_str(&v).map_err(|err| TryGetError::DbErr(DbErr::Type(err.to_string())))
awiteb marked this conversation as resolved
Amjad50 commented 2024-07-23 04:43:44 +02:00
Review
Copy link

replace map by and_then and you won't need and_then(|res| res)

<String as TryGetable>::try_get_by(res, idx).and_then(|v| {
    PublicKey::from_str(&v).map_err(|err| TryGetError::DbErr(DbErr::Type(err.to_string())))
})
replace `map` by `and_then` and you won't need `and_then(|res| res)` ```rust <String as TryGetable>::try_get_by(res, idx).and_then(|v| { PublicKey::from_str(&v).map_err(|err| TryGetError::DbErr(DbErr::Type(err.to_string()))) }) ```
👍 1
PublicKey::from_str(&v) })
.map_err(|err| TryGetError::DbErr(DbErr::Type(err.to_string())))
})
.and_then(|res| res)
} }
} }
impl ValueType for PublicKey { impl ValueType for PublicKey {
fn try_from(v: Value) -> Result<Self, ValueTypeErr> { fn try_from(v: Value) -> Result<Self, ValueTypeErr> {
<String as ValueType>::try_from(v) <String as ValueType>::try_from(v)
.map(|v| PublicKey::from_str(&v).map_err(|_| ValueTypeErr)) .and_then(|v| PublicKey::from_str(&v).map_err(|_| ValueTypeErr))
.and_then(|res| res)
} }
fn type_name() -> String { fn type_name() -> String {
awiteb marked this conversation as resolved
Amjad50 commented 2024-07-23 04:44:29 +02:00
Review
Copy link

same as above, and_then instead of map

same as above, `and_then` instead of `map`
👍 1
stringify!(PublicKey).to_owned() String::from("PublicKey")
} }
fn array_type() -> ArrayType { fn array_type() -> ArrayType {