From 0a41a9d5268379875c21949ba05036f874de703c Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Fri, 17 Jun 2022 11:47:15 -0600 Subject: [PATCH] augment default per page limit and parse it as int --- src/Handler/Marketplace.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Handler/Marketplace.hs b/src/Handler/Marketplace.hs index 776ac5e..568dca4 100644 --- a/src/Handler/Marketplace.hs +++ b/src/Handler/Marketplace.hs @@ -5,6 +5,7 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeApplications #-} +{-# LANGUAGE ScopedTypeVariables #-} {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-} {-# HLINT ignore "Redundant <$>" #-} @@ -335,7 +336,7 @@ getPackageListR = do PackageListRes <$> mapConcurrently constructPackageListApiRes pkgsWithDependencies where defaults = PackageListDefaults { packageListOrder = DESC - , packageListPageLimit = 20 + , packageListPageLimit = 100 , packageListPageNumber = 1 , packageListCategory = Nothing , packageListQuery = "" @@ -372,12 +373,11 @@ getPackageListR = do getLimitQuery :: Handler Int getLimitQuery = lookupGetParam "per-page" >>= \case Nothing -> pure $ packageListPageLimit defaults - Just pp -> case readMaybe pp of + Just pp-> case readMaybe pp of Nothing -> do let e = InvalidParamsE "get:per-page" pp - $logWarn (show e) sendResponseStatus status400 e - Just l -> pure l + Just (l :: Int) -> pure l getOsVersionQuery :: Handler (Maybe VersionRange) getOsVersionQuery = lookupGetParam "eos-version-compat" >>= \case Nothing -> pure Nothing