From 295b186165575a5b90f061aeee7b69fb70db9faa Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Sat, 3 Jun 2023 00:21:57 +0200 Subject: [PATCH 01/10] Add penalty type enum --- src/iRLeagueApiCore.Common/Enums/PenaltyType.cs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/iRLeagueApiCore.Common/Enums/PenaltyType.cs diff --git a/src/iRLeagueApiCore.Common/Enums/PenaltyType.cs b/src/iRLeagueApiCore.Common/Enums/PenaltyType.cs new file mode 100644 index 0000000..a4e28d0 --- /dev/null +++ b/src/iRLeagueApiCore.Common/Enums/PenaltyType.cs @@ -0,0 +1,7 @@ +namespace iRLeagueApiCore.Common.Enums; +public enum PenaltyType +{ + Points, + Position, + Time, +} From 5612bd0eb485b04fbae0449c4b1ccdc96a913c9f Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Sun, 4 Jun 2023 02:54:25 +0200 Subject: [PATCH 02/10] add review penalty model --- .../Models/Reviews/ReviewPenaltyModel.cs | 20 +++++++++++++++++++ .../iRLeagueApiCore.Common.csproj | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/iRLeagueApiCore.Common/Models/Reviews/ReviewPenaltyModel.cs diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/ReviewPenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/ReviewPenaltyModel.cs new file mode 100644 index 0000000..c192e92 --- /dev/null +++ b/src/iRLeagueApiCore.Common/Models/Reviews/ReviewPenaltyModel.cs @@ -0,0 +1,20 @@ +namespace iRLeagueApiCore.Common.Models.Reviews; + +[DataContract] +public sealed class ReviewPenaltyModel +{ + [DataMember] + public long ResultRowId { get; set; } + [DataMember] + public long ReviewId { get; set; } + [DataMember] + public long ReviewVoteId { get; set; } + [DataMember] + public PenaltyType Type { get; set; } + [DataMember(EmitDefaultValue = false)] + public int Points { get; set; } + [DataMember(EmitDefaultValue = false)] + public TimeSpan Time { get; set; } + [DataMember(EmitDefaultValue = false)] + public int Positions { get; set; } +} diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index 9604545..befdd25 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.6.5 + 0.7.0-dev.2 Simon Schulze Simon Schulze enable From 1edb9769f9aaffb7bacf8c85c344582741224bd7 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Sun, 4 Jun 2023 12:12:43 +0200 Subject: [PATCH 03/10] Add session result id to result model to allow assigning additional penalties --- src/iRLeagueApiCore.Common/Models/Results/ResultModel.cs | 5 +++++ src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/iRLeagueApiCore.Common/Models/Results/ResultModel.cs b/src/iRLeagueApiCore.Common/Models/Results/ResultModel.cs index b6bba9f..fc93ea7 100644 --- a/src/iRLeagueApiCore.Common/Models/Results/ResultModel.cs +++ b/src/iRLeagueApiCore.Common/Models/Results/ResultModel.cs @@ -15,6 +15,11 @@ public class ResultModel /// public long SeasonId { get; set; } /// + /// Id of the unique session result + /// + [DataMember] + public long SessionResultId { get; set; } + /// /// Name of the season the result belongs to /// [DataMember] diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index befdd25..92c9985 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.7.0-dev.2 + 0.7.0-dev.3 Simon Schulze Simon Schulze enable From 9c3ba7917bf4587c3695e0f5259aba24f5c7bd31 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Sun, 4 Jun 2023 13:12:23 +0200 Subject: [PATCH 04/10] Update penalty model --- .../{ReviewPenaltyModel.cs => PenaltyModel.cs} | 12 +++++++----- .../iRLeagueApiCore.Common.csproj | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) rename src/iRLeagueApiCore.Common/Models/Reviews/{ReviewPenaltyModel.cs => PenaltyModel.cs} (57%) diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/ReviewPenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs similarity index 57% rename from src/iRLeagueApiCore.Common/Models/Reviews/ReviewPenaltyModel.cs rename to src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs index c192e92..858e781 100644 --- a/src/iRLeagueApiCore.Common/Models/Reviews/ReviewPenaltyModel.cs +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs @@ -1,14 +1,16 @@ -namespace iRLeagueApiCore.Common.Models.Reviews; +namespace iRLeagueApiCore.Common.Models; [DataContract] -public sealed class ReviewPenaltyModel +public sealed class PenaltyModel { [DataMember] public long ResultRowId { get; set; } [DataMember] - public long ReviewId { get; set; } - [DataMember] - public long ReviewVoteId { get; set; } + public long? AddPenaltyId { get; set; } + [DataMember(EmitDefaultValue = false)] + public long? ReviewId { get; set; } + [DataMember(EmitDefaultValue = false)] + public long? ReviewVoteId { get; set; } [DataMember] public PenaltyType Type { get; set; } [DataMember(EmitDefaultValue = false)] diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index 92c9985..08ea242 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.7.0-dev.3 + 0.7.0-dev.4 Simon Schulze Simon Schulze enable From fc067794a434e465ad914aa671a8c50835c33048 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Sun, 4 Jun 2023 13:30:48 +0200 Subject: [PATCH 05/10] Add driver info to penalties --- src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs | 6 ++++++ src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs index 858e781..3a88606 100644 --- a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs @@ -12,6 +12,12 @@ public sealed class PenaltyModel [DataMember(EmitDefaultValue = false)] public long? ReviewVoteId { get; set; } [DataMember] + public long MemberId { get; set; } + [DataMember] + public string Firstname { get; set; } = string.Empty; + [DataMember] + public string Lastname { get; set; } = string.Empty; + [DataMember] public PenaltyType Type { get; set; } [DataMember(EmitDefaultValue = false)] public int Points { get; set; } diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index 08ea242..0ebc7e7 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.7.0-dev.4 + 0.7.0-dev.5 Simon Schulze Simon Schulze enable From 309d1b044c183fcbe69ba837c3b14f571280c398 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Sun, 4 Jun 2023 13:41:22 +0200 Subject: [PATCH 06/10] Add reason field --- src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs | 2 ++ src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs index 3a88606..68b516c 100644 --- a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs @@ -18,6 +18,8 @@ public sealed class PenaltyModel [DataMember] public string Lastname { get; set; } = string.Empty; [DataMember] + public string Reason { get; set; } = string.Empty; + [DataMember] public PenaltyType Type { get; set; } [DataMember(EmitDefaultValue = false)] public int Points { get; set; } diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index 0ebc7e7..94b7468 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.7.0-dev.5 + 0.7.0-dev.6 Simon Schulze Simon Schulze enable From b2cd7d3a4647f1a4d3f71837a0349437a12942b2 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Wed, 7 Jun 2023 20:40:46 +0200 Subject: [PATCH 07/10] add models for post and put --- .../Models/Reviews/PenaltyModel.cs | 18 +++++++----------- .../Models/Reviews/PostPenaltyModel.cs | 16 ++++++++++++++++ .../Models/Reviews/PutPenaltyModel.cs | 6 ++++++ 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs create mode 100644 src/iRLeagueApiCore.Common/Models/Reviews/PutPenaltyModel.cs diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs index 68b516c..04be513 100644 --- a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs @@ -1,7 +1,7 @@ namespace iRLeagueApiCore.Common.Models; [DataContract] -public sealed class PenaltyModel +public sealed class PenaltyModel : PutPenaltyModel { [DataMember] public long ResultRowId { get; set; } @@ -12,19 +12,15 @@ public sealed class PenaltyModel [DataMember(EmitDefaultValue = false)] public long? ReviewVoteId { get; set; } [DataMember] + public long EventId { get; set; } + [DataMember] + public long? SessionId { get; set; } + [DataMember] + public string SessionName { get; set; } = string.Empty; + [DataMember] public long MemberId { get; set; } [DataMember] public string Firstname { get; set; } = string.Empty; [DataMember] public string Lastname { get; set; } = string.Empty; - [DataMember] - public string Reason { get; set; } = string.Empty; - [DataMember] - public PenaltyType Type { get; set; } - [DataMember(EmitDefaultValue = false)] - public int Points { get; set; } - [DataMember(EmitDefaultValue = false)] - public TimeSpan Time { get; set; } - [DataMember(EmitDefaultValue = false)] - public int Positions { get; set; } } diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs new file mode 100644 index 0000000..179dfc5 --- /dev/null +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs @@ -0,0 +1,16 @@ +namespace iRLeagueApiCore.Common.Models; + +[DataContract] +public class PostPenaltyModel +{ + [DataMember] + public string Reason { get; set; } = string.Empty; + [DataMember] + public PenaltyType Type { get; set; } + [DataMember(EmitDefaultValue = false)] + public int Points { get; set; } + [DataMember(EmitDefaultValue = false)] + public TimeSpan Time { get; set; } + [DataMember(EmitDefaultValue = false)] + public int Positions { get; set; } +} diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/PutPenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PutPenaltyModel.cs new file mode 100644 index 0000000..9aa65ec --- /dev/null +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PutPenaltyModel.cs @@ -0,0 +1,6 @@ +namespace iRLeagueApiCore.Common.Models; + +[DataContract] +public class PutPenaltyModel : PostPenaltyModel +{ +} From f9bd7245a985e7201dffdf0e2c9625c2469a2e5f Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Wed, 7 Jun 2023 22:25:36 +0200 Subject: [PATCH 08/10] Change to SessionNr instead of id --- src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs | 2 +- src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs index 04be513..61581e9 100644 --- a/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PenaltyModel.cs @@ -14,7 +14,7 @@ public sealed class PenaltyModel : PutPenaltyModel [DataMember] public long EventId { get; set; } [DataMember] - public long? SessionId { get; set; } + public int SessionNr { get; set; } [DataMember] public string SessionName { get; set; } = string.Empty; [DataMember] diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index 94b7468..ab29985 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.7.0-dev.6 + 0.7.0-dev.8 Simon Schulze Simon Schulze enable From c89456555359544716fe2b6dd4008e6376fb073d Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Fri, 9 Jun 2023 03:45:37 +0200 Subject: [PATCH 09/10] Add lap and corner information --- src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs | 4 ++++ src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs b/src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs index 179dfc5..1e66cc7 100644 --- a/src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs +++ b/src/iRLeagueApiCore.Common/Models/Reviews/PostPenaltyModel.cs @@ -3,6 +3,10 @@ [DataContract] public class PostPenaltyModel { + [DataMember] + public string Lap { get; set; } = string.Empty; + [DataMember] + public string Corner { get; set; } = string.Empty; [DataMember] public string Reason { get; set; } = string.Empty; [DataMember] diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index ab29985..6a25674 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.7.0-dev.8 + 0.7.0-dev.9 Simon Schulze Simon Schulze enable From ddd368b88649dbed1df7fc8f2196ec27396c8ce3 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Thu, 15 Jun 2023 23:29:37 +0200 Subject: [PATCH 10/10] bump version --- src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj index 6a25674..f5d5bdb 100644 --- a/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj +++ b/src/iRLeagueApiCore.Common/iRLeagueApiCore.Common.csproj @@ -18,7 +18,7 @@ Library net6.0 iRLeagueApiCore.Common - 0.7.0-dev.9 + 0.7.0 Simon Schulze Simon Schulze enable