From ea82d75a0934f8e13f26af5cb8a06c11d32dc0c5 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 24 Apr 2023 15:15:14 +0000 Subject: [PATCH] fix(build): remove redundant constraints --- src/Foundation/Yesod/ErrorHandler.hs | 12 ++++++------ src/Utils/Avs.hs | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Foundation/Yesod/ErrorHandler.hs b/src/Foundation/Yesod/ErrorHandler.hs index a8edfbccf..769f65faf 100644 --- a/src/Foundation/Yesod/ErrorHandler.hs +++ b/src/Foundation/Yesod/ErrorHandler.hs @@ -9,9 +9,9 @@ module Foundation.Yesod.ErrorHandler import Import.NoFoundation hiding (errorHandler) import Foundation.Type -import Foundation.I18n +-- import Foundation.I18n import Foundation.Authorization -import Foundation.SiteLayout +-- import Foundation.SiteLayout import Foundation.Routes import Foundation.DB @@ -20,15 +20,15 @@ import qualified Data.Text as Text import qualified Network.Wai as W -import System.Exit -- DEBUG: just for testing -import System.Posix.Process -- DEBUG: just for testing +-- import System.Exit -- DEBUG: just for testing +-- import System.Posix.Process -- DEBUG: just for testing errorHandler :: ( MonadSecretBox (HandlerFor UniWorX) - , MonadSecretBox (WidgetFor UniWorX) + -- , MonadSecretBox (WidgetFor UniWorX) , MonadSecretBox (ExceptT EncodedSecretBoxException (HandlerFor UniWorX)) , MonadAuth (HandlerFor UniWorX) , BearerAuthSite UniWorX - , YesodPersistBackend UniWorX ~ SqlBackend + -- , YesodPersistBackend UniWorX ~ SqlBackend ) => ErrorResponse -> HandlerFor UniWorX TypedContent errorHandler err = do diff --git a/src/Utils/Avs.hs b/src/Utils/Avs.hs index 1a978eb45..00580b26a 100644 --- a/src/Utils/Avs.hs +++ b/src/Utils/Avs.hs @@ -32,10 +32,10 @@ type AVSGetRampLicences = "RampDrivingLicenceInfo" :> ReqBody '[JSON] AvsQueryG type AVSSetRampLicences = "RampDrivingLicence" :> ReqBody '[JSON] AvsQuerySetLicences :> Post '[JSON] AvsResponseSetLicences avsMaxSetLicenceAtOnce :: Int -avsMaxSetLicenceAtOnce = 99 -- maximum input set size for avsQuerySetLicences as enforced by AVS +avsMaxSetLicenceAtOnce = 90 -- maximum input set size for avsQuerySetLicences as enforced by AVS avsMaxGetStatusAtOnce :: Int -avsMaxGetStatusAtOnce = 990 -- maximum input set size for avsQueryStatus as enforced by AVS +avsMaxGetStatusAtOnce = 900 -- maximum input set size for avsQueryStatus as enforced by AVS avsApi :: Proxy AVS @@ -105,6 +105,16 @@ mkAvsQuery baseUrl basicAuth cliEnv = AvsQuery res1 <- rawQueryStatus (AvsQueryStatus avid_1) res2 <- splitQueryStatus (AvsQueryStatus avid_2) return $ res1 <> res2 + + -- splitQuery :: (a -> Set b) -> (Set b -> a) -> (a -> ClientM c) -> a -> ClientM c + -- splitQuery toSet fromSet rawQuery q + -- | Set.size (toSet q) <= avsMaxGetStatusAtOnce = rawQueryStatus q + -- | otherwise = do + -- let (fromSet -> avid_1,fromSet -> avid_2) = Set.splitAt avsMaxGetStatusAtOnce (toSet q) + -- res1 <- rawQuery avid_1 + -- res2 <- splitQuery toSet fromSet rawQuery avid_2 + -- return $ fromSet (toSet res1 <> toSet res2) + #endif -----------------------