[#72] Update multiple files, clean up (#76)

Resolves #72

.gitignore

@@ -1,3 +1,4 @@
+### Haskell
 dist
 dist-*
 cabal-dev
@@ -7,22 +8,47 @@ cabal-dev
 *.chs.h
 *.dyn_o
 *.dyn_hi
-.hpc
-.hsenv
-.cabal-sandbox/
-cabal.sandbox.config
 *.prof
 *.aux
 *.hp
 *.eventlog
-.stack-work/
+.virtualenv
+.hsenv
+.hpc
+.cabal-sandbox/
+cabal.sandbox.config
+cabal.config
 cabal.project.local
-cabal.project.local~
-.HTF/
 .ghc.environment.*
+.HTF/
+# Stack
+.stack-work/
+stack.yaml.lock
+
+### IDE/support
+# Vim
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+*~
+tags
+
+# IntellijIDEA
+.idea/
+.ideaHaskellLib/
+*.iml
+
+# Atom
+.haskell-ghc-mod.json
+
+# VS
+.vscode/
 
-# emacs tags for go-to-deifinition
+# Emacs
+*#
+.dir-locals.el
 TAGS
 
-# Mac
-.DS_Store
+# other
+.DS_Store

.stylish-haskell.yaml

@@ -1,242 +1,56 @@
-# Default stylish-haskell configuration file in Serokell.
-# It's based on default config provided by `stylish-haskell --defaults` but has some changes
-# ==================================
-
-# The stylish-haskell tool is mainly configured by specifying steps. These steps
-# are a list, so they have an order, and one specific step may appear more than
-# once (if needed). Each file is processed by these steps in the given order.
 steps:
-  # Convert some ASCII sequences to their Unicode equivalents. This is disabled
-  # by default.
-  # - unicode_syntax:
-  #     # In order to make this work, we also need to insert the UnicodeSyntax
-  #     # language pragma. If this flag is set to true, we insert it when it's
-  #     # not already present. You may want to disable it if you configure
-  #     # language extensions using some other method than pragmas. Default:
-  #     # true.
-  #     add_language_pragma: true
-
-  # Align the right hand side of some elements.  This is quite conservative
-  # and only applies to statements where each element occupies a single
-  # line.
   - simple_align:
       cases: true
       top_level_patterns: true
       records: true
 
   # Import cleanup
   - imports:
-      # There are different ways we can align names and lists.
-      #
-      # - global: Align the import names and import list throughout the entire
-      #   file.
-      #
-      # - file: Like global, but don't add padding when there are no qualified
-      #   imports in the file.
-      #
-      # - group: Only align the imports per group (a group is formed by adjacent
-      #   import lines).
-      #
-      # - none: Do not perform any alignment.
-      #
-      # Default: global.
       align: none
-
-      # The following options affect only import list alignment.
-      #
-      # List align has following options:
-      #
-      # - after_alias: Import list is aligned with end of import including
-      #   'as' and 'hiding' keywords.
-      #
-      #   > import qualified Data.List      as List (concat, foldl, foldr, head,
-      #   >                                          init, last, length)
-      #
-      # - with_alias: Import list is aligned with start of alias or hiding.
-      #
-      #   > import qualified Data.List      as List (concat, foldl, foldr, head,
-      #   >                                 init, last, length)
-      #
-      # - new_line: Import list starts always on new line.
-      #
-      #   > import qualified Data.List      as List
-      #   >     (concat, foldl, foldr, head, init, last, length)
-      #
-      # Default: after_alias
       list_align: after_alias
-
-      # Right-pad the module names to align imports in a group:
-      #
-      # - true: a little more readable
-      #
-      #   > import qualified Data.List       as List (concat, foldl, foldr,
-      #   >                                           init, last, length)
-      #   > import qualified Data.List.Extra as List (concat, foldl, foldr,
-      #   >                                           init, last, length)
-      #
-      # - false: diff-safe
-      #
-      #   > import qualified Data.List as List (concat, foldl, foldr, init,
-      #   >                                     last, length)
-      #   > import qualified Data.List.Extra as List (concat, foldl, foldr,
-      #   >                                           init, last, length)
-      #
-      # Default: true
-      #
-      # Note: we intentionally disable it to make diffs smaller and reduce
-      # number of merge conflicts.
       pad_module_names: false
-
-      # Long list align style takes effect when import is too long. This is
-      # determined by 'columns' setting.
-      #
-      # - inline: This option will put as much specs on same line as possible.
-      #
-      # - new_line: Import list will start on new line.
-      #
-      # - new_line_multiline: Import list will start on new line when it's
-      #   short enough to fit to single line. Otherwise it'll be multiline.
-      #
-      # - multiline: One line per import list entry.
-      #   Type with constructor list acts like single import.
-      #
-      #   > import qualified Data.Map as M
-      #   >     ( empty
-      #   >     , singleton
-      #   >     , ...
-      #   >     , delete
-      #   >     )
-      #
-      # Default: inline
       long_list_align: inline
-
-      # Align empty list (importing instances)
-      #
-      # Empty list align has following options
-      #
-      # - inherit: inherit list_align setting
-      #
-      # - right_after: () is right after the module name:
-      #
-      #   > import Vector.Instances ()
-      #
-      # Default: inherit
       empty_list_align: inherit
-
-      # List padding determines indentation of import list on lines after import.
-      # This option affects 'long_list_align'.
-      #
-      # - <integer>: constant value
-      #
-      # - module_name: align under start of module name.
-      #   Useful for 'file' and 'group' align settings.
       list_padding: 4
-
-      # Separate lists option affects formatting of import list for type
-      # or class. The only difference is single space between type and list
-      # of constructors, selectors and class functions.
-      #
-      # - true: There is single space between Foldable type and list of it's
-      #   functions.
-      #
-      #   > import Data.Foldable (Foldable (fold, foldl, foldMap))
-      #
-      # - false: There is no space between Foldable type and list of it's
-      #   functions.
-      #
-      #   > import Data.Foldable (Foldable(fold, foldl, foldMap))
-      #
-      # Default: true
       separate_lists: true
-
-      # Space surround option affects formatting of import lists on a single
-      # line. The only difference is single space after the initial
-      # parenthesis and a single space before the terminal parenthesis.
-      #
-      # - true: There is single space associated with the enclosing
-      #   parenthesis.
-      #
-      #   > import Data.Foo ( foo )
-      #
-      # - false: There is no space associated with the enclosing parenthesis
-      #
-      #   > import Data.Foo (foo)
-      #
-      # Default: false
       space_surround: false
 
-  # Language pragmas
   - language_pragmas:
-      # We can generate different styles of language pragma lists.
-      #
-      # - vertical: Vertical-spaced language pragmas, one per line.
-      #
-      # - compact: A more compact style.
-      #
-      # - compact_line: Similar to compact, but wrap each line with
-      #   `{-#LANGUAGE #-}'.
-      #
-      # Default: vertical.
       style: vertical
-
-      # stylish-haskell can detect redundancy of some language pragmas. If this
-      # is set to true, it will remove those redundant pragmas. Default: true.
       remove_redundant: true
 
-  # Replace tabs by spaces. This is disabled by default.
-  # - tabs:
-  #     # Number of spaces to use for each tab. Default: 8, as specified by the
-  #     # Haskell report.
-  #     spaces: 8
-
   # Remove trailing whitespace
   - trailing_whitespace: {}
 
-# A common setting is the number of columns (parts of) code will be wrapped
-# to. Different steps take this into account. Default: 80.
-#
-# Note: we set it to 100 because it reduces verbosity of diffs and
-# number of conflicts when we merge something.
 columns: 100
 
-# By default, line endings are converted according to the OS. You can override
-# preferred format here.
-#
-# - native: Native newline format. CRLF on Windows, LF on other OSes.
-#
-# - lf: Convert to LF ("\n").
-#
-# - crlf: Convert to CRLF ("\r\n").
-#
-# Default: native.
 newline: native
 
-# These syntax-affecting language extensions are enabled so that
-# stylish-haskell wouldn't fail with parsing errors when processing files
-# in projects that have those extensions enabled in the .cabal file
-# rather than locally.
-#
-# To my best knowledge, no harm should result from enabling an extension
-# that isn't actually used in the file/project. —@neongreen
 language_extensions:
   - BangPatterns
   - ConstraintKinds
   - DataKinds
   - DefaultSignatures
+  - DeriveAnyClass
   - DeriveDataTypeable
   - DeriveGeneric
+  - DerivingStrategies
+  - DerivingVia
+  - ExplicitNamespaces
   - FlexibleContexts
   - FlexibleInstances
   - FunctionalDependencies
   - GADTs
   - GeneralizedNewtypeDeriving
   - InstanceSigs
+  - KindSignatures
   - LambdaCase
   - MultiParamTypeClasses
   - MultiWayIf
   - NamedFieldPuns
   - NoImplicitPrelude
   - OverloadedStrings
+  - QuasiQuotes
   - RecordWildCards
   - ScopedTypeVariables
   - StandaloneDeriving

sql/schema.sql

@@ -1,6 +1,9 @@
 -- To execute this file from SQL REPL:
 -- \i sql/schema.sql
 
+-- for hashing passwords
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
+
 CREATE TABLE IF NOT EXISTS users
 ( id         TEXT                     NOT NULL
 , email      TEXT                     NOT NULL

src/Lib.hs

@@ -5,15 +5,14 @@ module Lib
        ) where
 
 import Network.Wai.Handler.Warp (run)
-import Servant.Server (serve)
 import System.Remote.Monitoring (forkServerWith)
 
 import Lib.App (AppEnv, Env (..))
 import Lib.Config (Config (..), loadConfig)
 import Lib.Core.Jwt (JwtSecret (..), mkRandomString)
 import Lib.Db (initialisePool)
 import Lib.Effects.Log (mainLogAction)
-import Lib.Server (API, server)
+import Lib.Server (application)
 
 import qualified Data.HashMap.Strict as HashMap
 import qualified System.Metrics as Metrics
@@ -38,9 +37,7 @@ runServer env@Env{..} = do
     -- configure and run EKG
     Metrics.registerGcMetrics envEkgStore
     () <$ forkServerWith envEkgStore "localhost" 8081
-    run 8081 application
-  where
-    application = serve (Proxy @API) (server env)
+    run 8080 $ application env
 
 main :: IO ()
 main = loadConfig >>= mkAppEnv >>= runServer

src/Lib/App/Env.hs

@@ -37,9 +37,11 @@ data Env (m :: Type -> Type) = Env
 instance HasLog (Env m) Message m where
     getLogAction :: Env m -> LogAction m Message
     getLogAction = envLogAction
+    {-# INLINE getLogAction #-}
 
     setLogAction :: LogAction m Message -> Env m -> Env m
     setLogAction newAction env = env { envLogAction = newAction }
+    {-# INLINE setLogAction #-}
 
 {- | General type class representing which @field@ is in @env@.
 Instead of plain usage like this:
@@ -67,3 +69,4 @@ instance Has (LogAction m Message) (Env m) where obtain = envLogAction
 
 grab :: forall field env m . (MonadReader env m, Has field env) => m field
 grab = asks $ obtain @field
+{-# INLINE grab #-}

src/Lib/Core/Admin.hs

@@ -9,11 +9,11 @@ import Lib.Core.Id (Id)
 import Lib.Core.Password (PasswordHash)
 
 
--- | Admin user inside Lib platform.
+-- | Admin user inside platform. Represents row in the @admin@ table.
 data Admin = Admin
-    { adminId    :: Id Admin
-    , adminEmail :: Email
-    , adminHash  :: PasswordHash
-    } deriving (Generic)
+    { adminId    :: !(Id Admin)
+    , adminEmail :: !Email
+    , adminHash  :: !PasswordHash
+    } deriving stock (Generic)
       deriving anyclass (FromRow)
       deriving (FromJSON, ToJSON, Elm) via ElmStreet Admin