init

src/models/attachment.rs

@@ -1,45 +1,36 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
-
-use sea_orm::entity::prelude::*;
-use sea_orm::prelude::async_trait::async_trait;
-use sea_orm::Set;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "attachment")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: Uuid,
-    pub message_id: Uuid,
-    pub filename: String,
-    pub file_size: i32,
-    pub mime_type: String,
-    pub created_at: DateTimeUtc,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::message::Entity",
-        from = "Column::MessageId",
-        to = "super::message::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    Message,
-}
-
-impl Related<super::message::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Message.def()
-    }
-}
-
-#[async_trait]
-impl ActiveModelBehavior for ActiveModel {
-    fn new() -> Self {
-        Self {
-            id: Set(Uuid::new_v4()),
-            ..ActiveModelTrait::default()
-        }
-    }
-}
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+
+use sea_orm::entity::prelude::*;
+use sea_orm::prelude::async_trait::async_trait;
+use sea_orm::Set;
+
+#[sea_orm::model]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "attachment")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub message_id: Uuid,
+    pub filename: String,
+    pub file_size: i32,
+    pub mime_type: String,
+    pub created_at: DateTimeUtc,
+    #[sea_orm(
+        belongs_to,
+        from = "message_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub message: HasOne<super::message::Entity>,
+}
+
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            ..ActiveModelTrait::default()
+        }
+    }
+}

src/models/category.rs

@@ -4,6 +4,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::Set;
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "category")]
 pub struct Model {
@@ -14,32 +15,16 @@ pub struct Model {
     pub position: i32,
     pub created_at: DateTimeUtc,
     pub updated_at: DateTimeUtc,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::channel::Entity")]
-    Channel,
+    #[sea_orm(has_many)]
+    pub channels: HasMany<super::channel::Entity>,
     #[sea_orm(
-        belongs_to = "super::server::Entity",
-        from = "Column::ServerId",
-        to = "super::server::Column::Id",
+        belongs_to,
+        from = "server_id",
+        to = "id",
         on_update = "Cascade",
         on_delete = "Cascade"
     )]
-    Server,
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl Related<super::server::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Server.def()
-    }
+    pub server: HasOne<super::server::Entity>,
 }
 
 #[async_trait]

src/models/channel.rs

@@ -20,6 +20,7 @@ pub enum ChannelType {
     DM,
 }
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "channel")]
 pub struct Model {
@@ -32,54 +33,26 @@ pub struct Model {
     pub name: Option<String>,
     pub created_at: DateTimeUtc,
     pub updated_at: DateTimeUtc,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::category::Entity",
-        from = "Column::CategoryId",
-        to = "super::category::Column::Id",
+        belongs_to,
+        from = "category_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "SetNull"
     )]
-    Category,
-    #[sea_orm(has_many = "super::channel_user::Entity")]
-    ChannelUser,
-    #[sea_orm(has_many = "super::message::Entity")]
-    Message,
+    pub category: HasOne<super::category::Entity>,
+    #[sea_orm(has_many)]
+    pub channel_users: HasMany<super::channel_user::Entity>,
+    #[sea_orm(has_many)]
+    pub messages: HasMany<super::message::Entity>,
     #[sea_orm(
-        belongs_to = "super::server::Entity",
-        from = "Column::ServerId",
-        to = "super::server::Column::Id",
+        belongs_to,
+        from = "server_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Server,
-}
-
-impl Related<super::category::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Category.def()
-    }
-}
-
-impl Related<super::channel_user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::ChannelUser.def()
-    }
-}
-
-impl Related<super::message::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Message.def()
-    }
-}
-
-impl Related<super::server::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Server.def()
-    }
+    pub server: HasOne<super::server::Entity>,
 }
 
 #[async_trait]

src/models/channel_role_permission.rs

@@ -5,6 +5,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::{NotSet, Set};
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "channel_role_permission")]
 pub struct Model {
@@ -17,39 +18,22 @@ pub struct Model {
 
     /// Bitmask des permissions accordées au rôle dans ce canal.
     pub permission: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id",
+        belongs_to,
+        from = "channel_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Channel,
-
+    pub channel: HasOne<super::channel::Entity>,
     #[sea_orm(
-        belongs_to = "super::role::Entity",
-        from = "Column::RoleId",
-        to = "super::role::Column::Id",
+        belongs_to,
+        from = "role_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Role,
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl Related<super::role::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Role.def()
-    }
+    pub role: HasOne<super::role::Entity>,
 }
 
 #[async_trait]

src/models/channel_user.rs

@@ -1,58 +1,43 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
-
-use sea_orm::entity::prelude::*;
-use sea_orm::prelude::async_trait::async_trait;
-use sea_orm::Set;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "channel_user")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: Uuid,
-    pub channel_id: Uuid,
-    pub user_id: Uuid,
-    pub role: String,
-    pub joined_at: DateTimeUtc,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    Channel,
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    User,
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-#[async_trait]
-impl ActiveModelBehavior for ActiveModel {
-    fn new() -> Self {
-        Self {
-            id: Set(Uuid::new_v4()),
-            ..ActiveModelTrait::default()
-        }
-    }
-}
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+
+use sea_orm::entity::prelude::*;
+use sea_orm::prelude::async_trait::async_trait;
+use sea_orm::Set;
+
+#[sea_orm::model]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "channel_user")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub channel_id: Uuid,
+    pub user_id: Uuid,
+    pub role: String,
+    pub joined_at: DateTimeUtc,
+    #[sea_orm(
+        belongs_to,
+        from = "channel_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub channel: HasOne<super::channel::Entity>,
+    #[sea_orm(
+        belongs_to,
+        from = "user_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub user: HasOne<super::user::Entity>,
+}
+
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            ..ActiveModelTrait::default()
+        }
+    }
+}

src/models/channel_user_permission.rs

@@ -5,6 +5,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::{NotSet, Set};
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "channel_user_permission")]
 pub struct Model {
@@ -17,39 +18,22 @@ pub struct Model {
 
     /// Bitmask des permissions accordées directement à l'utilisateur dans ce canal.
     pub permission: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id",
+        belongs_to,
+        from = "channel_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Channel,
-
+    pub channel: HasOne<super::channel::Entity>,
     #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id",
+        belongs_to,
+        from = "user_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    User,
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
+    pub user: HasOne<super::user::Entity>,
 }
 
 #[async_trait]

src/models/computed_permission.rs

@@ -20,6 +20,7 @@ pub enum PermissionScopeType {
     Channel,
 }
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "computed_permission")]
 pub struct Model {
@@ -39,24 +40,14 @@ pub struct Model {
     /// Cache des permissions serveur (stocké en i64 pour SQL, utilisé en u64)
     pub server_permissions: i64,
     pub channel_permissions: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id",
+        belongs_to,
+        from = "user_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    User,
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
+    pub user: HasOne<super::user::Entity>,
 }
 
 #[async_trait]

src/models/message.rs

@@ -1,77 +1,60 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
-
-use sea_orm::entity::prelude::*;
-use sea_orm::prelude::async_trait::async_trait;
-use sea_orm::Set;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "message")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: Uuid,
-    pub channel_id: Uuid,
-    pub user_id: Uuid,
-    #[sea_orm(column_type = "Text")]
-    pub content: String,
-    pub created_at: DateTimeUtc,
-    pub updated_at: Option<DateTimeUtc>,
-    pub reply_to_id: Option<Uuid>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::attachment::Entity")]
-    Attachment,
-    #[sea_orm(
-        belongs_to = "super::channel::Entity",
-        from = "Column::ChannelId",
-        to = "super::channel::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    Channel,
-    #[sea_orm(
-        belongs_to = "Entity",
-        from = "Column::ReplyToId",
-        to = "Column::Id",
-        on_update = "NoAction",
-        on_delete = "SetNull"
-    )]
-    SelfRef,
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    User,
-}
-
-impl Related<super::attachment::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Attachment.def()
-    }
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-#[async_trait]
-impl ActiveModelBehavior for ActiveModel {
-    fn new() -> Self {
-        Self {
-            id: Set(Uuid::now_v7()),
-            ..ActiveModelTrait::default()
-        }
-    }
-}
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+
+use sea_orm::entity::prelude::*;
+use sea_orm::prelude::async_trait::async_trait;
+use sea_orm::Set;
+
+#[sea_orm::model]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "message")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub channel_id: Uuid,
+    pub user_id: Uuid,
+    #[sea_orm(column_type = "Text")]
+    pub content: String,
+    pub created_at: DateTimeUtc,
+    pub updated_at: Option<DateTimeUtc>,
+    pub reply_to_id: Option<Uuid>,
+    #[sea_orm(has_many)]
+    pub attachments: HasMany<super::attachment::Entity>,
+    #[sea_orm(
+        belongs_to,
+        from = "channel_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub channel: HasOne<super::channel::Entity>,
+    #[sea_orm(
+        self_ref,
+        relation_enum = "ReplyTo",
+        relation_reverse = "Replies",
+        from = "reply_to_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    pub reply_to: HasOne<Entity>,
+    #[sea_orm(self_ref, relation_enum = "Replies", relation_reverse = "ReplyTo")]
+    pub replies: HasMany<Entity>,
+    #[sea_orm(
+        belongs_to,
+        from = "user_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub user: HasOne<super::user::Entity>,
+}
+
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::now_v7()),
+            ..ActiveModelTrait::default()
+        }
+    }
+}

