[search] remove SearchResultErr/SearchQueryErr

parent c2a50fcf
...@@ -66,7 +66,6 @@ api nId (SearchQuery q SearchContact) o l order = do ...@@ -66,7 +66,6 @@ api nId (SearchQuery q SearchContact) o l order = do
<$> SearchResultContact <$> SearchResultContact
<$> map (toRow aId) <$> map (toRow aId)
<$> searchInCorpusWithContacts nId aId q o l order <$> searchInCorpusWithContacts nId aId q o l order
api _ _ _ _ _ = panic "[G.A.Search.api] undefined"
----------------------------------------------------------------------- -----------------------------------------------------------------------
----------------------------------------------------------------------- -----------------------------------------------------------------------
...@@ -74,15 +73,12 @@ api _ _ _ _ _ = panic "[G.A.Search.api] undefined" ...@@ -74,15 +73,12 @@ api _ _ _ _ _ = panic "[G.A.Search.api] undefined"
----------------------------------------------------------------------- -----------------------------------------------------------------------
data SearchType = SearchDoc | SearchContact data SearchType = SearchDoc | SearchContact
deriving (Generic) deriving (Generic)
instance FromJSON SearchType instance FromJSON SearchType
where where
parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField }) parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
instance ToJSON SearchType instance ToJSON SearchType
where where
toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField }) toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
instance ToSchema SearchType instance ToSchema SearchType
instance Arbitrary SearchType where instance Arbitrary SearchType where
arbitrary = elements [SearchDoc, SearchContact] arbitrary = elements [SearchDoc, SearchContact]
...@@ -92,17 +88,13 @@ data SearchQuery = ...@@ -92,17 +88,13 @@ data SearchQuery =
SearchQuery { query :: ![Text] SearchQuery { query :: ![Text]
, expected :: !SearchType , expected :: !SearchType
} }
| SearchQueryErr !Text
deriving (Generic) deriving (Generic)
instance FromJSON SearchQuery instance FromJSON SearchQuery
where where
parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField }) parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
instance ToJSON SearchQuery instance ToJSON SearchQuery
where where
toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField }) toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
instance ToSchema SearchQuery instance ToSchema SearchQuery
{- {-
where where
...@@ -115,7 +107,6 @@ instance Arbitrary SearchQuery where ...@@ -115,7 +107,6 @@ instance Arbitrary SearchQuery where
----------------------------------------------------------------------- -----------------------------------------------------------------------
data SearchResult = data SearchResult =
SearchResult { result :: !SearchResultTypes} SearchResult { result :: !SearchResultTypes}
| SearchResultErr !Text
deriving (Generic) deriving (Generic)
instance FromJSON SearchResult instance FromJSON SearchResult
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment