refactor: move entrypoint to Main

Author: thelissimus

app/Main.hs

@@ -1,6 +1,38 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE ImplicitParams #-}
+{-# LANGUAGE OverloadedStrings #-}
+
 module Main (main) where
 
-import Clinic qualified
+import Clinic.API (app)
+import Clinic.Database (migrate')
+
+import Control.Monad.Logger (NoLoggingT (runNoLoggingT))
+
+import Data.ByteString (ByteString)
+import Data.Kind (Type)
+
+import Database.Persist.Postgresql (createPostgresqlPool)
+
+import Network.Wai.Handler.Warp (run)
+
+import Options.Generic
+
+type Opts :: Type -> Type
+data Opts w = MkOpts
+  { port :: !(w ::: Int <?> "Port to listen on" <!> "8080" <#> "p")
+  , dbUrl :: !(w ::: ByteString <?> "Database connection string" <#> "u")
+  , dbPoolSize :: !(w ::: Int <?> "Database pool size" <!> "10" <#> "s")
+  }
+  deriving stock (Generic)
+
+deriving anyclass instance ParseRecord (Opts Wrapped)
+deriving stock instance Show (Opts Unwrapped)
 
 main :: IO ()
-main = Clinic.main
+main = do
+  (opts :: Opts Unwrapped) <- unwrapRecord "Clinic API"
+  pool <- runNoLoggingT $ createPostgresqlPool opts.dbUrl opts.dbPoolSize
+  let ?pool = pool
+  migrate'
+  run opts.port app

clinic.cabal

@@ -31,14 +31,10 @@ library
 
   build-depends:
     , aeson
-    , base                   ^>=4.17.2.1
-    , bytestring
+    , base            ^>=4.17.2.1
     , esqueleto
-    , monad-logger
     , mtl
-    , optparse-generic
     , persistent
-    , persistent-postgresql
     , resource-pool
     , servant
     , servant-server
@@ -47,16 +43,20 @@ library
     , time
     , transformers
     , unliftio
-    , warp
 
   hs-source-dirs:  src
 
 executable clinic
   import:         defaults, warnings
   main-is:        Main.hs
   build-depends:
-    , base    ^>=4.17.2.1
+    , base                   ^>=4.17.2.1
+    , bytestring
     , clinic
+    , monad-logger
+    , optparse-generic
+    , persistent-postgresql
+    , warp
 
   hs-source-dirs: app
 

src/Clinic.hs

@@ -1,39 +1,7 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE ImplicitParams #-}
-{-# LANGUAGE OverloadedStrings #-}
+module Clinic (
+  module Clinic.API,
+  module Clinic.Database,
+) where
 
-module Clinic (main) where
-
-import Clinic.API (app)
-import Clinic.Database (migrate')
-
-import Control.Monad.Logger (NoLoggingT (runNoLoggingT))
-
-import Data.Kind (Type)
-
-import Database.Persist.Postgresql (createPostgresqlPool)
-
-import Network.Wai.Handler.Warp (run)
-
-import Options.Generic
-
-import Data.ByteString (ByteString)
-
-type Opts :: Type -> Type
-data Opts w = MkOpts
-  { port :: !(w ::: Int <?> "Port to listen on" <!> "8080" <#> "p")
-  , dbUrl :: !(w ::: ByteString <?> "Database connection string" <#> "u")
-  , dbPoolSize :: !(w ::: Int <?> "Database pool size" <!> "10" <#> "s")
-  }
-  deriving stock (Generic)
-
-deriving anyclass instance ParseRecord (Opts Wrapped)
-deriving stock instance Show (Opts Unwrapped)
-
-main :: IO ()
-main = do
-  (opts :: Opts Unwrapped) <- unwrapRecord "Clinic API"
-  pool <- runNoLoggingT $ createPostgresqlPool opts.dbUrl opts.dbPoolSize
-  let ?pool = pool
-  migrate'
-  run opts.port app
+import Clinic.API
+import Clinic.Database