typeable/bloodhound
1
0
Fork 0
mirror of https://github.com/typeable/bloodhound.git synced 2024-10-26 08:33:00 +03:00
Code Issues Projects Releases Wiki Activity

Add support for stored scripts with IDs.

Browse Source
This commit is contained in:
Will Jones 2017-07-04 15:09:23 +01:00
parent aeb5de208a
commit dda50b186c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Database/V5/Bloodhound/Types.hs
View File

@ -188,6 +188,7 @@ module Database.V5.Bloodhound.Types
, FunctionScoreFunction(..)
, FunctionScoreScript(..)
, FunctionScoreScriptInline(..)
, FunctionScoreScriptId(..)
, FunctionScoreScriptParams(..)
, FunctionScoreScriptParamName
, FunctionScoreScriptParamValue
@ -1480,13 +1481,17 @@ data FunctionScoreFunction =
deriving (Eq, Read, Show, Generic, Typeable)
data FunctionScoreScript =
FunctionScoreScript { functionScoreScriptInline :: FunctionScoreScriptInline
FunctionScoreScript { functionScoreScriptInline :: Maybe FunctionScoreScriptInline
, functionScoreScriptStored :: Maybe FunctionScoreScriptId
, functionScoreScriptParams :: Maybe FunctionScoreScriptParams
} deriving (Eq, Read, Show, Generic, Typeable)
newtype FunctionScoreScriptInline =
FunctionScoreScriptInline Text deriving (Eq, Read, Show, Generic, Typeable, ToJSON, FromJSON)
newtype FunctionScoreScriptId =
FunctionScoreScriptId Text deriving (Eq, Read, Show, Generic, Typeable, ToJSON, FromJSON)
newtype FunctionScoreScriptParams =
FunctionScoreScriptParams (HM.HashMap FunctionScoreScriptParamName FunctionScoreScriptParamValue)
deriving (Eq, Read, Show, Generic, Typeable)
@ -2951,16 +2956,18 @@ parseFunctionScoreFunction o =
singleFieldValueFactor = pure . FunctionScoreFunctionFieldValueFactor
instance ToJSON FunctionScoreScript where
toJSON (FunctionScoreScript inline params) =
toJSON (FunctionScoreScript inline stored params) =
object [ "script" .= omitNulls base ]
where base = [ "inline" .= inline
, "stored" .= stored
, "params" .= params ]
instance FromJSON FunctionScoreScript where
parseJSON = withObject "FunctionScoreScript" parse
where parse o = o .: "script" >>= \o' ->
FunctionScoreScript
<$> o' .: "inline"
<$> o' .:? "inline"
<*> o' .:? "stored"
<*> o' .:? "params"
instance ToJSON FunctionScoreScriptParams where