Commit a50b228a authored by Alfredo Di Napoli's avatar Alfredo Di Napoli

Remove NoUserFound error constructor

parent 144dce2d
...@@ -128,8 +128,6 @@ nodeErrorToFrontendError ne = case ne of ...@@ -128,8 +128,6 @@ nodeErrorToFrontendError ne = case ne of
-> mkFrontendErrShow FE_node_root_not_found -> mkFrontendErrShow FE_node_root_not_found
NoCorpusFound NoCorpusFound
-> mkFrontendErrShow FE_node_corpus_not_found -> mkFrontendErrShow FE_node_corpus_not_found
NoUserFound _ur
-> undefined
NodeCreationFailed reason NodeCreationFailed reason
-> case reason of -> case reason of
UserParentAlreadyExists pId uId UserParentAlreadyExists pId uId
...@@ -175,7 +173,6 @@ showAsServantJSONErr :: BackendInternalError -> ServerError ...@@ -175,7 +173,6 @@ showAsServantJSONErr :: BackendInternalError -> ServerError
showAsServantJSONErr (InternalNodeError err@(NoListFound {})) = err404 { errBody = JSON.encode err } showAsServantJSONErr (InternalNodeError err@(NoListFound {})) = err404 { errBody = JSON.encode err }
showAsServantJSONErr (InternalNodeError err@NoRootFound{}) = err404 { errBody = JSON.encode err } showAsServantJSONErr (InternalNodeError err@NoRootFound{}) = err404 { errBody = JSON.encode err }
showAsServantJSONErr (InternalNodeError err@NoCorpusFound) = err404 { errBody = JSON.encode err } showAsServantJSONErr (InternalNodeError err@NoCorpusFound) = err404 { errBody = JSON.encode err }
showAsServantJSONErr (InternalNodeError err@NoUserFound{}) = err404 { errBody = JSON.encode err }
showAsServantJSONErr (InternalNodeError err@(DoesNotExist {})) = err404 { errBody = JSON.encode err } showAsServantJSONErr (InternalNodeError err@(DoesNotExist {})) = err404 { errBody = JSON.encode err }
showAsServantJSONErr (InternalServerError err) = err showAsServantJSONErr (InternalServerError err) = err
showAsServantJSONErr a = err500 { errBody = JSON.encode a } showAsServantJSONErr a = err500 { errBody = JSON.encode a }
...@@ -73,7 +73,6 @@ renderNodeLookupFailed = \case ...@@ -73,7 +73,6 @@ renderNodeLookupFailed = \case
data NodeError = NoListFound ListId data NodeError = NoListFound ListId
| NoRootFound | NoRootFound
| NoCorpusFound | NoCorpusFound
| NoUserFound User
| NodeCreationFailed NodeCreationError | NodeCreationFailed NodeCreationError
| NodeLookupFailed NodeLookupError | NodeLookupFailed NodeLookupError
| NotImplYet | NotImplYet
...@@ -88,7 +87,6 @@ instance Prelude.Show NodeError ...@@ -88,7 +87,6 @@ instance Prelude.Show NodeError
show (NoListFound {}) = "No list found" show (NoListFound {}) = "No list found"
show NoRootFound = "No root found" show NoRootFound = "No root found"
show NoCorpusFound = "No corpus found" show NoCorpusFound = "No corpus found"
show (NoUserFound ur) = "User(" <> T.unpack (renderUser ur) <> ") not found"
show (NodeCreationFailed reason) = "Cannot make node due to: " <> T.unpack (renderNodeCreationFailed reason) show (NodeCreationFailed reason) = "Cannot make node due to: " <> T.unpack (renderNodeCreationFailed reason)
show NotImplYet = "Not implemented yet" show NotImplYet = "Not implemented yet"
...@@ -108,9 +106,6 @@ instance ToJSON NodeError where ...@@ -108,9 +106,6 @@ instance ToJSON NodeError where
toJSON (NodeError e) = toJSON (NodeError e) =
object [ ( "error", "Node error" ) object [ ( "error", "Node error" )
, ( "exception", toJSON $ T.pack $ show e ) ] , ( "exception", toJSON $ T.pack $ show e ) ]
toJSON (NoUserFound ur) =
object [ ( "error", "No user found" )
, ( "user", toJSON ur ) ]
toJSON (NodeCreationFailed reason) = toJSON (NodeCreationFailed reason) =
object [ ( "error", "Node creation failed" ) object [ ( "error", "Node creation failed" )
, ( "reason", toJSON reason ) ] , ( "reason", toJSON reason ) ]
......
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