init

src/models/channel.rs

@@ -32,8 +32,6 @@ pub struct Model {
     pub name: Option<String>,
     pub created_at: DateTimeUtc,
     pub updated_at: DateTimeUtc,
-    pub default_channel_permissions: Option<i64>,
-    pub default_voice_permissions: Option<i64>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

src/models/channel_user.rs

@@ -12,7 +12,6 @@ pub struct Model {
     pub channel_id: Uuid,
     pub user_id: Uuid,
     pub role: String,
-    pub permissions: u64,
     pub joined_at: DateTimeUtc,
 }
 

src/models/computed_permission.rs

@@ -0,0 +1,38 @@
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "computed_permission")]
+pub struct Model {
+    /// L'utilisateur à qui appartiennent ces permissions
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub user_id: Uuid,
+
+    /// L'ID de la ressource (soit un Uuid de Channel, soit l'Uuid du Server)
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub resource_id: Uuid,
+
+    /// Cache des permissions serveur (stocké en i64 pour SQL, utilisé en u64)
+    pub server_permissions: i64,
+    pub channel_permissions: i64,
+    pub voice_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",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}

src/models/group_member.rs

@@ -1,6 +1,21 @@
 //! `SeaORM` Entity.
 
 use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize, ToSchema,
+)]
+#[sea_orm(rs_type = "i32", db_type = "Integer")]
+pub enum PermissionScopeType {
+    #[sea_orm(num_value = 0)]
+    Server,
+    #[sea_orm(num_value = 1)]
+    Category,
+    #[sea_orm(num_value = 2)]
+    Channel,
+}
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "group_member")]
@@ -9,6 +24,8 @@ pub struct Model {
     pub group_id: Uuid,
     #[sea_orm(primary_key, auto_increment = false)]
     pub user_id: Uuid,
+    pub scope_type: PermissionScopeType,
+    pub scope_id: Uuid,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

src/models/mod.rs

@@ -6,9 +6,11 @@ pub mod attachment;
 pub mod category;
 pub mod channel;
 pub mod channel_user;
+mod computed_permission;
 pub mod group;
 pub mod group_member;
 pub mod message;
 pub mod server;
 pub mod server_user;
 pub mod user;
+mod user_permission;

src/models/server.rs

@@ -1,6 +1,5 @@
 //! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.19
 
-use crate::permissions::{ChannelPermission, PermissionSet, ServerPermission, VoicePermission};
 use sea_orm::entity::prelude::*;
 use sea_orm::prelude::async_trait::async_trait;
 use sea_orm::Set;
@@ -15,11 +14,7 @@ pub struct Model {
     pub created_at: DateTimeUtc,
     pub updated_at: DateTimeUtc,
     pub is_default: bool,
-
-    /// Permissions serveur par défaut (stockées en i64, lues en u64)
-    pub default_server_permissions: i64,
-    pub default_channel_permissions: i64,
-    pub default_voice_permissions: i64,
+    pub owned_id: Uuid,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -53,24 +48,10 @@ impl Related<super::server_user::Entity> for Entity {
 #[async_trait]
 impl ActiveModelBehavior for ActiveModel {
     fn new() -> Self {
-        let default_perm = PermissionSet::DEFAULT;
         Self {
             id: Set(Uuid::new_v4()),
             is_default: Set(false),
-            default_server_permissions: Set(default_perm.server.bits() as i64),
-            default_channel_permissions: Set(default_perm.channel.bits() as i64),
-            default_voice_permissions: Set(default_perm.voice.bits() as i64),
             ..ActiveModelTrait::default()
         }
     }
 }
-
-impl Model {
-    pub fn default_permissions(&self) -> PermissionSet {
-        PermissionSet {
-            server: ServerPermission::from_bits_truncate(self.default_server_permissions as u64),
-            channel: ChannelPermission::from_bits_truncate(self.default_channel_permissions as u64),
-            voice: VoicePermission::from_bits_truncate(self.default_voice_permissions as u64),
-        }
-    }
-}

src/models/server_user.rs

@@ -14,13 +14,6 @@ pub struct Model {
     pub username: Option<String>,
     pub joined_at: DateTimeUtc,
     pub updated_at: DateTimeUtc,
-    pub is_admin: bool,
-    pub is_owner: bool,
-
-    /// Permissions serveur par défaut (stockées en i64, lues en u64)
-    pub server_permissions: i64,
-    pub channel_permissions: i64,
-    pub voice_permissions: i64,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

src/models/user_permission.rs

@@ -0,0 +1,51 @@
+use super::group_member::PermissionScopeType;
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "user_permission")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: Uuid,
+    pub user_id: Uuid,
+    pub server_id: Uuid,
+    pub scope_type: PermissionScopeType,
+    pub scope_id: Uuid,
+    pub server_permissions: i64,
+    pub channel_permissions: i64,
+    pub voice_permissions: i64,
+    pub created_at: DateTimeUtc,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(
+        belongs_to = "super::server::Entity",
+        from = "Column::ServerId",
+        to = "super::server::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Server,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::server::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Server.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}