Fix sort mode and made accessible to all sort descriptors

Author: gmarz

Diff for: src/Nest/DSL/Search/SortFieldDescriptor.cs

@@ -18,24 +18,36 @@ public enum SortOrder
 		Descending
 	}
 
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum SortMode
+	{
+		[EnumMember(Value = "min")]
+		Min,
+		[EnumMember(Value = "max")]
+		Max,
+		[EnumMember(Value = "sum")]
+		Sum,
+		[EnumMember(Value = "avg")]
+		Average
+	}
+
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	public interface ISort
 	{
-
 		[JsonProperty("missing")]
 		string Missing { get; set; }
 
 		[JsonProperty("order")]
 		SortOrder? Order { get; set; }
+
+		[JsonProperty("mode")]
+		SortMode? Mode { get; set; }
 	}
 
 	public interface IFieldSort : ISort
 	{
 		PropertyPathMarker Field { get; set; }
 
-		[JsonProperty("mode")]
-		ScoreMode? Mode { get; set; }
-
 		[JsonProperty("nested_filter")]
 		FilterContainer NestedFilter { get; set; }
 
@@ -51,7 +63,7 @@ public class Sort : IFieldSort
 		public PropertyPathMarker Field { get; set; }
 		public string Missing { get; set; }
 		public SortOrder? Order { get; set; }
-		public ScoreMode? Mode { get; set; }
+		public SortMode? Mode { get; set; }
 		public FilterContainer NestedFilter { get; set; }
 		public PropertyPathMarker NestedPath { get; set; }
 		public bool? IgnoreUnmappedFields { get; set; }
@@ -67,7 +79,7 @@ public class SortFieldDescriptor<T> : IFieldSort where T : class
 
 		SortOrder? ISort.Order { get; set; }
 
-        ScoreMode? IFieldSort.Mode { get; set; }
+        SortMode? ISort.Mode { get; set; }
 
 		FilterContainer IFieldSort.NestedFilter { get; set; }
 
@@ -129,27 +141,33 @@ public virtual SortFieldDescriptor<T> Order(SortOrder order)
 			return this;
 		}
 
+		public virtual SortFieldDescriptor<T> Mode(SortMode mode)
+		{
+			Self.Mode = mode;
+			return this;
+		}
+
         public virtual SortFieldDescriptor<T> NestedMin()
         {
-            Self.Mode = ScoreMode.Min;
+            Self.Mode = SortMode.Min;
             return this;
         }
 
         public virtual SortFieldDescriptor<T> NestedMax()
         {
-			Self.Mode = ScoreMode.Max;
+			Self.Mode = SortMode.Max;
             return this;
         }
 
         public virtual SortFieldDescriptor<T> NestedSum()
         {
-            Self.Mode = ScoreMode.Sum;
+            Self.Mode = SortMode.Sum;
             return this;
         }
 
         public virtual SortFieldDescriptor<T> NestedAvg()
         {
-			Self.Mode = ScoreMode.Average;
+			Self.Mode = SortMode.Average;
             return this;
         }
 

Diff for: src/Nest/DSL/Search/SortGeoDistanceDescriptor.cs

@@ -20,6 +20,7 @@ public class GeoDistanceSort : IGeoDistanceSort
 	{
 		public string Missing { get; set; }
 		public SortOrder? Order { get; set; }
+		public SortMode? Mode { get; set; }
 		public PropertyPathMarker Field { get; set; }
 		public string PinLocation { get; set; }
 		public GeoUnit? GeoUnit { get; set; }
@@ -30,6 +31,7 @@ object ICustomJson.GetCustomJson()
 			{
 				{ this.Field, this.PinLocation },
 				{ "missing", this.Missing },
+				{ "mode", this.Mode },
 				{ "order", this.Order },
 				{ "unit", this.GeoUnit }
 			};
@@ -46,6 +48,8 @@ public class SortGeoDistanceDescriptor<T> : IGeoDistanceSort where T : class
 
 		SortOrder? ISort.Order { get; set; }
 
+		SortMode? ISort.Mode { get; set; }
+
 		string IGeoDistanceSort.PinLocation { get; set; }
 
 		GeoUnit? IGeoDistanceSort.GeoUnit { get; set; }
@@ -114,12 +118,19 @@ public SortGeoDistanceDescriptor<T> Order(SortOrder order)
 			return this;
 		}
 
+		public SortGeoDistanceDescriptor<T> Mode(SortMode mode)
+		{
+			Self.Mode = mode;
+			return this;
+		}
+
 		object ICustomJson.GetCustomJson()
 		{
 			return new Dictionary<object, object>
 			{
 				{ Self.Field, Self.PinLocation },
 				{ "missing", Self.Missing },
+				{ "mode", Self.Mode},
 				{ "order", Self.Order },
 				{ "unit", Self.GeoUnit }
 			};

Diff for: src/Nest/DSL/Search/SortScriptDescriptor.cs

@@ -22,6 +22,7 @@ public class ScriptSort : IScriptSort
 	{
 		public string Missing { get; set; }
 		public SortOrder? Order { get; set; }
+		public SortMode? Mode { get; set; }
 		public string Type { get; set; }
 		public string Script { get; set; }
 		public Dictionary<string, object> Params { get; set; }
@@ -35,6 +36,8 @@ public class SortScriptDescriptor<T> : IScriptSort
 
 		SortOrder? ISort.Order { get; set; }
 
+		SortMode? ISort.Mode { get; set; }
+
 		string IScriptSort.Type { get; set; }
 
 		string IScriptSort.Script { get; set; }
@@ -97,5 +100,11 @@ public SortScriptDescriptor<T> Order(SortOrder order)
 			Self.Order = order;
 			return this;
 		}
+
+		public SortScriptDescriptor<T> Mode(SortMode mode)
+		{
+			Self.Mode = mode;
+			return this;
+		}
 	}
 }

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

@@ -45,6 +45,7 @@ public void TestSortOnSortField()
 					.OnField(e => e.Name.Suffix("sort"))
 					.MissingLast()
 					.Descending()
+					.Mode(SortMode.Min)
 				);
 			var json = TestElasticClient.Serialize(s);
 			var expected = @"
@@ -54,7 +55,8 @@ public void TestSortOnSortField()
                   sort: {
                     ""name.sort"": {
                       missing: ""_last"",
-                      order: ""desc""
+                      order: ""desc"",
+					  mode: ""min""
                     }
                   }
                 }";
@@ -79,8 +81,8 @@ public void TestSortOnNestedField()
                   size: 10,
                   sort: {
                     ""contributors.age"": {
-                        ""mode"": ""max"",
-                        ""order"": ""desc""
+						""order"": ""desc"",
+                        ""mode"": ""max""
                     }
                   }
                 }";
@@ -175,6 +177,7 @@ public void TestSortGeo()
 					.Descending()
 					.PinTo(40, -70)
 					.Unit(GeoUnit.Kilometers)
+					.Mode(SortMode.Max)
 				);
 			var json = TestElasticClient.Serialize(s);
 			var expected = @"
@@ -185,6 +188,7 @@ public void TestSortGeo()
                     _geo_distance: {
                       ""origin"": ""40, -70"",
                       missing: ""_last"",
+					  mode: ""max"",
                       order: ""desc"",
                       unit: ""km""
                     }
@@ -202,6 +206,7 @@ public void TestSortScript()
 				.SortScript(sort => sort
 					.MissingLast()
 					.Descending()
+					.Mode(SortMode.Average)
 					.Script("doc['field_name'].value * factor")
 					.Params(p => p
 						.Add("factor", 1.1)
@@ -221,7 +226,8 @@ public void TestSortScript()
                         factor: 1.1
                       },
                       missing: ""_last"",
-                      order: ""desc""
+                      order: ""desc"",
+					  mode: ""avg""
                     }
                   }
                 }";