This commit is contained in:
2026-07-12 11:53:01 +02:00
parent 2965ef8a5a
commit 1979db2da3
7 changed files with 4 additions and 25 deletions
@@ -82,7 +82,7 @@ impl MigrationTrait for Migration {
.not_null() .not_null()
.default(false), .default(false),
) )
.col(ColumnDef::new(Alias::new("owner_id")).uuid().not_null()) .col(ColumnDef::new(Alias::new("owner_id")).uuid().null())
.to_owned(), .to_owned(),
) )
.await?; .await?;
-5
View File
@@ -13,11 +13,6 @@ pub struct Model {
pub name: String, pub name: String,
pub is_default: bool, pub is_default: bool,
pub created_at: DateTimeUtc, 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)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+1
View File
@@ -23,6 +23,7 @@ pub struct Model {
pub id: Uuid, pub id: Uuid,
pub group_id: Uuid, pub group_id: Uuid,
pub server_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_type: PermissionScopeType,
pub scope_id: Uuid, pub scope_id: Uuid,
pub server_permissions: i64, pub server_permissions: i64,
+1 -1
View File
@@ -14,7 +14,7 @@ pub struct Model {
pub created_at: DateTimeUtc, pub created_at: DateTimeUtc,
pub updated_at: DateTimeUtc, pub updated_at: DateTimeUtc,
pub is_default: bool, pub is_default: bool,
pub owner_id: Uuid, pub owner_id: Option<Uuid>,
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+1
View File
@@ -23,6 +23,7 @@ pub struct Model {
pub id: Uuid, pub id: Uuid,
pub user_id: Uuid, pub user_id: Uuid,
pub server_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_type: PermissionScopeType,
pub scope_id: Uuid, pub scope_id: Uuid,
pub server_permissions: i64, pub server_permissions: i64,
-9
View File
@@ -10,9 +10,6 @@ pub struct CreateGroupRequest {
pub name: String, pub name: String,
#[serde(default)] #[serde(default)]
pub is_default: bool, pub is_default: bool,
pub server_permissions: i64,
pub channel_permissions: i64,
pub voice_permissions: i64,
} }
#[derive(Debug, Serialize, Deserialize, ToSchema)] #[derive(Debug, Serialize, Deserialize, ToSchema)]
@@ -20,9 +17,6 @@ pub struct UpdateGroupRequest {
#[schema(example = "Modérateurs (MAJ)")] #[schema(example = "Modérateurs (MAJ)")]
pub name: String, pub name: String,
pub is_default: bool, pub is_default: bool,
pub server_permissions: i64,
pub channel_permissions: i64,
pub voice_permissions: i64,
} }
#[derive(Debug, Serialize, Deserialize, ToSchema)] #[derive(Debug, Serialize, Deserialize, ToSchema)]
@@ -32,7 +26,4 @@ pub struct GroupResponse {
pub name: String, pub name: String,
pub is_default: bool, pub is_default: bool,
pub created_at: DateTime<Utc>, pub created_at: DateTime<Utc>,
pub server_permissions: i64,
pub channel_permissions: i64,
pub voice_permissions: i64,
} }
-9
View File
@@ -10,9 +10,6 @@ pub fn group_model_to_group_response(model: group::Model) -> GroupResponse {
name: model.name, name: model.name,
is_default: model.is_default, is_default: model.is_default,
created_at: model.created_at, 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), server_id: Set(req.server_id),
name: Set(req.name), name: Set(req.name),
is_default: Set(req.is_default), 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() ..Default::default()
} }
} }
@@ -39,9 +33,6 @@ pub fn update_request_to_am(
server_id: Set(server_id), server_id: Set(server_id),
name: Set(req.name), name: Set(req.name),
is_default: Set(req.is_default), 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() ..Default::default()
} }
} }