From d1ca5c0a481afe1e8d270d9eb0c9aa48908434c6 Mon Sep 17 00:00:00 2001 From: Awiteb Date: Sun, 28 Jul 2024 11:07:00 +0300 Subject: [PATCH] change: Rename `in_on` col of `incoming_chat` table to `received_timestamp` Signed-off-by: Awiteb --- crates/oxidetalis/src/database/incoming_chat.rs | 2 +- crates/oxidetalis_entities/src/incoming_chat.rs | 10 +++++----- .../src/create_incoming_chat_table.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/oxidetalis/src/database/incoming_chat.rs b/crates/oxidetalis/src/database/incoming_chat.rs index e562199..17f7a88 100644 --- a/crates/oxidetalis/src/database/incoming_chat.rs +++ b/crates/oxidetalis/src/database/incoming_chat.rs @@ -43,7 +43,7 @@ impl IncomingChatExt for DatabaseConnection { IncomingChatEntity::insert(IncomingChatActiveModel { recipient_id: Set(recipient.id), sender: Set(*sender), - in_on: Set(Utc::now()), + received_timestamp: Set(Utc::now()), ..Default::default() }) .on_conflict( diff --git a/crates/oxidetalis_entities/src/incoming_chat.rs b/crates/oxidetalis_entities/src/incoming_chat.rs index c44393d..ed2d810 100644 --- a/crates/oxidetalis_entities/src/incoming_chat.rs +++ b/crates/oxidetalis_entities/src/incoming_chat.rs @@ -31,15 +31,15 @@ use crate::prelude::*; #[sea_orm(table_name = "incoming_chat")] pub struct Model { #[sea_orm(primary_key)] - pub id: IdCol, - pub recipient_id: IdCol, + pub id: IdCol, + pub recipient_id: IdCol, /// Public key of the sender - pub sender: PublicKey, + pub sender: PublicKey, /// Whether the chat response accepted or not. /// This will be `None` if it is chat request, otherwise `bool` - pub accepted_response: Option, + pub accepted_response: Option, /// The timestamp of the request, when it was received - pub in_on: chrono::DateTime, + pub received_timestamp: chrono::DateTime, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/crates/oxidetalis_migrations/src/create_incoming_chat_table.rs b/crates/oxidetalis_migrations/src/create_incoming_chat_table.rs index 87b7083..cdab495 100644 --- a/crates/oxidetalis_migrations/src/create_incoming_chat_table.rs +++ b/crates/oxidetalis_migrations/src/create_incoming_chat_table.rs @@ -65,7 +65,7 @@ impl MigrationTrait for Migration { .default(Option::::None), ) .col( - ColumnDef::new(IncomingChat::InOn) + ColumnDef::new(IncomingChat::ReceivedTimestamp) .timestamp_with_time_zone() .not_null(), ) @@ -97,5 +97,5 @@ enum IncomingChat { Sender, /// Whether the chat response accepted or not AcceptedResponse, - InOn, + ReceivedTimestamp, }