diff --git a/GameScoreboardAPI.sln b/GameScoreboardAPI.sln index a9b9aed..98dd741 100644 --- a/GameScoreboardAPI.sln +++ b/GameScoreboardAPI.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{7329EAAE-16BE-4A9C-8F8A-AF1913813129}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseModels", "DatabaseModels\DatabaseModels.csproj", "{1F02ACB1-88BD-4A1F-A481-CB8B9714711B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedModels", "SharedModels\SharedModels.csproj", "{1F02ACB1-88BD-4A1F-A481-CB8B9714711B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Server/Migrations/20220715174201_Scoreboard.Designer.cs b/Server/Migrations/20220715174201_Scoreboard.Designer.cs index f1ce26e..1f60d30 100644 --- a/Server/Migrations/20220715174201_Scoreboard.Designer.cs +++ b/Server/Migrations/20220715174201_Scoreboard.Designer.cs @@ -19,7 +19,7 @@ namespace Server.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.6"); - modelBuilder.Entity("DatabaseModels.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.ScoreboardRecord", b => { b.Property("Username") .HasColumnType("TEXT"); diff --git a/Server/Migrations/20220716075243_NullableUsername.Designer.cs b/Server/Migrations/20220716075243_NullableUsername.Designer.cs index b59a626..1be6afa 100644 --- a/Server/Migrations/20220716075243_NullableUsername.Designer.cs +++ b/Server/Migrations/20220716075243_NullableUsername.Designer.cs @@ -19,7 +19,7 @@ namespace Server.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.6"); - modelBuilder.Entity("DatabaseModels.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.ScoreboardRecord", b => { b.Property("Username") .HasColumnType("TEXT"); diff --git a/Server/Migrations/20220716101730_User.Designer.cs b/Server/Migrations/20220716101730_User.Designer.cs index 53ae3e7..9a50bb3 100644 --- a/Server/Migrations/20220716101730_User.Designer.cs +++ b/Server/Migrations/20220716101730_User.Designer.cs @@ -19,7 +19,7 @@ namespace Server.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.6"); - modelBuilder.Entity("DatabaseModels.Plain.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.Plain.ScoreboardRecord", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -41,7 +41,7 @@ namespace Server.Migrations b.ToTable("Scoreboard"); }); - modelBuilder.Entity("DatabaseModels.Plain.User", b => + modelBuilder.Entity("SharedModels.Plain.User", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -64,9 +64,9 @@ namespace Server.Migrations b.ToTable("Users"); }); - modelBuilder.Entity("DatabaseModels.Plain.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.Plain.ScoreboardRecord", b => { - b.HasOne("DatabaseModels.Plain.User", "User") + b.HasOne("SharedModels.Plain.User", "User") .WithMany("ScoreboardRecords") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -75,7 +75,7 @@ namespace Server.Migrations b.Navigation("User"); }); - modelBuilder.Entity("DatabaseModels.Plain.User", b => + modelBuilder.Entity("SharedModels.Plain.User", b => { b.Navigation("ScoreboardRecords"); }); diff --git a/Server/Migrations/20220717101814_AddUserRole.Designer.cs b/Server/Migrations/20220717101814_AddUserRole.Designer.cs index c22698f..3a2e766 100644 --- a/Server/Migrations/20220717101814_AddUserRole.Designer.cs +++ b/Server/Migrations/20220717101814_AddUserRole.Designer.cs @@ -19,7 +19,7 @@ namespace Server.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.6"); - modelBuilder.Entity("DatabaseModels.Plain.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.Plain.ScoreboardRecord", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -41,7 +41,7 @@ namespace Server.Migrations b.ToTable("Scoreboard"); }); - modelBuilder.Entity("DatabaseModels.Plain.User", b => + modelBuilder.Entity("SharedModels.Plain.User", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -68,9 +68,9 @@ namespace Server.Migrations b.ToTable("Users"); }); - modelBuilder.Entity("DatabaseModels.Plain.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.Plain.ScoreboardRecord", b => { - b.HasOne("DatabaseModels.Plain.User", "User") + b.HasOne("SharedModels.Plain.User", "User") .WithMany("ScoreboardRecords") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -79,7 +79,7 @@ namespace Server.Migrations b.Navigation("User"); }); - modelBuilder.Entity("DatabaseModels.Plain.User", b => + modelBuilder.Entity("SharedModels.Plain.User", b => { b.Navigation("ScoreboardRecords"); }); diff --git a/Server/Migrations/ServerDbContextModelSnapshot.cs b/Server/Migrations/ServerDbContextModelSnapshot.cs index b6a23ae..27a5573 100644 --- a/Server/Migrations/ServerDbContextModelSnapshot.cs +++ b/Server/Migrations/ServerDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace Server.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "6.0.6"); - modelBuilder.Entity("DatabaseModels.Plain.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.Plain.ScoreboardRecord", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -39,7 +39,7 @@ namespace Server.Migrations b.ToTable("Scoreboard"); }); - modelBuilder.Entity("DatabaseModels.Plain.User", b => + modelBuilder.Entity("SharedModels.Plain.User", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -66,9 +66,9 @@ namespace Server.Migrations b.ToTable("Users"); }); - modelBuilder.Entity("DatabaseModels.Plain.ScoreboardRecord", b => + modelBuilder.Entity("SharedModels.Plain.ScoreboardRecord", b => { - b.HasOne("DatabaseModels.Plain.User", "User") + b.HasOne("SharedModels.Plain.User", "User") .WithMany("ScoreboardRecords") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade) @@ -77,7 +77,7 @@ namespace Server.Migrations b.Navigation("User"); }); - modelBuilder.Entity("DatabaseModels.Plain.User", b => + modelBuilder.Entity("SharedModels.Plain.User", b => { b.Navigation("ScoreboardRecords"); }); diff --git a/Server/Server.csproj b/Server/Server.csproj index c7c3129..4dcb079 100644 --- a/Server/Server.csproj +++ b/Server/Server.csproj @@ -25,7 +25,7 @@ - + diff --git a/DatabaseModels/DataTransferObjets/ScoreboardRecordDto.cs b/SharedModels/DataTransferObjets/ScoreboardRecordDto.cs similarity index 100% rename from DatabaseModels/DataTransferObjets/ScoreboardRecordDto.cs rename to SharedModels/DataTransferObjets/ScoreboardRecordDto.cs diff --git a/DatabaseModels/DataTransferObjets/UserDto.cs b/SharedModels/DataTransferObjets/UserDto.cs similarity index 100% rename from DatabaseModels/DataTransferObjets/UserDto.cs rename to SharedModels/DataTransferObjets/UserDto.cs diff --git a/DatabaseModels/InitialObjects/ScoreboardRecord.cs b/SharedModels/InitialObjects/ScoreboardRecord.cs similarity index 100% rename from DatabaseModels/InitialObjects/ScoreboardRecord.cs rename to SharedModels/InitialObjects/ScoreboardRecord.cs diff --git a/DatabaseModels/InitialObjects/User.cs b/SharedModels/InitialObjects/User.cs similarity index 100% rename from DatabaseModels/InitialObjects/User.cs rename to SharedModels/InitialObjects/User.cs diff --git a/DatabaseModels/Requests/AuthenticationRequest.cs b/SharedModels/Requests/AuthenticationRequest.cs similarity index 100% rename from DatabaseModels/Requests/AuthenticationRequest.cs rename to SharedModels/Requests/AuthenticationRequest.cs diff --git a/DatabaseModels/Responses/AuthenticationResponse.cs b/SharedModels/Responses/AuthenticationResponse.cs similarity index 100% rename from DatabaseModels/Responses/AuthenticationResponse.cs rename to SharedModels/Responses/AuthenticationResponse.cs diff --git a/DatabaseModels/DatabaseModels.csproj b/SharedModels/SharedModels.csproj similarity index 80% rename from DatabaseModels/DatabaseModels.csproj rename to SharedModels/SharedModels.csproj index eb2460e..b58b14e 100644 --- a/DatabaseModels/DatabaseModels.csproj +++ b/SharedModels/SharedModels.csproj @@ -4,6 +4,7 @@ net6.0 enable enable + DatabaseModels