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 +124 -38
awiteb commented 2024-07-22 21:51:04 +02:00
Owner
Copy link

This pull request refactors the public_key column type in the relevant database entities, changing it from String to PublicKey.

This pull request refactors the public_key column type in the relevant database entities, changing it from String to PublicKey.
awiteb changed title from refactor: Update public key column type from to to refactor: Update public key column type from `String` to `PublicKey` 2024-07-22 21:51:19 +02:00
awiteb added the
Kind/Enhancement
Status
Waiting On Author
 labels 2024-07-22 21:51:53 +02:00
awiteb force-pushed awiteb/refactor-entities-public-key from bb76ec8d8d to 0cd317435f 2024-07-23 00:47:38 +02:00 Compare
awiteb requested review from Amjad50 2024-07-23 01:45:46 +02:00
awiteb added
Status
Waiting On Review
 and removed
Status
Waiting On Author
 labels 2024-07-23 01:46:00 +02:00
awiteb force-pushed awiteb/refactor-entities-public-key from 0cd317435f to 79ef0d2448 2024-07-23 01:56:14 +02:00 Compare
awiteb commented 2024-07-23 01:57:47 +02:00
Author
Owner
Copy link

Sorry, just rebasing the master, to be clean

Sorry, just rebasing the master, to be clean
Amjad50 requested changes 2024-07-23 05:07:38 +02:00
Dismissed
crates/oxidetalis_core/src/types/impl_sea_orm.rs
@ -0,0 +38,4 @@
impl From<PublicKey> for Value {
fn from(public_key: PublicKey) -> Self {
Self::String(Some(Box::new(public_key.to_string())))
Amjad50 commented 2024-07-23 04:59:58 +02:00
Member
Copy link

Wouldn't it be better to use Bytes type? easier to convert as its just copying bytes and making sure its the length expected and maybe more efficient

Wouldn't it be better to use `Bytes` type? easier to convert as its just copying bytes and making sure its the length expected and maybe more efficient
awiteb commented 2024-07-23 08:36:40 +02:00
Author
Owner
Copy link

Wouldn't it be better to use Bytes type?

Yes I think so, it is actually a good idea.

> Wouldn't it be better to use Bytes type? Yes I think so, it is actually a good idea.
awiteb marked this conversation as resolved
crates/oxidetalis_core/src/types/impl_sea_orm.rs
@ -0,0 +45,4 @@
impl TryGetable for PublicKey {
fn try_get_by<I: sea_orm::ColIdx>(res: &QueryResult, idx: I) -> Result<Self, TryGetError> {
<String as TryGetable>::try_get_by(res, idx)
.map(|v| {
Amjad50 commented 2024-07-23 04:43:44 +02:00
Member
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
awiteb marked this conversation as resolved
crates/oxidetalis_core/src/types/impl_sea_orm.rs
@ -0,0 +56,4 @@
impl ValueType for PublicKey {
fn try_from(v: Value) -> Result<Self, ValueTypeErr> {
<String as ValueType>::try_from(v)
.map(|v| PublicKey::from_str(&v).map_err(|_| ValueTypeErr))
Amjad50 commented 2024-07-23 04:44:29 +02:00
Member
Copy link

same as above, and_then instead of map

same as above, `and_then` instead of `map`
👍 1
awiteb marked this conversation as resolved
crates/oxidetalis_entities/src/incoming_chat_requests.rs
@ -22,6 +22,7 @@
//! Entity for `in_chat_requests` table
use chrono::Utc;
use oxidetalis_core::types::PublicKey as CorePublicKey;
Amjad50 commented 2024-07-23 04:50:34 +02:00
Member
Copy link

Why is it here CorePublicKey? while in oxidetails crate is just PublicKey, I think it might be confusing as we would think its 2 types.

Why is it here `CorePublicKey`? while in `oxidetails` crate is just `PublicKey`, I think it might be confusing as we would think its 2 types.
awiteb commented 2024-07-23 08:47:09 +02:00
Author
Owner
Copy link

while in oxidetails crate is just PublicKey

Because oxidetalis only work with one PublicKey from the core, while
the core work with two PublicKey, the first one from k256 crate and
the second one it its own.

> while in `oxidetails` crate is just `PublicKey` Because `oxidetalis` only work with one `PublicKey` from the core, while the core work with two `PublicKey`, the first one from `k256` crate and the second one it its own.
Amjad50 commented 2024-07-23 08:51:11 +02:00
Member
Copy link

Ah right, didn't notice that

Ah right, didn't notice that
awiteb commented 2024-07-23 18:44:13 +02:00
Author
Owner
Copy link

Amjad50: Why is it here CorePublicKey? while in oxidetails crate is just PublicKey

You're right, I was mean if we use it in the core not entities.

awiteb: while the core work with two PublicKey

I didn't realize that was in entities.

> Amjad50: Why is it here CorePublicKey? while in oxidetails crate is just PublicKey You're right, I was mean if we use it in the core not entities. > awiteb: while the core work with two PublicKey I didn't realize that was in entities.
Amjad50 marked this conversation as resolved
awiteb added
Status
Waiting On Author
 and removed
Status
Waiting On Review
 labels 2024-07-23 08:35:24 +02:00
awiteb added 3 commits 2024-07-23 18:40:06 +02:00 
Signed-off-by: Awiteb <a@4rs.nl>
Signed-off-by: Awiteb <a@4rs.nl>
chore: Use PublicKey as it is
All checks were successful
DCO checker / DCO checker (pull_request) Successful in 15s
Details
Rust CI / Rust CI (pull_request) Successful in 5m22s
Details
eb52c0a030 
Signed-off-by: Awiteb <a@4rs.nl>
awiteb requested review from Amjad50 2024-07-23 18:40:15 +02:00
awiteb added
Status
Waiting On Review
 and removed
Status
Waiting On Author
 labels 2024-07-23 18:40:40 +02:00
Amjad50 approved these changes 2024-07-23 23:50:37 +02:00
awiteb manually merged commit 1d1bb962bb into master 2024-07-24 00:20:10 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Amjad50
Labels
Clear labels
  
Good First Issue

Good for newcomers

  
Help wanted

Request for help from the contributors

  
Kind/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Bug Fix

Pull request that fix a bug

  
Kind/CI-CD

Something related to the CI/CD

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Question

Question related to the project

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Reviewed
Accepted
Feature Request or Proposal was accepted by maintainers and will be implemented

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Declined
Feature Request or Proposal was declined by maintainers

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Approved
The PR is approved by reviewers and is ready to be merged

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Inactive
Inactive and waiting on the author. This is often applied to closed PRs

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

  
Status
Waiting On Author
This is awaiting some action (such as code changes or more information) from the author

  
Status
Waiting On Review
Awaiting review from the assignee

No labels
Good First Issue
Help wanted
Kind/Breaking
Kind/Bug
Kind/Bug Fix
Kind/CI-CD
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Question
Kind/Security
Kind/Testing
Reviewed
Accepted
Reviewed
Confirmed
Reviewed
Declined
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Approved
Status
Blocked
Status
Inactive
Status
Need More Info
Status
Waiting On Author
Status
Waiting On Review
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: OxideTalis/oxidetalis#29
No description provided.
Delete branch "awiteb/refactor-entities-public-key"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?