Merge pull request #180 from SSchulze1989/develop

v 0.10.1
SSchulze1989 · Oct 31, 2023 · 130c543 · 130c543
2 parents 00d71ae + 58f2e27
commit 130c543
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj b/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj
@@ -13,7 +13,7 @@
 		<OutputType>Library</OutputType>
 		<TargetFrameworks>net6.0</TargetFrameworks>
 		<PackageId>iRLeagueApiCore.Client</PackageId>
-		<Version>0.10.0</Version>
+		<Version>0.10.1</Version>
 		<Authors>Simon Schulze</Authors>
 		<Company>Simon Schulze</Company>
 		<PackageDescription>This package contains shared objects for all members of the iRLeagueDatabase-iRLeagueApi stack</PackageDescription>

diff --git a/src/iRLeagueApiCore.Server/Handlers/Results/UploadResultHandler.cs b/src/iRLeagueApiCore.Server/Handlers/Results/UploadResultHandler.cs
@@ -323,7 +323,7 @@ private async Task<ResultRowEntity> ReadResultRowAsync(long leagueId, ParseSimSe
             FastLapNr = data.best_lap_num,
             FinishPosition = data.position + 1,
             Incidents = data.incidents,
-            Interval = ParseInterval(data.interval, data.laps_complete, laps),
+            Interval = ParseInterval(data.class_interval, data.laps_complete, laps),
             IRacingId = data.cust_id.ToString(),
             LeadLaps = data.laps_lead,
             License = sessionData.license_category,

diff --git a/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj b/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj
@@ -72,7 +72,7 @@
 
 	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<Version>0.10.0</Version>
+		<Version>0.10.1</Version>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 

diff --git a/src/iRLeagueApiCore.Services/ResultService/Calculation/CalculationServiceBase.cs b/src/iRLeagueApiCore.Services/ResultService/Calculation/CalculationServiceBase.cs
@@ -16,6 +16,7 @@ protected static IEnumerable<ResultRowCalculationResult> ApplyPoints(IEnumerable
         rows = pointRule.GetChampSeasonFilters().FilterRows(rows);
         rows = pointRule.GetResultFilters().FilterRows(rows);
         rows = CalculateCompletedPct(rows);
+        rows = CalculateIntervals(rows);
         rows = CalculateAutoPenalties(rows, pointRule.GetAutoPenalties());
         ApplyAddPenaltyDsq(rows);
         ApplyAddPenaltyTimes(rows);
@@ -445,4 +446,17 @@ protected static IEnumerable<ResultRowCalculationResult> CalculateCompletedPct(I
 
         return rows;
     }
+
+    private static IEnumerable<ResultRowCalculationResult> CalculateIntervals(IEnumerable<ResultRowCalculationResult> rows)
+    {
+        int totalLaps = (int)rows.Max(x => x.CompletedLaps);
+        foreach (var row in rows)
+        {
+            if (row.Interval.Days > 0)
+            {
+                row.Interval = TimeSpan.FromDays(totalLaps - row.CompletedLaps);
+            }
+        }
+        return rows;
+    }
 }
diff --git a/...gueApiCore.Services.Tests/ResultService/Calculation/TeamSessionCalculationServiceTests.cs b/...gueApiCore.Services.Tests/ResultService/Calculation/TeamSessionCalculationServiceTests.cs
@@ -204,7 +204,7 @@ public async Task Calculate_ShouldApplyTeamPenalties(PenaltyType penaltyType)
                 break;
             case PenaltyType.Time:
                 var interval = TimeSpan.FromSeconds(testTeamRows.Sum(x => x.Interval.TotalSeconds));
-                testRow.Interval.Should().Be(interval + penalty.Time);
+                testRow.Interval.Should().BeCloseTo(interval + penalty.Time, TimeSpan.FromSeconds(0.001));
                 break;
             case PenaltyType.Position:
                 var position = test.ResultRows.OrderBy(x => x.TeamId).ToList().IndexOf(testRow) + 1;

diff --git a/test/iRLeagueApiCore.UnitTests/Server/Handlers/Results/UploadResultHandlerTests.cs b/test/iRLeagueApiCore.UnitTests/Server/Handlers/Results/UploadResultHandlerTests.cs
@@ -351,7 +351,7 @@ public async Task Handle_ShouldFillResultRowData()
             testRow.FastLapNr.Should().Be(resultRow.best_lap_num);
             testRow.FinishPosition.Should().Be(resultRow.position+1);
             testRow.Incidents.Should().Be(resultRow.incidents);
-            testRow.Interval.Should().Be(TimeSpan.FromSeconds(resultRow.interval / 10000D));
+            testRow.Interval.Should().Be(TimeSpan.FromSeconds(resultRow.class_interval / 10000D));
             testRow.IRacingId.Should().Be(resultRow.cust_id.ToString());
             testRow.LeadLaps.Should().Be(resultRow.laps_lead);
             testRow.Member.IRacingId.Should().Be(resultRow.cust_id.ToString());
@@ -386,7 +386,7 @@ public async Task Handle_ShouldGetIntervalLaps_WhenIntervalIsNegative()
         result.session_results[0].results.First().laps_complete = maxLaps;
         var lapsDown = 3;
         var setupRow = result.session_results[0].results.Last();
-        setupRow.interval = -1;
+        setupRow.class_interval = -1;
         setupRow.laps_complete = maxLaps - lapsDown;
         var request = CreateRequest(@event.EventId, result);
         var sut = CreateSut();
@@ -436,7 +436,7 @@ public async Task Handle_ShouldFillResultRowData_FromTeamResults()
             testRow.FastLapNr.Should().Be(resultRow.best_lap_num);
             testRow.FinishPosition.Should().Be(resultRow.position + 1);
             testRow.Incidents.Should().Be(resultRow.incidents);
-            testRow.Interval.Should().Be(TimeSpan.FromSeconds(resultRow.interval / 10000D));
+            testRow.Interval.Should().Be(TimeSpan.FromSeconds(resultRow.class_interval / 10000D));
             testRow.IRacingId.Should().Be(resultRow.cust_id.ToString());
             testRow.LeadLaps.Should().Be(resultRow.laps_lead);
             testRow.Member.IRacingId.Should().Be(resultRow.cust_id.ToString());