Merge pull request #88 from SSchulze1989/develop

v 0.10.0
SSchulze1989 · Oct 29, 2023 · 0d61c58 · 0d61c58
2 parents e21dedd + 4489687
commit 0d61c58
Show file tree

Hide file tree

Showing 18 changed files with 8,246 additions and 9 deletions.
diff --git a/src/DatabaseBenchmarks/DatabaseBenchmarks.csproj b/src/DatabaseBenchmarks/DatabaseBenchmarks.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
-	<PackageReference Include="iRLeagueApiCore.Common" Version="0.9.3" />
+	<PackageReference Include="iRLeagueApiCore.Common" Version="0.10.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.7" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />

diff --git a/src/DatabaseBenchmarks/Program.cs b/src/DatabaseBenchmarks/Program.cs
@@ -1,4 +1,5 @@
 using BenchmarkDotNet.Attributes;
+using iRLeagueApiCore.Common.Enums;
 using iRLeagueApiCore.Common.Models;
 using iRLeagueDatabaseCore.Models;
 using Microsoft.EntityFrameworkCore;
@@ -213,7 +214,7 @@ public async Task<EventResultModel> SingleEventQuery()
                 PositionChange = row.PositionChange,
                 QualifyingTime = row.QualifyingTime,
                 SeasonStartIrating = row.SeasonStartIRating,
-                Status = row.Status,
+                Status = (RaceStatus)row.Status,
                 TeamId = row.TeamId
             }),
             CreatedOn = sessionResult.CreatedOn,

diff --git a/src/iRLeagueDatabaseCore/LeagueDbContext.cs b/src/iRLeagueDatabaseCore/LeagueDbContext.cs
@@ -95,6 +95,8 @@ private void ConfigureMultiTenancy(ModelBuilder builder)
             .HasQueryFilter(mt => mt.LeagueId == LeagueProvider.LeagueId);
         builder.Entity<IncidentReviewEntity>()
             .HasQueryFilter(mt => mt.LeagueId == LeagueProvider.LeagueId);
+        builder.Entity<IncidentReviewsInvolvedTeams>()
+            .HasQueryFilter(mt => mt.LeagueId == LeagueProvider.LeagueId);
         builder.Entity<LeagueMemberEntity>()
             .HasQueryFilter(mt => mt.LeagueId == LeagueProvider.LeagueId);
         builder.Entity<PointRuleEntity>()

diff --git a/src/iRLeagueDatabaseCore/MigrationCarNumberAsString.sql b/src/iRLeagueDatabaseCore/MigrationCarNumberAsString.sql
@@ -0,0 +1,42 @@
+USE LeagueDatabase;
+
+START TRANSACTION;
+
+-- pre migration
+-- safe the CarNumber values as ints
+
+CREATE TEMPORARY TABLE TmpResultRowsNumbers (
+	ResultRowId BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	CarNumber INT NOT NULL
+);
+
+INSERT INTO TmpResultRowsNumbers (ResultRowId, CarNumber)
+	SELECT ResultRowId, CarNumber
+	FROM ResultRows;
+
+CREATE TEMPORARY TABLE TmpScoredResultRowsNumbers (
+	ScoredResultRowId BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	CarNumber INT NOT NULL
+);
+
+INSERT INTO	TmpScoredResultRowsNumbers (ScoredResultRowId, CarNumber)
+	SELECT ScoredResultRowId, CarNumber
+	FROM ScoredResultRows;
+
+-- post migration
+-- restore CarNumber values as string
+
+UPDATE ResultRows `rows` 
+	JOIN TmpResultRowsNumbers `numbers` 
+		ON `numbers`.ResultRowId=`rows`.ResultRowId
+	SET `rows`.CarNumber = `numbers`.CarNumber;
+
+UPDATE ScoredResultRows `rows` 
+	JOIN TmpScoredResultRowsNumbers `numbers` 
+		ON `numbers`.ScoredResultRowId=`rows`.ScoredResultRowId
+	SET `rows`.CarNumber = `numbers`.CarNumber;
+
+DROP TABLE TmpResultRowsNumbers;
+DROP TABLE TmpScoredResultRowsNumbers;
+
+ROLLBACK;