src/models/role.rs

@@ -4,6 +4,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::Set;
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "role")]
 pub struct Model {
@@ -13,32 +14,16 @@ pub struct Model {
     pub name: String,
     pub is_default: bool,
     pub created_at: DateTimeUtc,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::server::Entity",
-        from = "Column::ServerId",
-        to = "super::server::Column::Id",
+        belongs_to,
+        from = "server_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Server,
-    #[sea_orm(has_many = "super::role_user::Entity")]
-    RoleUser,
-}
-
-impl Related<super::server::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Server.def()
-    }
-}
-
-impl Related<super::role_user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::RoleUser.def()
-    }
+    pub server: HasOne<super::server::Entity>,
+    #[sea_orm(has_many)]
+    pub role_users: HasMany<super::role_user::Entity>,
 }
 
 #[async_trait]

src/models/role_user.rs

@@ -2,6 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "role_user")]
 pub struct Model {
@@ -9,38 +10,22 @@ pub struct Model {
     pub role_id: Uuid,
     #[sea_orm(primary_key, auto_increment = false)]
     pub user_id: Uuid,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::role::Entity",
-        from = "Column::RoleId",
-        to = "super::role::Column::Id",
+        belongs_to,
+        from = "role_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Group,
+    pub role: HasOne<super::role::Entity>,
     #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id",
+        belongs_to,
+        from = "user_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    User,
-}
-
-impl Related<super::role::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Group.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
+    pub user: HasOne<super::user::Entity>,
 }
 
 impl ActiveModelBehavior for ActiveModel {}

src/models/server.rs

@@ -4,6 +4,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::Set;
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "server")]
 pub struct Model {
@@ -15,34 +16,12 @@ pub struct Model {
     pub updated_at: DateTimeUtc,
     pub is_default: bool,
     pub owner_id: Option<Uuid>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::category::Entity")]
-    Category,
-    #[sea_orm(has_many = "super::channel::Entity")]
-    Channel,
-    #[sea_orm(has_many = "super::server_user::Entity")]
-    ServerUser,
-}
-
-impl Related<super::category::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Category.def()
-    }
-}
-
-impl Related<super::channel::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Channel.def()
-    }
-}
-
-impl Related<super::server_user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::ServerUser.def()
-    }
+    #[sea_orm(has_many)]
+    pub categories: HasMany<super::category::Entity>,
+    #[sea_orm(has_many)]
+    pub channels: HasMany<super::channel::Entity>,
+    #[sea_orm(has_many)]
+    pub server_users: HasMany<super::server_user::Entity>,
 }
 
 #[async_trait]

src/models/server_role_permission.rs

@@ -3,6 +3,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::{NotSet, Set};
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "server_group_permission")]
 pub struct Model {
@@ -17,39 +18,22 @@ pub struct Model {
 
     /// Bitmask des permissions accordées directement à l'utilisateur.
     pub permission: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::server::Entity",
-        from = "Column::ServerId",
-        to = "super::server::Column::Id",
+        belongs_to,
+        from = "server_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Server,
-
+    pub server: HasOne<super::server::Entity>,
     #[sea_orm(
-        belongs_to = "super::role::Entity",
-        from = "Column::RoleId",
-        to = "super::role::Column::Id",
+        belongs_to,
+        from = "role_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Role,
-}
-
-impl Related<super::server::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Server.def()
-    }
-}
-
-impl Related<super::role::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Role.def()
-    }
+    pub role: HasOne<super::role::Entity>,
 }
 
 #[async_trait]

src/models/server_user.rs

@@ -1,59 +1,44 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
-
-use sea_orm::entity::prelude::*;
-use sea_orm::prelude::async_trait::async_trait;
-use sea_orm::Set;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "server_user")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: Uuid,
-    pub server_id: Uuid,
-    pub user_id: Uuid,
-    pub username: Option<String>,
-    pub joined_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::server::Entity",
-        from = "Column::ServerId",
-        to = "super::server::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    Server,
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    User,
-}
-
-impl Related<super::server::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Server.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
-}
-
-#[async_trait]
-impl ActiveModelBehavior for ActiveModel {
-    fn new() -> Self {
-        Self {
-            id: Set(Uuid::new_v4()),
-            ..ActiveModelTrait::default()
-        }
-    }
-}
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+
+use sea_orm::entity::prelude::*;
+use sea_orm::prelude::async_trait::async_trait;
+use sea_orm::Set;
+
+#[sea_orm::model]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "server_user")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub server_id: Uuid,
+    pub user_id: Uuid,
+    pub username: Option<String>,
+    pub joined_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+    #[sea_orm(
+        belongs_to,
+        from = "server_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub server: HasOne<super::server::Entity>,
+    #[sea_orm(
+        belongs_to,
+        from = "user_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub user: HasOne<super::user::Entity>,
+}
+
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            ..ActiveModelTrait::default()
+        }
+    }
+}

