Merge pull request #1388 from elastic/feature/min-score-type

Has child/top children: support for min score type and min/max_children

Author: Mpdreamz

src/Nest/DSL/Query/HasChildQueryDescriptor.cs

@@ -18,6 +18,12 @@ public interface IHasChildQuery : IQuery
 		[JsonConverter(typeof (StringEnumConverter))]
 		ChildScoreType? ScoreType { get; set; }
 
+		[JsonProperty("min_children")]
+		int? MinChildren { get; set; }
+
+		[JsonProperty("max_children")]
+		int? MaxChildren { get; set; }
+
 		[JsonProperty("query")]
 		[JsonConverter(typeof(CompositeJsonConverter<ReadAsTypeConverter<QueryDescriptor<object>>, CustomJsonConverter>))]
 		IQueryContainer Query { get; set; }
@@ -39,6 +45,8 @@ protected override void WrapInContainer(IQueryContainer container)
 		bool IQuery.IsConditionless { get { return false; } }
 		public TypeNameMarker Type { get; set; }
 		public ChildScoreType? ScoreType { get; set; }
+		public int? MinChildren { get; set; }
+		public int? MaxChildren { get; set; }
 		public IQueryContainer Query { get; set; }
 		public IInnerHits InnerHits { get; set; }
 	}
@@ -51,6 +59,10 @@ public class HasChildQueryDescriptor<T> : IHasChildQuery where T : class
 
 		ChildScoreType? IHasChildQuery.ScoreType { get; set; }
 
+		int? IHasChildQuery.MinChildren { get; set; }
+
+		int? IHasChildQuery.MaxChildren { get; set; }
+
 		IQueryContainer IHasChildQuery.Query { get; set; }
 
 		IInnerHits IHasChildQuery.InnerHits { get; set; }
@@ -95,6 +107,18 @@ public HasChildQueryDescriptor<T> Score(ChildScoreType? scoreType)
 			return this;
 		}
 
+		public HasChildQueryDescriptor<T> MinChildren(int minChildren)
+		{
+			Self.MinChildren = minChildren;
+			return this;
+		}
+
+		public HasChildQueryDescriptor<T> MaxChildren(int maxChildren)
+		{
+			Self.MaxChildren = maxChildren;
+			return this;
+		}
+
 		public HasChildQueryDescriptor<T> InnerHits()
 		{
 			Self.InnerHits = new InnerHits();

src/Nest/Domain/DSL/ChildScoreType.cs

@@ -17,6 +17,8 @@ public enum ChildScoreType
 		[EnumMember(Value = "sum")]
 		Sum,
 		[EnumMember(Value = "max")]
-		Max
+		Max,
+		[EnumMember(Value = "min")]
+		Min
 	}
 }

src/Nest/Enums/TopChildrenScore.cs

@@ -15,8 +15,8 @@ public enum TopChildrenScore
 		[EnumMember(Value = "sum")]
 		Sum,
 		[EnumMember(Value = "avg")]
-		Average
+		Average,
+		[EnumMember(Value = "min")]
+		Min
 	}
-
-	
 }

src/Tests/Nest.Tests.Unit/QueryParsers/Queries/HasChildQueryTests.cs

@@ -16,12 +16,16 @@ public void HasChild_Deserializes()
 				f=>f.HasChild<Person>(hq=>hq
 					.Query(qq=>Query2)
 					.Score(ChildScoreType.Average)
+					.MinChildren(2)
+					.MaxChildren(10)
 					.InnerHits()
 				)
 			);
 			q.Type.Should().Be("person");
 			q.ScoreType.Should().Be(ChildScoreType.Average);
 			q.InnerHits.Should().NotBeNull();
+			q.MinChildren.Should().Be(2);
+			q.MaxChildren.Should().Be(10);
 			AssertIsTermQuery(q.Query, Query2);
 		}
 	}