[B] Fix standings not showing countryCode if driver did not participa…

…te in latest race
SSchulze1989 · Jan 15, 2025 · cd8a230 · cd8a230
1 parent 2b9b96a
commit cd8a230
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/src/iRLeagueApiCore.Services/ResultService/Calculation/MemberStandingCalculationService.cs b/src/iRLeagueApiCore.Services/ResultService/Calculation/MemberStandingCalculationService.cs
@@ -74,7 +74,9 @@ public override Task<StandingCalculationResult> Calculate(StandingCalculationDat
                 .OrderBy(GetDropweekOverrideOrderValue);
             var currentResult = currentMemberResult.GetValueOrDefault(memberId);
             var standingRow = new StandingRowCalculationResult();
-            var lastResult = currentResult ?? previousEventResults.FirstOrDefault();
+            var lastResult = currentResult ?? previousEventResults
+                .OrderBy(x => x.EventResult.Date)
+                .LastOrDefault();
             var lastRow = lastResult?.SessionResults.LastOrDefault()?.ResultRow;
             if (lastRow is null)
             {

diff --git a/src/iRLeagueApiCore.Services/ResultService/DataAccess/EventCalculationDataProvider.cs b/src/iRLeagueApiCore.Services/ResultService/DataAccess/EventCalculationDataProvider.cs
@@ -156,6 +156,7 @@ private static bool LapIsValid(TimeSpan lap)
     {
         LeagueId = eventResult.LeagueId,
         EventId = eventResult.EventId,
+        Date = eventResult.Event.Date,
         SessionResults = eventResult.SessionResults
             .OrderBy(sessionResult => sessionResult.Session.SessionNr)
             .Select(sessionResult => new SessionCalculationData()
@@ -229,6 +230,7 @@ private static bool LapIsValid(TimeSpan lap)
     {
         LeagueId = eventResult.LeagueId,
         EventId = eventResult.EventId,
+        Date = eventResult.Event.Date,
         SessionResults = eventResult.ScoredSessionResults
             .OrderBy(sessionResult => sessionResult.SessionNr)
             .Select(sessionResult => new SessionCalculationData()

diff --git a/src/iRLeagueApiCore.Services/ResultService/DataAccess/StandingCalculationDataProvider.cs b/src/iRLeagueApiCore.Services/ResultService/DataAccess/StandingCalculationDataProvider.cs
@@ -90,6 +90,7 @@ private async Task<IEnumerable<EventCalculationResult>> GetPreviousResultsAsync(
     {
         LeagueId = eventResult.LeagueId,
         EventId = eventResult.EventId,
+        Date = eventResult.Event.Date,
         Name = eventResult.Name,
         ResultConfigId = eventResult.ResultConfigId,
         ResultId = eventResult.ResultId,

diff --git a/src/iRLeagueApiCore.Services/ResultService/Models/EventCalculationData.cs b/src/iRLeagueApiCore.Services/ResultService/Models/EventCalculationData.cs
@@ -4,6 +4,7 @@ internal sealed class EventCalculationData
 {
     public long LeagueId { get; set; }
     public long EventId { get; set; }
+    public DateTime? Date { get; set; }
     public IEnumerable<AddPenaltyCalculationData> AddPenalties { get; set; } = Array.Empty<AddPenaltyCalculationData>();
     public IEnumerable<SessionCalculationData> SessionResults { get; set; } = Array.Empty<SessionCalculationData>();
 }
diff --git a/src/iRLeagueApiCore.Services/ResultService/Models/EventCalculationResult.cs b/src/iRLeagueApiCore.Services/ResultService/Models/EventCalculationResult.cs
@@ -8,10 +8,12 @@ public EventCalculationResult(EventCalculationData data)
     {
         LeagueId = data.LeagueId;
         EventId = data.EventId;
+        Date = data.Date;
     }
 
     public long LeagueId { get; set; }
     public long EventId { get; set; }
+    public DateTime? Date { get; set; }
     public long? ResultId { get; set; }
     public long? ChampSeasonId { get; set; }
     public long? ResultConfigId { get; set; }