diff --git a/migration/src/m20220101_000001_create_table.rs b/migration/src/m20220101_000001_create_table.rs index c44ce10..18d5be3 100644 --- a/migration/src/m20220101_000001_create_table.rs +++ b/migration/src/m20220101_000001_create_table.rs @@ -82,7 +82,7 @@ impl MigrationTrait for Migration { .not_null() .default(false), ) - .col(ColumnDef::new(Alias::new("owner_id")).uuid().not_null()) + .col(ColumnDef::new(Alias::new("owner_id")).uuid().null()) .to_owned(), ) .await?; diff --git a/src/models/group.rs b/src/models/group.rs index cb8cf5d..00cb6f0 100644 --- a/src/models/group.rs +++ b/src/models/group.rs @@ -13,11 +13,6 @@ pub struct Model { pub name: String, pub is_default: bool, pub created_at: DateTimeUtc, - - /// 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)] diff --git a/src/models/group_permission.rs b/src/models/group_permission.rs index 25ce074..97f1d0a 100644 --- a/src/models/group_permission.rs +++ b/src/models/group_permission.rs @@ -23,6 +23,7 @@ pub struct Model { pub id: Uuid, pub group_id: Uuid, pub server_id: Uuid, + // L'ID du scope (soit un Uuid d'une Category, soit l'Uuid d'un Channel, soit l'Uuid du Server) pub scope_type: PermissionScopeType, pub scope_id: Uuid, pub server_permissions: i64, diff --git a/src/models/server.rs b/src/models/server.rs index a993205..b5fdacc 100644 --- a/src/models/server.rs +++ b/src/models/server.rs @@ -14,7 +14,7 @@ pub struct Model { pub created_at: DateTimeUtc, pub updated_at: DateTimeUtc, pub is_default: bool, - pub owner_id: Uuid, + pub owner_id: Option, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/src/models/user_permission.rs b/src/models/user_permission.rs index 7e9736e..47cc38f 100644 --- a/src/models/user_permission.rs +++ b/src/models/user_permission.rs @@ -23,6 +23,7 @@ pub struct Model { pub id: Uuid, pub user_id: Uuid, pub server_id: Uuid, + // L'ID du scope (soit un Uuid d'une Category, soit l'Uuid d'un Channel, soit l'Uuid du Server) pub scope_type: PermissionScopeType, pub scope_id: Uuid, pub server_permissions: i64, diff --git a/src/routes/group/dto.rs b/src/routes/group/dto.rs index 1ffc5ab..ad4c81a 100644 --- a/src/routes/group/dto.rs +++ b/src/routes/group/dto.rs @@ -10,9 +10,6 @@ pub struct CreateGroupRequest { pub name: String, #[serde(default)] pub is_default: bool, - pub server_permissions: i64, - pub channel_permissions: i64, - pub voice_permissions: i64, } #[derive(Debug, Serialize, Deserialize, ToSchema)] @@ -20,9 +17,6 @@ pub struct UpdateGroupRequest { #[schema(example = "Modérateurs (MAJ)")] pub name: String, pub is_default: bool, - pub server_permissions: i64, - pub channel_permissions: i64, - pub voice_permissions: i64, } #[derive(Debug, Serialize, Deserialize, ToSchema)] @@ -32,7 +26,4 @@ pub struct GroupResponse { pub name: String, pub is_default: bool, pub created_at: DateTime, - pub server_permissions: i64, - pub channel_permissions: i64, - pub voice_permissions: i64, } diff --git a/src/routes/group/mapper.rs b/src/routes/group/mapper.rs index b2288be..6113250 100644 --- a/src/routes/group/mapper.rs +++ b/src/routes/group/mapper.rs @@ -10,9 +10,6 @@ pub fn group_model_to_group_response(model: group::Model) -> GroupResponse { name: model.name, is_default: model.is_default, created_at: model.created_at, - server_permissions: model.server_permissions, - channel_permissions: model.channel_permissions, - voice_permissions: model.voice_permissions, } } @@ -22,9 +19,6 @@ pub fn create_request_to_am(req: CreateGroupRequest) -> group::ActiveModel { server_id: Set(req.server_id), name: Set(req.name), is_default: Set(req.is_default), - server_permissions: Set(req.server_permissions), - channel_permissions: Set(req.channel_permissions), - voice_permissions: Set(req.voice_permissions), ..Default::default() } } @@ -39,9 +33,6 @@ pub fn update_request_to_am( server_id: Set(server_id), name: Set(req.name), is_default: Set(req.is_default), - server_permissions: Set(req.server_permissions), - channel_permissions: Set(req.channel_permissions), - voice_permissions: Set(req.voice_permissions), ..Default::default() } }