OxideTalis/oxidetalis
OxideTalis/oxidetalis
1
Fork 0
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 +8 -8
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit eb52c0a030 - Show all commits

4
crates/oxidetalis_entities/src/incoming_chat_requests.rs
View file

@ -22,7 +22,7 @@
//! Entity for `in_chat_requests` table //! Entity for `in_chat_requests` table
use chrono::Utc; use chrono::Utc;
use oxidetalis_core::types::PublicKey as CorePublicKey; use oxidetalis_core::types::PublicKey;
Amjad50 marked this conversation as resolved
Amjad50 commented 2024-07-23 04:50:34 +02:00
Review
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
Review
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
Review
Copy link

Ah right, didn't notice that

Ah right, didn't notice that
awiteb commented 2024-07-23 18:44:13 +02:00
Review
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.
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use crate::prelude::*; use crate::prelude::*;
@ -34,7 +34,7 @@ pub struct Model {
pub id: UserId, pub id: UserId,
pub recipient_id: UserId, pub recipient_id: UserId,
/// Public key of the sender /// Public key of the sender
pub sender: CorePublicKey, pub sender: PublicKey,
/// The timestamp of the request, when it was received /// The timestamp of the request, when it was received
pub in_on: chrono::DateTime<Utc>, pub in_on: chrono::DateTime<Utc>,
} }

4
crates/oxidetalis_entities/src/outgoing_chat_requests.rs
View file

@ -22,7 +22,7 @@
//! Entity for `out_chat_requests` table //! Entity for `out_chat_requests` table
use chrono::Utc; use chrono::Utc;
use oxidetalis_core::types::PublicKey as CorePublicKey; use oxidetalis_core::types::PublicKey;
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use crate::prelude::*; use crate::prelude::*;
@ -34,7 +34,7 @@ pub struct Model {
pub id: UserId, pub id: UserId,
pub sender_id: UserId, pub sender_id: UserId,
/// Public key of the recipient /// Public key of the recipient
pub recipient: CorePublicKey, pub recipient: PublicKey,
/// The timestamp of the request, when it was sent /// The timestamp of the request, when it was sent
pub out_on: chrono::DateTime<Utc>, pub out_on: chrono::DateTime<Utc>,
} }

4
crates/oxidetalis_entities/src/users.rs
View file

@ -21,7 +21,7 @@
//! Entity for `users` table //! Entity for `users` table
use oxidetalis_core::types::PublicKey as CorePublicKey; use oxidetalis_core::types::PublicKey;
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use crate::prelude::*; use crate::prelude::*;
@ -31,7 +31,7 @@ use crate::prelude::*;
pub struct Model { pub struct Model {
#[sea_orm(primary_key)] #[sea_orm(primary_key)]
pub id: UserId, pub id: UserId,
pub public_key: CorePublicKey, pub public_key: PublicKey,
pub is_admin: bool, pub is_admin: bool,
} }

4
crates/oxidetalis_entities/src/users_status.rs
View file

@ -22,7 +22,7 @@
//! Entity for `users_status` table //! Entity for `users_status` table
use chrono::Utc; use chrono::Utc;
use oxidetalis_core::types::PublicKey as CorePublicKey; use oxidetalis_core::types::PublicKey;
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use crate::prelude::*; use crate::prelude::*;
@ -42,7 +42,7 @@ pub struct Model {
#[sea_orm(primary_key)] #[sea_orm(primary_key)]
pub id: UserId, pub id: UserId,
pub user_id: UserId, pub user_id: UserId,
pub target: CorePublicKey, pub target: PublicKey,
pub status: AccessStatus, pub status: AccessStatus,
pub updated_at: chrono::DateTime<Utc>, pub updated_at: chrono::DateTime<Utc>,
} }