From 9696d53114d6d9c5715747eb8536e11aaa19ec2c Mon Sep 17 00:00:00 2001 From: Egamorf Date: Sun, 20 Apr 2025 18:19:51 +0200 Subject: [PATCH] Use global constants --- .../Constants/GlobalConstants.cs | 9 +++++- .../20250420160158_SeedDefaultUser.cs | 31 +++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/GameIdeas/GameIdeas.Shared/Constants/GlobalConstants.cs b/src/GameIdeas/GameIdeas.Shared/Constants/GlobalConstants.cs index ff8ddf9..464a750 100644 --- a/src/GameIdeas/GameIdeas.Shared/Constants/GlobalConstants.cs +++ b/src/GameIdeas/GameIdeas.Shared/Constants/GlobalConstants.cs @@ -2,6 +2,13 @@ public class GlobalConstants { - public static int NUMBER_PER_PAGE = 50; + public readonly static Guid ADMINISTRATOR_ID = Guid.Parse("{06CA5CB7-6DE5-4A73-9DDD-8E2D5CCDF104}"); + public readonly static Guid ADMINISTRATOR_USER_ID = Guid.Parse("{2AB56FCB-0CDE-4DAE-AC9C-FC7635B0D18A}"); + public readonly static Guid MEMBER_ID = Guid.Parse("{BCE14DEA-1748-4A76-8485-ADEE83DF5EFD}"); + + public readonly static string ADMINISTRATOR = "Administrateur"; + public readonly static string MEMBER = "Membre"; + + public readonly static int NUMBER_PER_PAGE = 50; } \ No newline at end of file diff --git a/src/GameIdeas/Server/GameIdeas.WebAPI/Migrations/20250420160158_SeedDefaultUser.cs b/src/GameIdeas/Server/GameIdeas.WebAPI/Migrations/20250420160158_SeedDefaultUser.cs index cb8c9e1..85a47ed 100644 --- a/src/GameIdeas/Server/GameIdeas.WebAPI/Migrations/20250420160158_SeedDefaultUser.cs +++ b/src/GameIdeas/Server/GameIdeas.WebAPI/Migrations/20250420160158_SeedDefaultUser.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using GameIdeas.Shared.Constants; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable @@ -7,10 +8,6 @@ namespace GameIdeas.WebAPI.Migrations /// public partial class SeedDefaultUser : Migration { - private readonly Guid AdminId = Guid.Parse("{06CA5CB7-6DE5-4A73-9DDD-8E2D5CCDF104}"); - private readonly Guid AdminUserId = Guid.Parse("{2AB56FCB-0CDE-4DAE-AC9C-FC7635B0D18A}"); - private readonly Guid MemberId = Guid.Parse("{BCE14DEA-1748-4A76-8485-ADEE83DF5EFD}"); - /// protected override void Up(MigrationBuilder migrationBuilder) { @@ -20,15 +17,15 @@ namespace GameIdeas.WebAPI.Migrations values: new object[,] { { - AdminId.ToString(), - "Administrateur", - "ADMINISTRATEUR", + GlobalConstants.ADMINISTRATOR_ID.ToString(), + GlobalConstants.ADMINISTRATOR, + GlobalConstants.ADMINISTRATOR.Normalize(), Guid.NewGuid().ToString() }, { - MemberId.ToString(), - "Membre", - "MEMBRE", + GlobalConstants.MEMBER_ID.ToString(), + GlobalConstants.MEMBER, + GlobalConstants.MEMBER.Normalize(), Guid.NewGuid().ToString() } }); @@ -42,7 +39,7 @@ namespace GameIdeas.WebAPI.Migrations ], values: [ - AdminUserId.ToString(), "admin", "ADMIN", + GlobalConstants.ADMINISTRATOR_USER_ID.ToString(), "admin", "ADMIN", false, false, false, "AQAAAAIAAYagAAAAEOGx7MFBLpS7awda0ww6jsfXsnhsUjYd4gDK9DaGvQv0X9UZTuHStr5v5+t4Y1S+xg==", Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), 0, false @@ -51,16 +48,16 @@ namespace GameIdeas.WebAPI.Migrations migrationBuilder.InsertData( table: "AspNetUserRoles", columns: ["UserId", "RoleId"], - values: [AdminUserId.ToString(), AdminId.ToString()]); + values: [GlobalConstants.ADMINISTRATOR_USER_ID.ToString(), GlobalConstants.ADMINISTRATOR_ID.ToString()]); } /// protected override void Down(MigrationBuilder migrationBuilder) { - migrationBuilder.Sql(@$"DELETE FROM ""AspNetUserRoles"" WHERE ""UserId"" = '{AdminUserId.ToString()}' AND ""RoleId"" = '{AdminId.ToString()}'"); - migrationBuilder.DeleteData("AspNetUsers", "Id", AdminUserId.ToString()); - migrationBuilder.DeleteData("AspNetRoles", "Id", AdminId.ToString()); - migrationBuilder.DeleteData("AspNetRoles", "Id", MemberId.ToString()); + migrationBuilder.Sql(@$"DELETE FROM ""AspNetUserRoles"" WHERE ""UserId"" = '{GlobalConstants.ADMINISTRATOR_USER_ID.ToString()}' AND ""RoleId"" = '{GlobalConstants.ADMINISTRATOR_ID.ToString()}'"); + migrationBuilder.DeleteData("AspNetUsers", "Id", GlobalConstants.ADMINISTRATOR_USER_ID.ToString()); + migrationBuilder.DeleteData("AspNetRoles", "Id", GlobalConstants.ADMINISTRATOR_ID.ToString()); + migrationBuilder.DeleteData("AspNetRoles", "Id", GlobalConstants.MEMBER_ID.ToString()); } } }