Merge pull request #75 from SSchulze1989/develop

v 0.10.0

src/iRLeagueApiCore.Common/Enums/PenaltyType.cs

@@ -4,4 +4,5 @@ public enum PenaltyType
     Points,
     Position,
     Time,
+    Disqualification,
 }

src/iRLeagueApiCore.Common/Enums/RaceStatus.cs

@@ -25,7 +25,7 @@ namespace iRLeagueApiCore.Common.Enums;
 public enum RaceStatus
 {
     Running,
-    Disconnected,
-    Disqualified,
+    Disconnected = 32,
+    Disqualified = 29,
     Unknown
 }

src/iRLeagueApiCore.Common/Models/Results/CarListModel.cs

@@ -0,0 +1,10 @@
+namespace iRLeagueApiCore.Common.Models.Results;
+
+[DataContract]
+public sealed class CarListModel
+{
+    [DataMember]
+    public bool IsTeamEvent { get; set; }
+    [DataMember]
+    public IEnumerable<EventCarInfoModel> Cars { get; set; } = Array.Empty<EventCarInfoModel>();
+}

src/iRLeagueApiCore.Common/Models/Results/EventCarInfoModel.cs

@@ -0,0 +1,23 @@
+namespace iRLeagueApiCore.Common.Models.Results;
+
+/// <summary>
+/// Contains information about a specific car in an event and it's driver(s) or team
+/// </summary>
+[DataContract]
+public sealed class EventCarInfoModel
+{
+    [DataMember]
+    public string Number { get; set; } = string.Empty;
+    [DataMember] 
+    public string Car { get; set; } = string.Empty;
+    [DataMember]
+    public int CarId { get; set; }
+    [DataMember] 
+    public int ClassId { get;}
+    [DataMember]
+    public string Class { get; set; } = string.Empty;
+    [DataMember]
+    public IEnumerable<MemberInfoModel> Members { get; set; } = Array.Empty<MemberInfoModel>();
+    [DataMember]
+    public TeamInfoModel? Team { get; set; }
+}

src/iRLeagueApiCore.Common/Models/Results/ResultRowModel.cs

@@ -6,6 +6,8 @@
 [DataContract]
 public class ResultRowModel
 {
+    [DataMember]
+    public long ScoredResultRowId { get; set; }
     /// <summary>
     /// First name of the driver
     /// </summary>
@@ -45,7 +47,7 @@ public class ResultRowModel
     /// Car number in the session
     /// </summary>
     [DataMember]
-    public int CarNumber { get; set; }
+    public string CarNumber { get; set; } = string.Empty;
     /// <summary>
     /// Class id in the session (in multiclass sessions)
     /// </summary>
@@ -95,7 +97,7 @@ public class ResultRowModel
     /// Driver status at the end of the race (checkered flag)
     /// </summary>
     [DataMember]
-    public int Status { get; set; }
+    public RaceStatus Status { get; set; }
     /// <summary>
     /// Time set in qualifying (only available with attached qualy)
     /// </summary>

src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs

@@ -18,9 +18,7 @@ public sealed class PenaltyModel : PutPenaltyModel
     [DataMember]
     public string SessionName { get; set; } = string.Empty;
     [DataMember]
-    public long MemberId { get; set; }
+    public MemberInfoModel? Member { get; set; }
     [DataMember]
-    public string Firstname { get; set; } = string.Empty;
-    [DataMember]
-    public string Lastname { get; set; } = string.Empty;
+    public TeamInfoModel? Team { get; set; }
 }

src/iRLeagueApiCore.Common/Models/Reviews/PostReviewModel.cs

@@ -18,6 +18,8 @@ public class PostReviewModel
     [DataMember]
     public ICollection<MemberInfoModel> InvolvedMembers { get; set; } = new List<MemberInfoModel>();
     [DataMember]
+    public ICollection<TeamInfoModel> InvolvedTeams { get; set; } = new List<TeamInfoModel>();
+    [DataMember]
     public string ResultText { get; set; } = string.Empty;
     [DataMember]
     public ICollection<VoteModel> VoteResults { get; set; } = new List<VoteModel>();

src/iRLeagueApiCore.Common/Models/Reviews/VoteModel.cs

@@ -13,4 +13,6 @@ public class VoteModel
     public string Description { get; set; } = string.Empty;
     [DataMember]
     public MemberInfoModel? MemberAtFault { get; set; }
+    [DataMember]
+    public TeamInfoModel? TeamAtFault { get; set; }
 }

src/iRLeagueApiCore.Common/Models/Teams/TeamInfoModel.cs

@@ -0,0 +1,12 @@
+namespace iRLeagueApiCore.Common.Models;
+
+[DataContract]
+public sealed class TeamInfoModel 
+{
+    [DataMember]
+    public long TeamId { get; set; }
+    [DataMember]
+    public string Name { get; set; } = string.Empty;
+    [DataMember]
+    public string TeamColor { get; set; } = string.Empty;
+}

src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj

@@ -18,7 +18,7 @@
 		<OutputType>Library</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
 		<PackageId>iRLeagueApiCore.Common</PackageId>
-		<Version>0.9.3</Version>
+		<Version>0.10.0</Version>
 		<Authors>Simon Schulze</Authors>
 		<Company>Simon Schulze</Company>
 		<ImplicitUsings>enable</ImplicitUsings>