From 5b05c4441c4ca21bb2df24c8d2fc9fbd8444c215 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Mon, 12 Oct 2020 07:17:48 +0200 Subject: [PATCH] Refactor listing challenges --- Handler/ListChallenges.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Handler/ListChallenges.hs b/Handler/ListChallenges.hs index 8ca727c..682eacc 100644 --- a/Handler/ListChallenges.hs +++ b/Handler/ListChallenges.hs @@ -8,12 +8,17 @@ getListChallengesR = generalListChallenges [ChallengeArchived !=. Just True] getListArchivedChallengesR :: Handler Html getListArchivedChallengesR = generalListChallenges [ChallengeArchived ==. Just True] +generalListChallenges :: [Filter Challenge] -> Handler Html generalListChallenges filterExpr = do - challenges <- runDB $ selectList filterExpr [Desc ChallengeStarred, Desc ChallengeStamp] + challenges <- getChallenges filterExpr defaultLayout $ do setTitle "List challenges" $(widgetFile "list-challenges") +getChallenges :: [Filter Challenge] -> Handler [Entity Challenge] +getChallenges filterExpr = runDB $ selectList filterExpr [Desc ChallengeStarred, Desc ChallengeStamp] + +listChallengesCore :: [Entity Challenge] -> Widget listChallengesCore challenges = $(widgetFile "list-challenges-core") getChallengeImageR :: ChallengeId -> Handler Html