Add support for template query

Author: gmarz

src/Nest/DSL/Query/IQueryContainer.cs

@@ -140,6 +140,9 @@ public interface IQueryContainer : ICustomJson
 		[JsonProperty(PropertyName = "function_score")]
 		IFunctionScoreQuery FunctionScore { get; set; }
 
+		[JsonProperty(PropertyName = "template")]
+		ITemplateQuery Template { get; set; }
+
 		void Accept(IQueryVisitor visitor);
 	}
 }

src/Nest/DSL/Query/QueryContainer.cs

@@ -86,6 +86,8 @@ public class QueryContainer : IQueryContainer
 		IIndicesQuery IQueryContainer.Indices { get; set; }
 
 		IFunctionScoreQuery IQueryContainer.FunctionScore { get; set; }
+
+		ITemplateQuery IQueryContainer.Template { get; set; }
 
 		public QueryContainer() {}
 

src/Nest/DSL/Query/QueryDescriptor.cs

@@ -854,5 +854,12 @@ public QueryContainer FunctionScore(Action<FunctionScoreQueryDescriptor<T>> func
 			return this.New(query, q => q.FunctionScore = query);
 
 		}
+
+		public QueryContainer Template(Action<TemplateQueryDescriptor> selector)
+		{
+			var query = new TemplateQueryDescriptor();
+			selector(query);
+			return this.New(query, q => q.Template = query);
+		}
 	}
 }

src/Nest/DSL/Query/TemplateQueryDescriptor.cs

@@ -0,0 +1,66 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
+	public interface ITemplateQuery : IQuery
+	{
+		[JsonProperty("query")]
+		string Query { get; set; }
+
+		[JsonProperty("params")]
+		IDictionary<string, object> Params { get; set; } 
+	}
+
+	public class TemplateQuery : PlainQuery, ITemplateQuery
+	{
+		protected override void WrapInContainer(IQueryContainer container)
+		{
+			container.Template = this;
+		}
+
+		public string Query { get; set; }
+
+		public IDictionary<string, object> Params { get; set;}
+
+		public bool IsConditionless
+		{
+			get { return this.Query.IsNullOrEmpty(); }
+		}
+	}
+
+	public class TemplateQueryDescriptor : ITemplateQuery
+	{
+		ITemplateQuery Self { get { return this; } }
+
+		string ITemplateQuery.Query { get; set; }
+
+		IDictionary<string, object> ITemplateQuery.Params { get; set; }
+
+		bool IQuery.IsConditionless { get { return this.Self.Query.IsNullOrEmpty(); } }
+
+		public TemplateQueryDescriptor Query(string query)
+		{
+			this.Self.Query = query;
+			return this;
+		}
+
+		public TemplateQueryDescriptor Params(IDictionary<string, object> paramsDictionary)
+		{
+			paramsDictionary.ThrowIfNull("paramsDictionary");
+			this.Self.Params = paramsDictionary;
+			return this;
+		}
+
+		public TemplateQueryDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramsDictionary)
+		{
+			paramsDictionary.ThrowIfNull("paramsDictionary");
+			this.Self.Params = paramsDictionary(new FluentDictionary<string,object>());
+			return this;
+		}
+	}
+}

src/Nest/Nest.csproj

@@ -202,6 +202,7 @@
     <Compile Include="DSL\PutSearchTemplateDescriptor.cs" />
     <Compile Include="DSL\DeleteSearchTemplateDescriptor.cs" />
     <Compile Include="DSL\GetSearchTemplateDescriptor.cs" />
+    <Compile Include="DSL\Query\TemplateQueryDescriptor.cs" />
     <Compile Include="DSL\Template\TemplateSectionQueryContainer.cs" />
     <Compile Include="DSL\Template\TemplateSectionSortFieldDescriptor.cs" />
     <Compile Include="DSL\CatIndicesDescriptor.cs" />

src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -179,6 +179,7 @@
     <Compile Include="Search\Filter\RangeFilterTests.cs" />
     <Compile Include="Search\Query\BoolQueryResults.cs" />
     <Compile Include="Search\Query\SpanQueryTests.cs" />
+    <Compile Include="Search\Query\TemplateQueryTests.cs" />
     <Compile Include="Search\Query\TermToString.cs" />
     <Compile Include="Core\UpdateTests.cs" />
     <Compile Include="Search\Filter\BoolFilterTests.cs" />

src/Tests/Nest.Tests.Integration/Search/Query/TemplateQueryTests.cs

@@ -0,0 +1,35 @@
+
+using FluentAssertions;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest.Tests.Integration.Search.Query
+{
+	[TestFixture]
+	public class TemplateQueryTests : IntegrationTests
+	{
+		[Test]
+		public void TemplateQuery()
+		{
+			var r = this.Client.Search<ElasticsearchProject>(s => s
+				.Query(q => q
+					.Template(t => t
+						.Query("{ \"match\": { \"{{my_field}}\": { \"query\": \"{{my_value}}\" } } }")
+						.Params(p => p
+							.Add("my_field", "name")
+							.Add("my_value", "em-elasticsearch")
+						)
+					)
+				)
+			);
+
+			r.IsValid.Should().BeTrue();
+			r.Hits.Count().Should().BeGreaterThan(0);
+		}
+	}
+}

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -405,6 +405,7 @@
     <Compile Include="Search\Query\Singles\MultiMatch\MultiMatchJson.cs" />
     <Compile Include="Search\Query\Modes\QueryModesTests.cs" />
     <Compile Include="Search\Query\Singles\SpanMultiTermQueryJson.cs" />
+    <Compile Include="Search\Query\Singles\TemplateQueryJson.cs" />
     <Compile Include="Search\Query\Singles\Term\TermToStringJson.cs" />
     <Compile Include="Search\Rescoring\RescoreTests.cs" />
     <Compile Include="Search\Facets\DateHistogramFacetJson.cs" />

src/Tests/Nest.Tests.Unit/Search/Query/Singles/TemplateQueryJson.cs

@@ -0,0 +1,74 @@
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest.Tests.Unit.Search.Query.Singles
+{
+	[TestFixture]
+	public class TemplateQueryJson : BaseJsonTests
+	{
+		[Test]
+		public void TemplateQuery()
+		{
+			var s = new SearchDescriptor<ElasticsearchProject>()
+				.From(0)
+				.Size(10)
+				.Query(q => q
+					.Template(t => t
+						.Query("match_{{template}}")
+						.Params(p => p
+							.Add("template", "all")
+						)
+					)
+			);
+
+			var json = TestElasticClient.Serialize(s);
+			var expected = @"{ from: 0, size: 10,
+				  query: {
+					template: {
+					  query: ""match_{{template}}"",
+					  ""params"": {
+						template: ""all""
+					  }
+					}
+				  }
+				}";
+
+			Assert.True(json.JsonEquals(expected), json);
+		}
+
+		[Test]
+		public void TemplateQueryWithEscapeString()
+		{
+			var s = new SearchDescriptor<ElasticsearchProject>()
+				.From(0)
+				.Size(10)
+				.Query(q => q
+					.Template(t => t
+						.Query("\"match_{{template}}\": {}}\"")
+						.Params(p => p
+							.Add("template", "all")
+						)
+					)
+			);
+
+			var json = TestElasticClient.Serialize(s);
+			var expected = @"{ from: 0, size: 10,
+				  query: {
+					template: {
+					  query: ""\""match_{{template}}\"": {}}\"""",
+					  ""params"": {
+						template: ""all""
+					  }
+					}
+				  }
+				}";
+
+			Assert.True(json.JsonEquals(expected), json);
+		}
+	}
+}