diff --git a/crates/oxidetalis/src/database/in_chat_requests.rs b/crates/oxidetalis/src/database/incoming_chat.rs similarity index 77% rename from crates/oxidetalis/src/database/in_chat_requests.rs rename to crates/oxidetalis/src/database/incoming_chat.rs index 10c150a..2a6dbba 100644 --- a/crates/oxidetalis/src/database/in_chat_requests.rs +++ b/crates/oxidetalis/src/database/incoming_chat.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -//! Database extension for the `in_chat_requests` table. +//! Database extension for the `incoming_chat` table. use chrono::Utc; use oxidetalis_core::types::PublicKey; @@ -23,8 +23,8 @@ use sea_orm::{sea_query::OnConflict, DatabaseConnection}; use crate::errors::ServerResult; -/// Extension trait for the `in_chat_requests` table. -pub trait InChatRequestsExt { +/// Extension trait for the `incoming_chat` table. +pub trait IncomingChatExt { /// Save the chat request in the recipient table async fn save_in_chat_request( &self, @@ -33,26 +33,23 @@ pub trait InChatRequestsExt { ) -> ServerResult<()>; } -impl InChatRequestsExt for DatabaseConnection { +impl IncomingChatExt for DatabaseConnection { #[logcall::logcall] async fn save_in_chat_request( &self, sender: &PublicKey, recipient: &UserModel, ) -> ServerResult<()> { - InChatRequestsEntity::insert(InChatRequestsActiveModel { + IncomingChatEntity::insert(IncomingChatActiveModel { recipient_id: Set(recipient.id), sender: Set(*sender), in_on: Set(Utc::now()), ..Default::default() }) .on_conflict( - OnConflict::columns([ - InChatRequestsColumn::RecipientId, - InChatRequestsColumn::Sender, - ]) - .do_nothing() - .to_owned(), + OnConflict::columns([IncomingChatColumn::RecipientId, IncomingChatColumn::Sender]) + .do_nothing() + .to_owned(), ) .exec(self) .await?; diff --git a/crates/oxidetalis/src/database/mod.rs b/crates/oxidetalis/src/database/mod.rs index 8d51890..ec51210 100644 --- a/crates/oxidetalis/src/database/mod.rs +++ b/crates/oxidetalis/src/database/mod.rs @@ -16,12 +16,12 @@ //! Database trait extensions. -mod in_chat_requests; +mod incoming_chat; mod out_chat_requests; mod user; mod user_status; -pub use in_chat_requests::*; +pub use incoming_chat::*; pub use out_chat_requests::*; pub use user::*; pub use user_status::*; diff --git a/crates/oxidetalis/src/websocket/handlers/chat_request.rs b/crates/oxidetalis/src/websocket/handlers/chat_request.rs index 222137a..77d6ade 100644 --- a/crates/oxidetalis/src/websocket/handlers/chat_request.rs +++ b/crates/oxidetalis/src/websocket/handlers/chat_request.rs @@ -20,7 +20,7 @@ use oxidetalis_core::types::PublicKey; use oxidetalis_entities::prelude::*; use sea_orm::DatabaseConnection; -use crate::database::InChatRequestsExt; +use crate::database::IncomingChatExt; use crate::errors::ServerError; use crate::extensions::OnlineUsersExt; use crate::{ diff --git a/crates/oxidetalis_entities/src/incoming_chat_requests.rs b/crates/oxidetalis_entities/src/incoming_chat.rs similarity index 96% rename from crates/oxidetalis_entities/src/incoming_chat_requests.rs rename to crates/oxidetalis_entities/src/incoming_chat.rs index ed6ff3c..e93fd8a 100644 --- a/crates/oxidetalis_entities/src/incoming_chat_requests.rs +++ b/crates/oxidetalis_entities/src/incoming_chat.rs @@ -19,7 +19,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -//! Entity for `in_chat_requests` table +//! Entity for `incoming_chat` table use chrono::Utc; use oxidetalis_core::types::PublicKey; @@ -28,7 +28,7 @@ use sea_orm::entity::prelude::*; use crate::prelude::*; #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)] -#[sea_orm(table_name = "in_chat_requests")] +#[sea_orm(table_name = "incoming_chat")] pub struct Model { #[sea_orm(primary_key)] pub id: UserId, diff --git a/crates/oxidetalis_entities/src/lib.rs b/crates/oxidetalis_entities/src/lib.rs index ba83d45..2df1d8e 100644 --- a/crates/oxidetalis_entities/src/lib.rs +++ b/crates/oxidetalis_entities/src/lib.rs @@ -21,7 +21,7 @@ #![doc = include_str!("../README.md")] -pub mod incoming_chat_requests; +pub mod incoming_chat; pub mod outgoing_chat_requests; pub mod prelude; pub mod users; diff --git a/crates/oxidetalis_entities/src/prelude.rs b/crates/oxidetalis_entities/src/prelude.rs index 4bdd679..a4e5d64 100644 --- a/crates/oxidetalis_entities/src/prelude.rs +++ b/crates/oxidetalis_entities/src/prelude.rs @@ -40,11 +40,11 @@ pub use sea_orm::{ /// User ID type pub type UserId = i64; -pub use super::incoming_chat_requests::{ - ActiveModel as InChatRequestsActiveModel, - Column as InChatRequestsColumn, - Entity as InChatRequestsEntity, - Model as InChatRequestsModel, +pub use super::incoming_chat::{ + ActiveModel as IncomingChatActiveModel, + Column as IncomingChatColumn, + Entity as IncomingChatEntity, + Model as IncomingChatModel, }; pub use super::outgoing_chat_requests::{ ActiveModel as OutChatRequestsActiveModel, diff --git a/crates/oxidetalis_entities/src/users.rs b/crates/oxidetalis_entities/src/users.rs index 8489585..b3a0f81 100644 --- a/crates/oxidetalis_entities/src/users.rs +++ b/crates/oxidetalis_entities/src/users.rs @@ -39,17 +39,17 @@ pub struct Model { #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] pub enum Relation { - #[sea_orm(has_many = "InChatRequestsEntity")] - InChatRequests, + #[sea_orm(has_many = "IncomingChatEntity")] + IncomingChat, #[sea_orm(has_many = "OutChatRequestsEntity")] OutChatRequests, #[sea_orm(has_many = "UsersStatusEntity")] UsersStatus, } -impl Related for Entity { +impl Related for Entity { fn to() -> RelationDef { - Relation::InChatRequests.def() + Relation::IncomingChat.def() } } diff --git a/crates/oxidetalis_migrations/src/create_incoming_chat_requests_table.rs b/crates/oxidetalis_migrations/src/create_incoming_chat_table.rs similarity index 78% rename from crates/oxidetalis_migrations/src/create_incoming_chat_requests_table.rs rename to crates/oxidetalis_migrations/src/create_incoming_chat_table.rs index 3cd6fed..0dc03f5 100644 --- a/crates/oxidetalis_migrations/src/create_incoming_chat_requests_table.rs +++ b/crates/oxidetalis_migrations/src/create_incoming_chat_table.rs @@ -19,8 +19,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -//! Migration to create the `in_chat_requests` table, a table for incoming chat -//! requests from other users +//! Migration to create the `incoming_chat` table, a table for incoming chat +//! requests and responses from other users use sea_orm_migration::prelude::*; @@ -35,31 +35,31 @@ impl MigrationTrait for Migration { manager .create_table( Table::create() - .table(InChatRequests::Table) + .table(IncomingChat::Table) .if_not_exists() .col( - ColumnDef::new(InChatRequests::Id) + ColumnDef::new(IncomingChat::Id) .big_integer() .not_null() .auto_increment() .primary_key(), ) .col( - ColumnDef::new(InChatRequests::RecipientId) + ColumnDef::new(IncomingChat::RecipientId) .big_integer() .not_null(), ) .foreign_key( ForeignKey::create() - .name("fk-in_chat_requests-users") - .from(InChatRequests::Table, InChatRequests::RecipientId) + .name("fk-incoming_chat-users") + .from(IncomingChat::Table, IncomingChat::RecipientId) .to(Users::Table, Users::Id) .on_update(ForeignKeyAction::NoAction) .on_delete(ForeignKeyAction::Cascade), ) - .col(ColumnDef::new(InChatRequests::Sender).binary().not_null()) + .col(ColumnDef::new(IncomingChat::Sender).binary().not_null()) .col( - ColumnDef::new(InChatRequests::InOn) + ColumnDef::new(IncomingChat::InOn) .timestamp_with_time_zone() .not_null(), ) @@ -71,9 +71,9 @@ impl MigrationTrait for Migration { Index::create() .if_not_exists() .name("sep_request") - .table(InChatRequests::Table) - .col(InChatRequests::RecipientId) - .col(InChatRequests::Sender) + .table(IncomingChat::Table) + .col(IncomingChat::RecipientId) + .col(IncomingChat::Sender) .unique() .to_owned(), ) @@ -82,7 +82,7 @@ impl MigrationTrait for Migration { } #[derive(DeriveIden)] -enum InChatRequests { +enum IncomingChat { Table, Id, RecipientId, diff --git a/crates/oxidetalis_migrations/src/lib.rs b/crates/oxidetalis_migrations/src/lib.rs index b36dd83..56603d3 100644 --- a/crates/oxidetalis_migrations/src/lib.rs +++ b/crates/oxidetalis_migrations/src/lib.rs @@ -24,7 +24,7 @@ use sea_orm_migration::prelude::*; pub use sea_orm_migration::MigratorTrait; -mod create_incoming_chat_requests_table; +mod create_incoming_chat_table; mod create_outgoing_chat_requests_table; mod create_users_status; mod create_users_table; @@ -36,7 +36,7 @@ impl MigratorTrait for Migrator { fn migrations() -> Vec> { vec![ Box::new(create_users_table::Migration), - Box::new(create_incoming_chat_requests_table::Migration), + Box::new(create_incoming_chat_table::Migration), Box::new(create_outgoing_chat_requests_table::Migration), Box::new(create_users_status::Migration), ]