Merge pull request #1448 from mgoodfellow/add-multisort-extensions

Addition of MultiSortExtensions to allow easy sorting across multiple fields

Author: gmarz

Diff for: src/Nest/DSL/SearchDescriptor.cs

@@ -750,6 +750,35 @@ public SearchDescriptor<T> Sort(Func<SortFieldDescriptor<T>, IFieldSort> sortSel
 			return this;
 		}
 
+		/// <summary>
+		/// <para>SortMulti allows multiple sorts to be provided on one search descriptor
+		/// </para>
+		/// </summary>
+		public SearchDescriptor<T> SortMulti(params Func<SortFieldDescriptor<T>, IFieldSort>[] sorts)
+		{
+			foreach (var sort in sorts)
+			{
+				this.Sort(sort);
+			}
+
+			return this;
+		}
+
+		/// <summary>
+		/// <para>SortMulti allows multiple sorts to be provided on one search descriptor
+		/// </para>
+		/// </summary>
+		public SearchDescriptor<T> SortMulti(IEnumerable<SortFieldDescriptor<T>> sorts)
+		{
+			foreach (var sort in sorts)
+			{
+				var copy = sort;
+				this.Sort(s => copy);
+			}
+
+			return this;
+		}
+
 		/// <summary>
 		/// <para>SortGeoDistance() allows you to sort by a distance from a geo point.
 		/// </para>

Diff for: src/Tests/Nest.Tests.Unit/Search/Sorting/SortTests.cs

@@ -1,4 +1,6 @@
-using FluentAssertions;
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
 using System.Reflection;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
@@ -198,6 +200,54 @@ public void TestSortDescendingOnSortField()
 			Assert.True(json.JsonEquals(expected), json);
 		}
 
+		[Test]
+		public void TestSortMultiWithParams()
+		{
+			var s = new SearchDescriptor<ElasticsearchProject>()
+				.From(0)
+				.Size(10)
+				.SortMulti(sort => sort.OnField(f => f.Name.Suffix("sort")).Order(SortOrder.Descending),
+						   sort => sort.OnField(f => f.Content.Suffix("test")).Order(SortOrder.Ascending));
+
+			var json = TestElasticClient.Serialize(s);
+			var expected = @"
+                {
+                  from: 0,
+                  size: 10,
+                  sort: [
+                      { ""name.sort"" : { order: ""desc"" } },
+                      { ""content.test"" : { order: ""asc"" } }
+                    ]      
+                }";
+			Assert.True(json.JsonEquals(expected), json);
+		}
+
+		[Test]
+		public void TestSortMultiWithEnumerable()
+		{
+			var sorts = new []
+						{
+							new SortFieldDescriptor<ElasticsearchProject>().OnField(f => f.Name.Suffix("sort")).Order(SortOrder.Descending),
+							new SortFieldDescriptor<ElasticsearchProject>().OnField(f => f.Content.Suffix("test")).Order(SortOrder.Ascending)
+						};
+
+			var s = new SearchDescriptor<ElasticsearchProject>()
+				.From(0)
+				.Size(10)
+				.SortMulti(sorts);
+			var json = TestElasticClient.Serialize(s);
+			var expected = @"
+                {
+                  from: 0,
+                  size: 10,
+                  sort: [
+                      { ""name.sort"" : { order: ""desc"" } },
+                      { ""content.test"" : { order: ""asc"" } }
+                    ]      
+                }";
+			Assert.True(json.JsonEquals(expected), json);
+		}
+
 		[Test]
 		public void TestSortGeo()
 		{