Skip to content

Commit 0a97e77

Browse files
committed
fix 715 missing Seconds on DateInterval enum, string overload to specify interval on datehistogram facet
1 parent 17f66c0 commit 0a97e77

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

Diff for: src/Nest/DSL/Facets/DateHistogramFacetDescriptor.cs

+20
Original file line numberDiff line numberDiff line change
@@ -109,41 +109,54 @@ public DateHistogramFacetDescriptor<T> OnField(string field)
109109
Self.Field = field;
110110
return this;
111111
}
112+
112113
public DateHistogramFacetDescriptor<T> OnField(Expression<Func<T, object>> objectPath)
113114
{
114115
objectPath.ThrowIfNull("objectPath");
115116
Self.Field = objectPath;
116117
return this;
117118
}
119+
120+
public DateHistogramFacetDescriptor<T> Interval(string interval)
121+
{
122+
Self.Interval = interval;
123+
return this;
124+
}
125+
118126
public DateHistogramFacetDescriptor<T> Interval(DateInterval interval)
119127
{
120128
var intervalString = interval.GetStringValue();
121129
Self.Interval = intervalString;
122130
return this;
123131
}
132+
124133
public DateHistogramFacetDescriptor<T> Interval(DateInterval interval, DateRounding dateRounding)
125134
{
126135
var intervalString = interval.GetStringValue();
127136
var roundingString = dateRounding.GetStringValue();
128137
Self.Interval = intervalString + ":" + roundingString;
129138
return this;
130139
}
140+
131141
public DateHistogramFacetDescriptor<T> Factor(int factor)
132142
{
133143
Self.Factor = factor;
134144
return this;
135145
}
146+
136147
public DateHistogramFacetDescriptor<T> Offset(string Pre = null, string Post = null)
137148
{
138149
Self.PreOffset = Pre;
139150
Self.PostOffset = Post;
140151
return this;
141152
}
153+
142154
public DateHistogramFacetDescriptor<T> TimeZone(string timeZone)
143155
{
144156
Self.TimeZone = timeZone;
145157
return this;
146158
}
159+
147160
public DateHistogramFacetDescriptor<T> TimeZones(string Pre = null, string Post = null)
148161
{
149162
//elasticsearch actually sets timezone in pre_zone so reset timezone in case its set
@@ -153,42 +166,49 @@ public DateHistogramFacetDescriptor<T> TimeZones(string Pre = null, string Post
153166
Self.PostZone = Post;
154167
return this;
155168
}
169+
156170
public DateHistogramFacetDescriptor<T> KeyField(Expression<Func<T, object>> objectPath)
157171
{
158172
objectPath.ThrowIfNull("objectPath");
159173
Self.KeyField = objectPath;
160174
return this;
161175
}
176+
162177
public DateHistogramFacetDescriptor<T> KeyField(string keyField)
163178
{
164179
keyField.ThrowIfNull("keyField");
165180
Self.KeyField = keyField;
166181
return this;
167182
}
183+
168184
public DateHistogramFacetDescriptor<T> KeyScript(string keyScript)
169185
{
170186
keyScript.ThrowIfNull("keyScript");
171187
Self.KeyScript = keyScript;
172188
return this;
173189
}
190+
174191
public DateHistogramFacetDescriptor<T> ValueField(Expression<Func<T, object>> objectPath)
175192
{
176193
objectPath.ThrowIfNull("objectPath");
177194
Self.ValueField = objectPath;
178195
return this;
179196
}
197+
180198
public DateHistogramFacetDescriptor<T> ValueField(string valueField)
181199
{
182200
valueField.ThrowIfNull("valueField");
183201
Self.ValueField = valueField;
184202
return this;
185203
}
204+
186205
public DateHistogramFacetDescriptor<T> ValueScript(string valueScript)
187206
{
188207
valueScript.ThrowIfNull("valueScript");
189208
Self.ValueScript = valueScript;
190209
return this;
191210
}
211+
192212
public DateHistogramFacetDescriptor<T> Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramDictionary)
193213
{
194214
paramDictionary.ThrowIfNull("paramDictionary");

Diff for: src/Nest/DSL/Facets/DateInterval.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+

22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Runtime.Serialization;
@@ -11,6 +11,8 @@ namespace Nest
1111
[JsonConverter(typeof(StringEnumConverter))]
1212
public enum DateInterval
1313
{
14+
[EnumMember(Value = "second")]
15+
Second,
1416
[EnumMember(Value = "minute")]
1517
Minute,
1618
[EnumMember(Value = "hour")]

0 commit comments

Comments
 (0)