Merge pull request #1386 from robertlyson/SimpleQueryStringMinimumShouldMatchParameter

Support for minimum_should_match option on query_string_query #1356

Author: Mpdreamz

src/Nest/DSL/Query/SimpleQueryStringQueryDescriptor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
@@ -36,6 +37,9 @@ public interface ISimpleQueryStringQuery : IQuery
 
 		[JsonProperty(PropertyName = "locale")]
 		string Locale { get; set; }
+
+		[JsonProperty("minimum_should_match")]
+		string MinimumShouldMatch { get; set; }
 	}
 
 	public class SimpleQueryStringQuery : PlainQuery, ISimpleQueryStringQuery
@@ -54,6 +58,7 @@ protected override void WrapInContainer(IQueryContainer container)
 		public bool? LowercaseExpendedTerms { get; set; }
 		public string Flags { get; set; }
 		public string Locale { get; set; }
+		public string MinimumShouldMatch { get; set; }
 	}
 
 	public class SimpleQueryStringQueryDescriptor<T> : ISimpleQueryStringQuery where T : class
@@ -75,6 +80,7 @@ public class SimpleQueryStringQueryDescriptor<T> : ISimpleQueryStringQuery where
 		string ISimpleQueryStringQuery.Flags { get; set; }
 
 		string ISimpleQueryStringQuery.Locale { get; set; }
+		string ISimpleQueryStringQuery.MinimumShouldMatch { get; set; }
 
 		string IQuery.Name { get; set; }
 
@@ -159,5 +165,16 @@ public SimpleQueryStringQueryDescriptor<T> Locale(string locale)
 			return this;
 		}
 
-	}
+		public SimpleQueryStringQueryDescriptor<T> MinimumShouldMatch(int minimumShouldMatches)
+		{
+			((ISimpleQueryStringQuery)this).MinimumShouldMatch = minimumShouldMatches.ToString(CultureInfo.InvariantCulture);
+			return this;
+		}
+
+		public SimpleQueryStringQueryDescriptor<T> MinimumShouldMatch(string minimumShouldMatch)
+		{
+			Self.MinimumShouldMatch = minimumShouldMatch;
+			return this;
+		}
+    }
 }

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

@@ -20,6 +20,7 @@ public void SimpleQueryString_Deserializes()
 					.DefaultField(p=>p.Name)
 					.OnFields(p=>p.Name, p=>p.Origin)
 					.Query("some query")
+					.MinimumShouldMatch("50%")
 					)
 				);
 			q.Analyzer.Should().Be("my-analyzer");
@@ -30,7 +31,35 @@ public void SimpleQueryString_Deserializes()
 			q.DefaultField.Should().Be("name");
 			q.Fields.Should().BeEquivalentTo(new []{ "name", "origin"});
 			q.Query.Should().Be("some query");
+			q.MinimumShouldMatch.Should().Be("50%");
+		}
 
+		[Test]
+		public void SimpleQueryString_MinimumShouldMatch_Deserializes()
+		{
+			var q = this.SerializeThenDeserialize(
+				f => f.SimpleQueryString,
+				f => f.SimpleQueryString(sq => sq
+					  .Analyzer("my-analyzer")
+					  .DefaultOperator(Operator.And)
+					  .Flags("ASFAS")
+					  .Locale("en")
+					  .LowercaseExpendedTerms()
+					  .DefaultField(p => p.Name)
+					  .OnFields(p => p.Name, p => p.Origin)
+					  .Query("some query")
+					  .MinimumShouldMatch(50)
+					)
+				);
+			q.Analyzer.Should().Be("my-analyzer");
+			q.DefaultOperator.Should().Be(Operator.And);
+			q.Flags.Should().Be("ASFAS");
+			q.Locale.Should().Be("en");
+			q.LowercaseExpendedTerms.Should().BeTrue();
+			q.DefaultField.Should().Be("name");
+			q.Fields.Should().BeEquivalentTo(new[] { "name", "origin" });
+			q.Query.Should().Be("some query");
+			q.MinimumShouldMatch.Should().Be("50");
 		}
 	}
 }