Minor API validation fixes

baking-bad · Jul 12, 2024 · a5a2199 · a5a2199
1 parent 609c025
commit a5a2199
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/Tzkt.Api/Controllers/OperationsController.cs b/Tzkt.Api/Controllers/OperationsController.cs
@@ -5196,7 +5196,7 @@ public async Task<ActionResult<IEnumerable<MigrationOperation>>> GetMigrations(
         /// <returns></returns>
         [HttpGet("migrations/{id:long}")]
         public async Task<ActionResult<MigrationOperation>> GetMigrationById(
-            [Required][Min(0)] long id,
+            [Required][Min64(0)] long id,
             MichelineFormat micheline = MichelineFormat.Json, 
             Symbols quote = Symbols.None)
         {
@@ -5333,7 +5333,7 @@ public async Task<ActionResult<IEnumerable<RevelationPenaltyOperation>>> GetReve
         /// <returns></returns>
         [HttpGet("revelation_penalties/{id:long}")]
         public async Task<ActionResult<RevelationPenaltyOperation>> GetRevelationPenaltyById(
-            [Required][Min(0)] long id,
+            [Required][Min64(0)] long id,
             Symbols quote = Symbols.None)
         {
             var query = ResponseCacheService.BuildKey(Request.Path.Value,
@@ -5500,7 +5500,7 @@ public async Task<ActionResult<IEnumerable<BakingOperation>>> GetBaking(
         /// <returns></returns>
         [HttpGet("baking/{id:long}")]
         public async Task<ActionResult<BakingOperation>> GetBakingById(
-            [Required][Min(0)] long id,
+            [Required][Min64(0)] long id,
             Symbols quote = Symbols.None)
         {
             var query = ResponseCacheService.BuildKey(Request.Path.Value,
@@ -5636,7 +5636,7 @@ public async Task<ActionResult<IEnumerable<EndorsingRewardOperation>>> GetEndors
         /// <returns></returns>
         [HttpGet("endorsing_rewards/{id:long}")]
         public async Task<ActionResult<EndorsingRewardOperation>> GetEndorsingRewardById(
-            [Required][Min(0)] long id,
+            [Required][Min64(0)] long id,
             Symbols quote = Symbols.None)
         {
             var query = ResponseCacheService.BuildKey(Request.Path.Value,

diff --git a/Tzkt.Api/Parameters/SrCommitmentFilter.cs b/Tzkt.Api/Parameters/SrCommitmentFilter.cs
@@ -83,7 +83,7 @@ public class SrCommitmentFilter : INormalizable
             lastLevel == null &&
             lastTime == null &&
             status == null &&
-            predecessor.Empty;
+            (predecessor == null || predecessor.Empty);
 
         public string Normalize(string name)
         {

diff --git a/Tzkt.Api/Parameters/SrGameFilter.cs b/Tzkt.Api/Parameters/SrGameFilter.cs
@@ -64,13 +64,13 @@ public class SrGameFilter : INormalizable
         public TimestampParameter lastTime { get; set; }
 
         [OpenApiIgnore]
-        public bool Empty => 
+        public bool Empty =>
             id == null &&
             rollup == null &&
             initiator == null &&
-            initiatorCommitment.Empty &&
+            (initiatorCommitment == null || initiatorCommitment.Empty) &&
             opponent == null &&
-            opponentCommitment.Empty &&
+            (opponentCommitment == null || opponentCommitment.Empty) &&
             firstLevel == null &&
             firstTime == null &&
             lastLevel == null &&

diff --git a/Tzkt.Api/Parameters/SrGameInfoFilter.cs b/Tzkt.Api/Parameters/SrGameInfoFilter.cs
@@ -37,9 +37,9 @@ public class SrGameInfoFilter : INormalizable
         public bool Empty => 
             id == null &&
             initiator == null &&
-            initiatorCommitment.Empty &&
+            (initiatorCommitment == null || initiatorCommitment.Empty) &&
             opponent == null &&
-            opponentCommitment.Empty;
+            (opponentCommitment == null || opponentCommitment.Empty);
 
         public string Normalize(string name)
         {

diff --git a/Tzkt.Api/Validation/Min64Attribute.cs b/Tzkt.Api/Validation/Min64Attribute.cs
@@ -0,0 +1,19 @@
+namespace System.ComponentModel.DataAnnotations
+{
+    public sealed class Min64Attribute : ValidationAttribute
+    {
+        readonly long Minimum;
+
+        public Min64Attribute(long minimum)
+        {
+            Minimum = minimum;
+        }
+
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            return value != null && (long)value < Minimum
+                ? new ValidationResult($"The value must be greater than or equal to {Minimum}.")
+                : ValidationResult.Success;
+        }
+    }
+}