Add config to web service actions

libro-app · Feb 19, 2024 · 4ad8bc5 · 4ad8bc5
1 parent 9de8070
commit 4ad8bc5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/lib/LiBro/WebService.hs b/lib/LiBro/WebService.hs
@@ -1,5 +1,6 @@
 module LiBro.WebService where
 
+import LiBro.Config
 import Data.Aeson
 import Data.Proxy
 import Servant
@@ -11,19 +12,18 @@ instance ToJSON PersonIDs
 type LiBroAPI = "hello" :> Get '[JSON]      PersonIDs
           :<|>  "yay"   :> Get '[PlainText] String
 
-libroServer :: Server LiBroAPI
-libroServer =     handleHello
-            :<|>  handleYay
+libroServer :: Config -> Server LiBroAPI
+libroServer cfg =     handleHello cfg
+                :<|>  handleYay
   where
-        handleHello :: Handler PersonIDs
-        handleHello = return $ PersonIDs [17, 42]
+        handleHello :: Config -> Handler PersonIDs
+        handleHello cfg = return $ PersonIDs [17, 42]
 
         handleYay :: Handler String
         handleYay = return "Yay!"
 
 libroApi :: Proxy LiBroAPI
 libroApi = Proxy
 
-libro :: Application
-libro = serve libroApi libroServer
-
+libro :: Config -> Application
+libro = serve libroApi . libroServer
diff --git a/server/Main.hs b/server/Main.hs
@@ -5,10 +5,10 @@ import LiBro.WebService
 import Network.Wai.Handler.Warp
 
 configuredMain :: Config -> IO ()
-configuredMain config = do
-  let port = Conf.port $ Conf.server config
+configuredMain cfg = do
+  let port = Conf.port $ Conf.server cfg
   putStrLn $ "Serving LiBro backend on port " ++ show port ++ "."
-  run port libro
+  run port (libro cfg)
 
 main :: IO ()
 main = readConfig >>= maybe complain configuredMain

diff --git a/test/LiBro/WebServiceSpec.hs b/test/LiBro/WebServiceSpec.hs
@@ -5,15 +5,17 @@ import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 import Test.Hspec.Wai.QuickCheck
 
+import LiBro.Config
 import LiBro.WebService
+import Data.Default
 import Data.ByteString
 
 spec :: Spec
 spec = describe "RESTful JSON web service" $ do
   helloLibro
 
 helloLibro :: Spec
-helloLibro = describe "Dummy: hello libro!" $ with (return libro) $ do
+helloLibro = describe "Dummy: hello libro!" $ with (return cfgLibro) $ do
 
   describe "Yay endpoint" $ do
     it "Respond with 200 greeting" $ do
@@ -30,3 +32,5 @@ helloLibro = describe "Dummy: hello libro!" $ with (return libro) $ do
       property $ \endpoint ->
         show endpoint /= "hello" ==>
         get (pack endpoint) `shouldRespondWith` 404
+
+  where cfgLibro = libro $ Config def def