Making the Binary Filter Left and Right optional and validations

Author: tsutomi

src/Deveel.Filter.Model.Web/Deveel.Filter.Model.Web.xml

@@ -6,19 +6,22 @@ namespace Deveel.Filters {
 	/// <summary>
 	/// A model that represents a binary filter
 	/// </summary>
-	public sealed class BinaryFilterModel {
+	public sealed class BinaryFilterModel : IValidatableObject {
 		/// <summary>
 		/// The left side of the binary filter
 		/// </summary>
-		[JsonPropertyName("left"), Required]
+		[JsonPropertyName("left")]
 		public FilterModel? Left { get; set; }
 
 		/// <summary>
 		/// The right side of the binary filter
 		/// </summary>
-		[JsonPropertyName("right"), Required]
+		[JsonPropertyName("right")]
 		public FilterModel? Right { get; set; }
 
+		/// <summary>
+		/// Extension data for the dynamic properties of the filter.
+		/// </summary>
 		[JsonExtensionData, SimpleValue]
 		public IDictionary<string, JsonElement>? BinaryData { get; set; }
 
@@ -34,5 +37,22 @@ internal BinaryFilter BuildFilter(FilterType filterType) {
 
 			return Filter.Binary(left, right, filterType);
 		}
+
+		IEnumerable<ValidationResult> IValidatableObject.Validate(ValidationContext validationContext) {
+			if (BinaryData == null && Left == null && Right == null)
+				yield return new ValidationResult("The left and right side of the binary filter must be specified", new[] {nameof(Left), nameof(Right)});
+
+			if (BinaryData != null && (Left != null || Right != null))
+				yield return new ValidationResult("The left and right side of the binary filter must not be present if the data are set", new[] {nameof(Left), nameof(Right)});
+
+			if (BinaryData != null && BinaryData.Count == 0)
+				yield return new ValidationResult("The binary data must not be empty", new[] {nameof(BinaryData)});
+
+			if (Left != null && Right != null && BinaryData != null)
+				yield return new ValidationResult("The left and right side of the binary filter must not be present if the data are set", new[] {nameof(Left), nameof(Right)});
+
+			if (BinaryData == null && (Left == null || Right == null))
+				yield return new ValidationResult("The left and right side of the binary filter must be specified", new[] {nameof(Left), nameof(Right)});
+		}
 	}
 }

src/Deveel.Filter.Model.Web/Filters/BinaryFilterModel.cs

@@ -38,7 +38,8 @@ public static void ValidateInvalidBinaryModel() {
             Assert.False(Validator.TryValidateObject(model, context, resuls, true));
 
             Assert.Single(resuls);
-            Assert.Equal("Right", resuls[0].MemberNames.First());
+			Assert.Equal("Left", resuls[0].MemberNames.ElementAt(0));
+            Assert.Equal("Right", resuls[0].MemberNames.ElementAt(1));
         }
 
         [Fact]