Fix TariffRestrictions

BitzArt · Sep 4, 2023 · 8b9f0f0 · 8b9f0f0
1 parent e9e113b
commit 8b9f0f0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/OCPI.Net.Contracts/Tariff/OcpiTariffElement.cs b/src/OCPI.Net.Contracts/Tariff/OcpiTariffElement.cs
@@ -8,5 +8,5 @@ public class OcpiTariffElement
     public IEnumerable<OcpiPriceComponent>? PriceComponents { get; set; }
 
     [JsonPropertyName("restrictions")]
-    public IEnumerable<OcpiTariffRestriction>? Restrictions { get; set; }
+    public OcpiTariffRestrictions? Restrictions { get; set; }
 }
diff --git a/...Contracts/Tariff/OcpiTariffRestriction.cs → ...ontracts/Tariff/OcpiTariffRestrictions.cs b/...Contracts/Tariff/OcpiTariffRestriction.cs → ...ontracts/Tariff/OcpiTariffRestrictions.cs
@@ -2,7 +2,7 @@
 
 namespace OCPI.Contracts;
 
-public class OcpiTariffRestriction
+public class OcpiTariffRestrictions
 {
     [JsonPropertyName("start_time")]
     public string? StartTime { get; set; }

diff --git a/src/OCPI.Net.Validation/Validators/Tariff/OcpiTariffElementValidator.cs b/src/OCPI.Net.Validation/Validators/Tariff/OcpiTariffElementValidator.cs
@@ -12,7 +12,7 @@ public OcpiTariffElementValidator(ActionType actionType) : base(actionType)
         RuleForEach(x => x.PriceComponents)
             .SetValidator(new OcpiPriceComponentValidator(actionType));
 
-        RuleForEach(x => x.Restrictions)
+        JsonRuleFor(x => x.Restrictions!)
             .SetValidator(new OcpiTariffRestrictionValidator(actionType));
     }
 }
diff --git a/src/OCPI.Net.Validation/Validators/Tariff/OcpiTariffRestrictionValidator.cs b/src/OCPI.Net.Validation/Validators/Tariff/OcpiTariffRestrictionValidator.cs
@@ -3,7 +3,7 @@
 
 namespace OCPI.Contracts;
 
-public class OcpiTariffRestrictionValidator : ActionValidator<OcpiTariffRestriction>
+public class OcpiTariffRestrictionValidator : ActionValidator<OcpiTariffRestrictions>
 {
     public OcpiTariffRestrictionValidator(ActionType actionType) : base(actionType)
     {