src/models/server_user_permission.rs

@@ -3,6 +3,7 @@ use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::{NotSet, Set};
 
+#[sea_orm::model]
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "server_user_permission")]
 pub struct Model {
@@ -17,39 +18,22 @@ pub struct Model {
 
     /// Bitmask des permissions accordées directement à l'utilisateur.
     pub permission: i64,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
     #[sea_orm(
-        belongs_to = "super::server::Entity",
-        from = "Column::ServerId",
-        to = "super::server::Column::Id",
+        belongs_to,
+        from = "server_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    Server,
-
+    pub server: HasOne<super::server::Entity>,
     #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::UserId",
-        to = "super::user::Column::Id",
+        belongs_to,
+        from = "user_id",
+        to = "id",
         on_update = "NoAction",
         on_delete = "Cascade"
     )]
-    User,
-}
-
-impl Related<super::server::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Server.def()
-    }
-}
-
-impl Related<super::user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::User.def()
-    }
+    pub user: HasOne<super::user::Entity>,
 }
 
 #[async_trait]

src/models/user.rs

@@ -1,71 +1,51 @@
-//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
-
-use sea_orm::entity::prelude::*;
-use sea_orm::prelude::async_trait::async_trait;
-use sea_orm::Set;
-
-#[derive(Clone, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "user")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: Uuid,
-    pub username: String,
-    pub password: String,
-    #[sea_orm(column_type = "Text", unique, nullable)]
-    pub pub_key: Option<String>,
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
-    pub is_superuser: bool,
-}
-
-impl std::fmt::Debug for Model {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("User")
-            .field("id", &self.id)
-            .field("username", &self.username)
-            .field("password", &"<redacted>")
-            .field("pub_key", &self.pub_key)
-            .field("created_at", &self.created_at)
-            .field("updated_at", &self.updated_at)
-            .field("is_superuser", &self.is_superuser)
-            .finish()
-    }
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(has_many = "super::channel_user::Entity")]
-    ChannelUser,
-    #[sea_orm(has_many = "super::message::Entity")]
-    Message,
-    #[sea_orm(has_many = "super::server_user::Entity")]
-    ServerUser,
-}
-
-impl Related<super::channel_user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::ChannelUser.def()
-    }
-}
-
-impl Related<super::message::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Message.def()
-    }
-}
-
-impl Related<super::server_user::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::ServerUser.def()
-    }
-}
-
-#[async_trait]
-impl ActiveModelBehavior for ActiveModel {
-    fn new() -> Self {
-        Self {
-            id: Set(Uuid::new_v4()),
-            ..ActiveModelTrait::default()
-        }
-    }
-}
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
+
+use sea_orm::entity::prelude::*;
+use sea_orm::prelude::async_trait::async_trait;
+use sea_orm::Set;
+
+#[sea_orm::model]
+#[sea_orm(model_ex_attrs(derive(Debug)))]
+#[derive(Clone, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "user")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub username: String,
+    pub password: String,
+    #[sea_orm(column_type = "Text", unique, nullable)]
+    pub pub_key: Option<String>,
+    pub created_at: DateTimeUtc,
+    pub updated_at: DateTimeUtc,
+    pub is_superuser: bool,
+    #[sea_orm(has_many)]
+    pub channel_users: HasMany<super::channel_user::Entity>,
+    #[sea_orm(has_many)]
+    pub messages: HasMany<super::message::Entity>,
+    #[sea_orm(has_many)]
+    pub server_users: HasMany<super::server_user::Entity>,
+}
+
+impl std::fmt::Debug for Model {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("User")
+            .field("id", &self.id)
+            .field("username", &self.username)
+            .field("password", &"<redacted>")
+            .field("pub_key", &self.pub_key)
+            .field("created_at", &self.created_at)
+            .field("updated_at", &self.updated_at)
+            .field("is_superuser", &self.is_superuser)
+            .finish()
+    }
+}
+
+#[async_trait]
+impl ActiveModelBehavior for ActiveModel {
+    fn new() -> Self {
+        Self {
+            id: Set(Uuid::new_v4()),
+            ..ActiveModelTrait::default()
+        }
+    }
+}