s464900/gonito
1
0
Fork 0
forked from filipg/gonito
Code Issues Pull Requests Projects Releases Wiki Activity

Add info about the image

Browse Source
This commit is contained in:
Filip Gralinski 2021-02-08 20:52:12 +01:00
parent 25761dbcf6
commit fb29ba8114
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Handler/ListChallenges.hs
View File

@ -8,10 +8,8 @@ import Import hiding (get, fromList, Proxy)
import Data.HashMap.Strict.InsOrd (fromList) import Data.HashMap.Strict.InsOrd (fromList)
import Data.Proxy import Data.Proxy
import Data.Aeson
import Control.Lens hiding ((.=)) import Control.Lens hiding ((.=))
import Data.Swagger import Data.Swagger
import Data.Swagger.Lens
import Data.Swagger.Declare import Data.Swagger.Declare
mainCondition :: [Filter Challenge] mainCondition :: [Filter Challenge]
@ -44,13 +42,20 @@ getListChallengesJsonR = generalListChallengesJson mainCondition
getListArchivedChallengesR :: Handler Html getListArchivedChallengesR :: Handler Html
getListArchivedChallengesR = generalListChallenges [ChallengeArchived ==. Just True] getListArchivedChallengesR = generalListChallenges [ChallengeArchived ==. Just True]
imageUrl :: Entity Challenge -> Maybe (Route App)
imageUrl (Entity challengeId challenge) =
case challengeImage challenge of
Just _ -> Just $ ChallengeImageR challengeId
Nothing -> Nothing
instance ToJSON (Entity Challenge) where instance ToJSON (Entity Challenge) where
toJSON (Entity _ ch) = object toJSON chEnt@(Entity _ ch) = object
[ "name" .= challengeName ch [ "name" .= challengeName ch
, "title" .= challengeTitle ch , "title" .= challengeTitle ch
, "description" .= challengeDescription ch , "description" .= challengeDescription ch
, "starred" .= challengeStarred ch , "starred" .= challengeStarred ch
, "archived" .= challengeArchived ch , "archived" .= challengeArchived ch
, "imageUrl" .= (("/" <>) <$> intercalate "/" <$> fst <$> renderRoute <$> imageUrl chEnt)
] ]
instance ToSchema (Entity Challenge) where instance ToSchema (Entity Challenge) where
@ -65,6 +70,7 @@ instance ToSchema (Entity Challenge) where
, ("description", stringSchema) , ("description", stringSchema)
, ("starred", booleanSchema) , ("starred", booleanSchema)
, ("archived", booleanSchema) , ("archived", booleanSchema)
, ("imageUrl", stringSchema)
] ]
& required .~ [ "name", "title", "description", "starred", "archived" ] & required .~ [ "name", "title", "description", "starred", "archived" ]

2
config/routes
View File

@ -19,7 +19,7 @@
/api/add-user AddUserR GET /api/add-user AddUserR GET
/api/challenge-submission/#Text ChallengeSubmissionJsonR POST /api/challenge-submission/#Text ChallengeSubmissionJsonR POST
/api/challenge-readme/#Text/markdown ChallengeReadmeInMarkdownR GET /api/challenge-readme/#Text/markdown ChallengeReadmeInMarkdownR GET
/challenge-image/#ChallengeId ChallengeImageR GET /api/challenge-image/#ChallengeId ChallengeImageR GET
/list-archived-challenges ListArchivedChallengesR GET /list-archived-challenges ListArchivedChallengesR GET
/challenge/#Text ShowChallengeR GET /challenge/#Text ShowChallengeR GET