From f0383296dee88533581e1453a59a6e612231a1ec Mon Sep 17 00:00:00 2001
From: Awiteb <a@4rs.nl>
Date: Sun, 28 Jul 2024 10:40:04 +0300
Subject: [PATCH] change: Rename `UserId` to `IdCol` and make it private

Signed-off-by: Awiteb <a@4rs.nl>
---
 crates/oxidetalis_entities/src/incoming_chat.rs          | 4 ++--
 crates/oxidetalis_entities/src/outgoing_chat_requests.rs | 4 ++--
 crates/oxidetalis_entities/src/prelude.rs                | 2 +-
 crates/oxidetalis_entities/src/users.rs                  | 2 +-
 crates/oxidetalis_entities/src/users_status.rs           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/oxidetalis_entities/src/incoming_chat.rs b/crates/oxidetalis_entities/src/incoming_chat.rs
index e93fd8a..709bb1a 100644
--- a/crates/oxidetalis_entities/src/incoming_chat.rs
+++ b/crates/oxidetalis_entities/src/incoming_chat.rs
@@ -31,8 +31,8 @@ use crate::prelude::*;
 #[sea_orm(table_name = "incoming_chat")]
 pub struct Model {
     #[sea_orm(primary_key)]
-    pub id:           UserId,
-    pub recipient_id: UserId,
+    pub id:           IdCol,
+    pub recipient_id: IdCol,
     /// Public key of the sender
     pub sender:       PublicKey,
     /// The timestamp of the request, when it was received
diff --git a/crates/oxidetalis_entities/src/outgoing_chat_requests.rs b/crates/oxidetalis_entities/src/outgoing_chat_requests.rs
index 2f5642c..8e00c3b 100644
--- a/crates/oxidetalis_entities/src/outgoing_chat_requests.rs
+++ b/crates/oxidetalis_entities/src/outgoing_chat_requests.rs
@@ -31,8 +31,8 @@ use crate::prelude::*;
 #[sea_orm(table_name = "out_chat_requests")]
 pub struct Model {
     #[sea_orm(primary_key)]
-    pub id:        UserId,
-    pub sender_id: UserId,
+    pub id:        IdCol,
+    pub sender_id: IdCol,
     /// Public key of the recipient
     pub recipient: PublicKey,
     /// The timestamp of the request, when it was sent
diff --git a/crates/oxidetalis_entities/src/prelude.rs b/crates/oxidetalis_entities/src/prelude.rs
index a4e5d64..d5cb22f 100644
--- a/crates/oxidetalis_entities/src/prelude.rs
+++ b/crates/oxidetalis_entities/src/prelude.rs
@@ -38,7 +38,7 @@ pub use sea_orm::{
 };
 
 /// User ID type
-pub type UserId = i64;
+pub(crate) type IdCol = i64;
 
 pub use super::incoming_chat::{
     ActiveModel as IncomingChatActiveModel,
diff --git a/crates/oxidetalis_entities/src/users.rs b/crates/oxidetalis_entities/src/users.rs
index b3a0f81..1c59bb6 100644
--- a/crates/oxidetalis_entities/src/users.rs
+++ b/crates/oxidetalis_entities/src/users.rs
@@ -31,7 +31,7 @@ use crate::prelude::*;
 #[sea_orm(table_name = "users")]
 pub struct Model {
     #[sea_orm(primary_key)]
-    pub id:          UserId,
+    pub id:          IdCol,
     pub public_key:  PublicKey,
     pub last_logout: chrono::DateTime<Utc>,
     pub is_admin:    bool,
diff --git a/crates/oxidetalis_entities/src/users_status.rs b/crates/oxidetalis_entities/src/users_status.rs
index 2f66883..0559a6e 100644
--- a/crates/oxidetalis_entities/src/users_status.rs
+++ b/crates/oxidetalis_entities/src/users_status.rs
@@ -40,8 +40,8 @@ pub enum AccessStatus {
 #[sea_orm(table_name = "users_status")]
 pub struct Model {
     #[sea_orm(primary_key)]
-    pub id:         UserId,
-    pub user_id:    UserId,
+    pub id:         IdCol,
+    pub user_id:    IdCol,
     pub target:     PublicKey,
     pub status:     AccessStatus,
     pub updated_at: chrono::DateTime<Utc>,