adyxax/spacetraders
1
0
Fork 0
Code Issues Activity

[haskell] Simplify API Message JSON decoding

Browse source
This commit is contained in:
Julien Dessaux 2023-07-09 05:49:09 +02:00
parent f23fe74dbe
commit d829fa5ca2
Signed by: adyxax
GPG key ID: F92E51B86E07177E
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
haskell/src/SpaceTraders/APIClient/Client.hs
View file

@ -22,8 +22,8 @@ import Network.HTTP.Types.Status
import SpaceTraders.APIClient.Errors import SpaceTraders.APIClient.Errors
data APIMessage = APIMessage { data_ :: Value } deriving (Show) data FromJSON a => APIMessage a = APIMessage { data_ :: a } deriving (Show)
instance FromJSON APIMessage where instance FromJSON a => FromJSON (APIMessage a) where
parseJSON (Object o) = APIMessage <$> o .: "data" parseJSON (Object o) = APIMessage <$> o .: "data"
parseJSON _ = mzero parseJSON _ = mzero
@ -49,9 +49,7 @@ send request = do
if status >= 200 && status <= 299 if status >= 200 && status <= 299
then case eitherDecode body of then case eitherDecode body of
Left e -> return . Left $ APIError (-1000) Null (T.pack $ concat ["Error decoding JSON APIMessage: ", e]) Left e -> return . Left $ APIError (-1000) Null (T.pack $ concat ["Error decoding JSON APIMessage: ", e])
Right r -> case fromJSONValue (data_ r) of Right r -> return . Right $ data_ r
Left e -> return . Left $ APIError (-1001) Null (T.pack $ concat ["Error decoding JSON message contents: ", e])
Right m -> return $ Right m
else case eitherDecode body of else case eitherDecode body of
Left e -> return . Left $ APIError (-status) Null (T.pack $ concat ["Error decoding JSON APIError: ", e, ". Got HTTP body: ", show body]) Left e -> return . Left $ APIError (-status) Null (T.pack $ concat ["Error decoding JSON APIError: ", e, ". Got HTTP body: ", show body])
Right e -> case apiErrorCode e of Right e -> case apiErrorCode e of