@@ -162,8 +162,8 @@ module Database.Bloodhound.Types
162162 , BucketAggregation(..)
163163 , TermsAggregation(..)
164164 , DateHistogramAggregation(..)
165− , TermsResult
166− , DateHistogramResult
165+ , TermsResult(..)
166+ , DateHistogramResult(..)
167167 ) where
168168
169169import Control.Applicative
@@ -1080,7 +1080,7 @@ instance Show TimeInterval where
10801080 show Seconds = "s"
10811081
10821082instance ToJSON Aggregation where
1083− toJSON (TermsAgg (TermsAggregation term include exclude order minDocCount size shardSize collectMode executionHint aggs)) =
1083+ toJSON (TermsAgg (TermsAggregation term include exclude order minDocCount size shardSize collectMode executionHint termAggs)) =
10841084 omitNulls ["terms" .= omitNulls [ toJSON' term,
10851085 "include" .= toJSON include,
10861086 "exclude" .= toJSON exclude,
@@ -1091,11 +1091,11 @@ instance ToJSON Aggregation where
10911091 "collect_mode" .= toJSON collectMode,
10921092 "execution_hint" .= toJSON executionHint
10931093 ],
1094− "aggs" .= toJSON aggs ]
1094+ "aggs" .= toJSON termAggs ]
10951095 where
10961096 toJSON' x = case x of { Left y -> "field" .= toJSON y; Right y -> "script" .= toJSON y }
10971097
1098− toJSON (DateHistogramAgg (DateHistogramAggregation field interval format preZone postZone preOffset postOffset aggs)) =
1098+ toJSON (DateHistogramAgg (DateHistogramAggregation field interval format preZone postZone preOffset postOffset dateHistoAggs)) =
10991099 omitNulls ["date_histogram" .= omitNulls [ "field" .= toJSON field,
11001100 "interval" .= toJSON interval,
11011101 "format" .= toJSON format,
@@ -1104,7 +1104,7 @@ instance ToJSON Aggregation where
11041104 "pre_offset" .= toJSON preOffset,
11051105 "post_offset" .= toJSON postOffset
11061106 ],
1107− "aggs" .= toJSON aggs ]
1107+ "aggs" .= toJSON dateHistoAggs ]
11081108
11091109type AggregationResults = M.Map Text Value
11101110
@@ -1153,6 +1153,7 @@ instance FromJSON TermsResult where
11531153 v .: "key" <*>
11541154 v .: "doc_count" <*>
11551155 v .:? "aggregations"
1156+ parseJSON _ = mempty
11561157
11571158instance FromJSON DateHistogramResult where
11581159 parseJSON (Object v) = DateHistogramResult <$>
@@ -1160,6 +1161,7 @@ instance FromJSON DateHistogramResult where
11601161 v .:? "key_as_string" <*>
11611162 v .: "doc_count" <*>
11621163 v .:? "aggregations"
1164+ parseJSON _ = mempty
11631165
11641166instance Monoid Filter where
11651167 mempty = IdentityFilter
@@ -1244,11 +1246,11 @@ instance ToJSON Filter where
12441246 toJSON (RangeFilter (FieldName fieldName) (Left halfRange) rangeExecution cache) =
12451247 object ["range" .=
12461248 object [fieldName .=
1247− object [key .= val]
1249+ object [rqFKey .= rqFVal]
12481250 , "execution" .= toJSON rangeExecution
12491251 , "_cache" .= cache]]
12501252 where
1251− (key, val) = halfRangeToKV halfRange
1253+ (rqFKey, rqFVal) = halfRangeToKV halfRange
12521254
12531255 toJSON (RangeFilter (FieldName fieldName) (Right range) rangeExecution cache) =
12541256 object ["range" .=
@@ -1462,8 +1464,8 @@ instance ToJSON RangeQuery where
14621464 toJSON (RangeQuery (FieldName fieldName) (Left halfRange) boost) =
14631465 object [ fieldName .= conjoined ]
14641466 where conjoined = [ "boost" .= toJSON boost
1465− , key .= val ]
1466− (key, val) = halfRangeToKV halfRange
1467+ , rqKey .= rqVal ]
1468+ (rqKey, rqVal) = halfRangeToKV halfRange
14671469
14681470
14691471instance ToJSON PrefixQuery where
@@ -1754,11 +1756,11 @@ instance (FromJSON a) => FromJSON (EsResult a) where
17541756
17551757
17561758instance ToJSON Search where
1757− toJSON (Search query sFilter sort aggs sTrackSortScores sFrom sSize) =
1759+ toJSON (Search query sFilter sort searchAggs sTrackSortScores sFrom sSize) =
17581760 omitNulls [ "query" .= query
17591761 , "filter" .= sFilter
17601762 , "sort" .= sort
1761− , "aggregations" .= aggs
1763+ , "aggregations" .= searchAggs
17621764 , "from" .= sFrom
17631765 , "size" .= sSize
17641766 , "track_scores" .= sTrackSortScores ]