Merge pull request #66 from SSchulze1989/develop

v 0.9.0

src/iRLeagueApiCore.Common/Enums/BonusPointType.cs

@@ -0,0 +1,14 @@
+public enum BonusPointType 
+{
+    Position,
+    QualyPosition,
+    FastestLap,
+    FastestAverageLap,
+    CleanestDriver,
+    NoIncidents,
+    MostPositionsGained,
+    MostPositionsLost,
+    LeadOneLap,
+    LeadMostLaps,
+    Custom = 999,
+}

src/iRLeagueApiCore.Common/Models/Championships/PutChampSeasonModel.cs

@@ -13,4 +13,6 @@ public class PutChampSeasonModel : PostChampSeasonModel
     public ICollection<ResultConfigInfoModel> ResultConfigs { get; set; } = new List<ResultConfigInfoModel>();
     [DataMember]
     public ResultConfigInfoModel? DefaultResultConfig { get; set; }
+    [DataMember]
+    public ICollection<ResultFilterModel> Filters { get; set; } = new List<ResultFilterModel>();
 }

src/iRLeagueApiCore.Common/Models/ResultConfigurations/BonusPointModel.cs

@@ -0,0 +1,14 @@
+namespace iRLeagueApiCore.Common.Models;
+
+[DataContract]
+public class BonusPointModel
+{
+    [DataMember]
+    public BonusPointType Type { get; set; }
+    [DataMember]
+    public double Value { get; set; }
+    [DataMember]
+    public double Points { get; set; }
+    [DataMember]
+    public ICollection<FilterConditionModel> Conditions { get; set; } = new List<FilterConditionModel>();
+}

src/iRLeagueApiCore.Common/Models/ResultConfigurations/PostPointRuleModel.cs

@@ -8,7 +8,7 @@ public class PostPointRuleModel
     [DataMember]
     public IList<int> PointsPerPlace { get; set; } = new List<int>();
     [DataMember]
-    public IDictionary<string, int> BonusPoints { get; set; } = new Dictionary<string, int>();
+    public ICollection<BonusPointModel> BonusPoints { get; set; } = new List<BonusPointModel>();
     [DataMember]
     public int MaxPoints { get; set; }
     public int PointDropOff { get; set; }

src/iRLeagueApiCore.Common/Models/ResultConfigurations/ResultFilterModel.cs

@@ -8,18 +8,5 @@ public sealed class ResultFilterModel
     [DataMember]
     public long FilterOptionId { get; set; }
     [DataMember]
-    public FilterType FilterType { get; set; }
-    [DataMember]
-    public string ColumnPropertyName { get; set; } = string.Empty;
-    [DataMember]
-    public ComparatorType Comparator { get; set; }
-    /// <summary>
-    /// <para>Action performed on values that match the conditions</para>   
-    /// <para>- Keep: Keep the entries that match and remove all other entries</para>
-    /// <para>- Remove: Remove the entries that match and keep other entries</para>
-    /// </summary>
-    [DataMember]
-    public MatchedValueAction Action { get; set; }
-    [DataMember]
-    public ICollection<string> FilterValues { get; set; } = new List<string>();
+    public FilterConditionModel Condition { get; set; } = new();
 }

src/iRLeagueApiCore.Common/Models/Standings/StandingRowModel.cs

@@ -42,6 +42,10 @@ public class StandingRowModel
     [DataMember]
     public int RacesCounted { get; set; }
     [DataMember]
+    public int RacesScored { get; set; }
+    [DataMember]
+    public int RacesInPoints { get; set; }
+    [DataMember]
     public int DroppedResultCount { get; set; }
     [DataMember]
     public int ClubId { get; set; }

src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj

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