Merge branch 'master' into 260-commands-to-set-points

EvoEsports · Aug 10, 2024 · 8facc4a · 8facc4a
2 parents f36d4bf + 84bcdd0
commit 8facc4a
Show file tree

Hide file tree

Showing 37 changed files with 405 additions and 142 deletions.
diff --git a/src/EvoSC.Common/Database/Migrations/202210100826_AddPlayersTable.cs b/src/EvoSC.Common/Database/Migrations/202210100826_AddPlayersTable.cs
@@ -1,4 +1,5 @@
-using EvoSC.Common.Util;
+using EvoSC.Common.Database.Models.Player;
+using EvoSC.Common.Util;
 using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
@@ -9,7 +10,7 @@ public class AddPlayersTable : Migration
 {
     public override void Up()
     {
-        Create.Table("Players")
+        Create.Table(DbPlayer.TableName)
             .WithColumn("Id").AsInt32().PrimaryKey().Identity()
             .WithColumn("AccountId").AsString().Unique()
             .WithColumn("UbisoftName").AsString().Indexed()

diff --git a/src/EvoSC.Common/Database/Migrations/202210270837_AddConfigOptionsTable.cs b/src/EvoSC.Common/Database/Migrations/202210270837_AddConfigOptionsTable.cs
@@ -1,22 +1,21 @@
-using FluentMigrator;
+using EvoSC.Common.Database.Models.Config;
+using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
 
 [Tags("Production")]
 [Migration(1666859869)]
 public class AddConfigOptionsTable : Migration
 {
-    public const string ConfigOptions = "ConfigOptions";
-
     public override void Up()
     {
-        Create.Table(ConfigOptions)
+        Create.Table(DbConfigOption.TableName)
             .WithColumn("Key").AsString().PrimaryKey()
             .WithColumn("Value").AsString();
     }
 
     public override void Down()
     {
-        Delete.Table("ConfigOptions");
+        Delete.Table(DbConfigOption.TableName);
     }
 }
diff --git a/src/EvoSC.Common/Database/Migrations/202211131231_AddMapsTable.cs b/src/EvoSC.Common/Database/Migrations/202211131231_AddMapsTable.cs
@@ -1,4 +1,5 @@
-using FluentMigrator;
+using EvoSC.Common.Database.Models.Maps;
+using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
 
@@ -8,7 +9,7 @@ public class AddMapsTable : Migration
 {
     public override void Up()
     {
-        Create.Table("Maps")
+        Create.Table(DbMap.TableName)
             .WithColumn("Id").AsInt32().PrimaryKey().Identity()
             .WithColumn("Uid").AsString().Unique()
             .WithColumn("AuthorId").AsInt32()
@@ -28,6 +29,6 @@ public override void Up()
 
     public override void Down()
     {
-        Delete.Table("Maps");
+        Delete.Table(DbMap.TableName);
     }
 }
diff --git a/src/EvoSC.Common/Database/Migrations/202211150709_AddUserPermissionTables.cs b/src/EvoSC.Common/Database/Migrations/202211150709_AddUserPermissionTables.cs
@@ -1,4 +1,5 @@
-using FluentMigrator;
+using EvoSC.Common.Database.Models.Permissions;
+using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
 
@@ -8,34 +9,34 @@ public class AddUserPermissionTables : Migration
 {
     public override void Up()
     {
-        Create.Table("Groups")
+        Create.Table(DbGroup.TableName)
             .WithColumn("Id").AsInt32().PrimaryKey().Identity()
             .WithColumn("Title").AsString()
             .WithColumn("Description").AsString()
             .WithColumn("Icon").AsString().Nullable()
             .WithColumn("Color").AsString().Nullable()
             .WithColumn("Unrestricted").AsBoolean();
 
-        Create.Table("Permissions")
+        Create.Table(DbPermission.TableName)
             .WithColumn("Id").AsInt32().PrimaryKey().Identity()
             .WithColumn("Name").AsString().Unique()
             .WithColumn("Description").AsString();
 
-        Create.Table("GroupPermissions")
+        Create.Table(DbGroupPermission.TableName)
             .WithColumn("GroupId").AsInt32().Indexed()
             .WithColumn("PermissionId").AsInt32().Indexed();
 
-        Create.Table("UserGroups")
+        Create.Table(DbUserGroup.TableName)
             .WithColumn("UserId").AsInt64().Indexed()
             .WithColumn("GroupId").AsInt32().Indexed()
             .WithColumn("Display").AsBoolean();
     }
 
     public override void Down()
     {
-        Delete.Table("Groups");
-        Delete.Table("Permissions");
-        Delete.Table("GroupPermissions");
-        Delete.Table("UserGroups");
+        Delete.Table(DbGroup.TableName);
+        Delete.Table(DbPermission.TableName);
+        Delete.Table(DbGroupPermission.TableName);
+        Delete.Table(DbUserGroup.TableName);
     }
 }
diff --git a/src/EvoSC.Common/Database/Migrations/202302081052_AddAuditLogTable.cs b/src/EvoSC.Common/Database/Migrations/202302081052_AddAuditLogTable.cs
@@ -1,16 +1,15 @@
-using FluentMigrator;
+using EvoSC.Common.Database.Models.AuditLog;
+using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
 
 [Tags("Production")]
 [Migration(1675849925)]
 public class AddAuditLogTable : Migration
 {
-    public const string AuditLog = "AuditLog";
-
     public override void Up()
     {
-        Create.Table(AuditLog)
+        Create.Table(DbAuditRecord.TableName)
             .WithColumn("Id").AsInt64().PrimaryKey().Identity()
             .WithColumn("Status").AsInt16()
             .WithColumn("EventName").AsString().Indexed()
@@ -22,6 +21,6 @@ public override void Up()
 
     public override void Down()
     {
-        Delete.Table(AuditLog);
+        Delete.Table(DbAuditRecord.TableName);
     }
 }
diff --git a/src/EvoSC.Common/Database/Migrations/202306201107_AddPlayerSettingsTable.cs b/src/EvoSC.Common/Database/Migrations/202306201107_AddPlayerSettingsTable.cs
@@ -1,22 +1,21 @@
-using FluentMigrator;
+using EvoSC.Common.Database.Models.Player;
+using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
 
 [Tags("Production")]
 [Migration(1687252035)]
 public class AddPlayerSettingsTable : Migration
 {
-    public const string PlayerSettings = "PlayerSettings";
-
     public override void Up()
     {
-        Create.Table(PlayerSettings)
+        Create.Table(DbPlayerSettings.TableName)
             .WithColumn("PlayerId").AsInt64().Unique()
             .WithColumn("DisplayLanguage").AsString().WithDefaultValue("en");
     }
 
     public override void Down()
     {
-        Delete.Table(PlayerSettings);
+        Delete.Table(DbPlayerSettings.TableName);
     }
 }
diff --git a/src/EvoSC.Common/Database/Migrations/202307170829_UpdateAuditLogTableDataTypes.cs b/src/EvoSC.Common/Database/Migrations/202307170829_UpdateAuditLogTableDataTypes.cs
@@ -1,4 +1,5 @@
-using FluentMigrator;
+using EvoSC.Common.Database.Models.AuditLog;
+using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
 
@@ -8,10 +9,10 @@ public class UpdateAuditLogTableDataTypes : Migration
 {
     public override void Up()
     {
-        Alter.Column("Properties").OnTable(AddAuditLogTable.AuditLog)
+        Alter.Column("Properties").OnTable(DbAuditRecord.TableName)
             .AsCustom("TEXT");
 
-        Alter.Column("Comment").OnTable(AddAuditLogTable.AuditLog)
+        Alter.Column("Comment").OnTable(DbAuditRecord.TableName)
             .AsCustom("TEXT");
     }
 

diff --git a/src/EvoSC.Common/Database/Migrations/202309070952_UpdateConfigOptionsTable.cs b/src/EvoSC.Common/Database/Migrations/202309070952_UpdateConfigOptionsTable.cs
@@ -1,4 +1,5 @@
-using FluentMigrator;
+using EvoSC.Common.Database.Models.Config;
+using FluentMigrator;
 
 namespace EvoSC.Common.Database.Migrations;
 
@@ -8,7 +9,7 @@ public class UpdateConfigOptionsTable : Migration
 {
     public override void Up()
     {
-        Alter.Column("Value").OnTable(AddConfigOptionsTable.ConfigOptions)
+        Alter.Column("Value").OnTable(DbConfigOption.TableName)
             .AsCustom("TEXT");
     }
 

diff --git a/src/EvoSC.Common/Database/Migrations/202408031312_AddDefaultUserGroups.cs b/src/EvoSC.Common/Database/Migrations/202408031312_AddDefaultUserGroups.cs
@@ -0,0 +1,38 @@
+using EvoSC.Common.Database.Models.Permissions;
+using FluentMigrator;
+
+namespace EvoSC.Common.Database.Migrations;
+
+[Tags("Production")]
+[Migration(1722683568)]
+public class AddDefaultUserGroups : Migration
+{
+    public override void Up()
+    {
+        Insert.IntoTable(DbGroup.TableName)
+            .Row(new
+            {
+                Id = 1,
+                Title = "Super Admin",
+                Description = "Super admin group with unrestricted permissions.",
+                Icon = "",
+                Color = "F00",
+                Unrestricted = true
+            });
+
+        Insert.IntoTable(DbGroup.TableName)
+            .Row(new
+            {
+                Id = 2,
+                Title = "Player",
+                Description = "Default group for players.",
+                Icon = "",
+                Color = "FFF",
+                Unrestricted = false
+            });
+    }
+
+    public override void Down()
+    {
+    }
+}
diff --git a/src/EvoSC.Common/Database/Models/AuditLog/DbAuditRecord.cs b/src/EvoSC.Common/Database/Models/AuditLog/DbAuditRecord.cs
@@ -6,9 +6,11 @@
 
 namespace EvoSC.Common.Database.Models.AuditLog;
 
-[Table(AddAuditLogTable.AuditLog)]
+[Table(TableName)]
 public class DbAuditRecord : IAuditRecord
 {
+    public const string TableName = "AuditLog";
+
     [PrimaryKey, Identity]
     public long Id { get; set; }
 

diff --git a/src/EvoSC.Common/Database/Models/Config/DbConfigOptions.cs b/src/EvoSC.Common/Database/Models/Config/DbConfigOptions.cs
@@ -2,9 +2,11 @@
 
 namespace EvoSC.Common.Database.Models.Config;
 
-[Table("ConfigOptions")]
+[Table(TableName)]
 public class DbConfigOption
 {
+    public const string TableName = "ConfigOptions";
+
     [PrimaryKey]
     public string Key { get; set; }
 

diff --git a/src/EvoSC.Common/Database/Models/Maps/DbMap.cs b/src/EvoSC.Common/Database/Models/Maps/DbMap.cs
@@ -5,9 +5,11 @@
 
 namespace EvoSC.Common.Database.Models.Maps;
 
-[Table("Maps")]
+[Table(TableName)]
 public class DbMap : IMap
 {
+    public const string TableName = "Maps";
+
     [PrimaryKey, Identity]
     public long Id { get; set; }
 

diff --git a/src/EvoSC.Common/Database/Models/Permissions/DbGroup.cs b/src/EvoSC.Common/Database/Models/Permissions/DbGroup.cs
@@ -3,9 +3,11 @@
 
 namespace EvoSC.Common.Database.Models.Permissions;
 
-[Table("Groups")]
+[Table(TableName)]
 public class DbGroup : IGroup
 {
+    public const string TableName = "Groups";
+
     [PrimaryKey, Identity]
     public int Id { get; set; }
 

diff --git a/src/EvoSC.Common/Database/Models/Permissions/DbGroupPermission.cs b/src/EvoSC.Common/Database/Models/Permissions/DbGroupPermission.cs
@@ -3,9 +3,11 @@
 
 namespace EvoSC.Common.Database.Models.Permissions;
 
-[Table("GroupPermissions")]
+[Table(TableName)]
 public class DbGroupPermission
 {
+    public const string TableName = "GroupPermissions";
+
     [Column]
     public int GroupId { get; set; }
 

diff --git a/src/EvoSC.Common/Database/Models/Permissions/DbPermission.cs b/src/EvoSC.Common/Database/Models/Permissions/DbPermission.cs
@@ -3,9 +3,11 @@
 
 namespace EvoSC.Common.Database.Models.Permissions;
 
-[Table("Permissions")]
+[Table(TableName)]
 public class DbPermission : IPermission
 {
+    public const string TableName = "Permissions";
+
     [PrimaryKey, Identity]
     public int Id { get; set; }
 

diff --git a/src/EvoSC.Common/Database/Models/Permissions/DbUserGroup.cs b/src/EvoSC.Common/Database/Models/Permissions/DbUserGroup.cs
@@ -3,9 +3,11 @@
 
 namespace EvoSC.Common.Database.Models.Permissions;
 
-[Table("UserGroups")]
+[Table(TableName)]
 public class DbUserGroup
 {
+    public const string TableName = "UserGroups";
+
     [Column]
     public long UserId { get; set; }
 

diff --git a/src/EvoSC.Common/Database/Models/Player/DbPlayer.cs b/src/EvoSC.Common/Database/Models/Player/DbPlayer.cs
@@ -3,9 +3,11 @@
 
 namespace EvoSC.Common.Database.Models.Player;
 
-[Table("Players")]
+[Table(TableName)]
 public class DbPlayer : IPlayer
 {
+    public const string TableName = "Players";
+
     /// <summary>
     /// Database ID of the player.
     /// </summary>

diff --git a/src/EvoSC.Common/Database/Models/Player/DbPlayerSettings.cs b/src/EvoSC.Common/Database/Models/Player/DbPlayerSettings.cs
@@ -3,9 +3,11 @@
 
 namespace EvoSC.Common.Database.Models.Player;
 
-[Table("PlayerSettings")]
+[Table(TableName)]
 public class DbPlayerSettings : IPlayerSettings
 {
+    public const string TableName = "PlayerSettings";
+
     [Column]
     public long PlayerId { get; set; }