version 0.1.0.4: Mongo config changed (#4)

biocad · Apr 25, 2018 · 92781f7 · 92781f7
1 parent d61baab
commit 92781f7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.1.0.4] - 2018-04-25
+### Changed
+- Field `database` changed to `databases` in Mongo config.
+
 ## [0.1.0.3] - 2018-04-25
 ### Added
 - Field `database` in Mongo config.

diff --git a/bcd-config.cabal b/bcd-config.cabal
@@ -1,5 +1,6 @@
 name:           bcd-config
-version:        0.1.0.3
+version:        0.1.0.4
+synopsis:       Library to get config.
 description:    Library to get config to different systems
 homepage:       https://github.com/biocad/bcd-config#readme
 bug-reports:    https://github.com/biocad/bcd-config/issues
@@ -33,6 +34,7 @@ library
                   , System.BCD.Config.FileSystem
                   , System.BCD.Config.BioSources
   build-depends:    base >=4.7 && <5
+                  , containers
                   , text
                   , unordered-containers
                   , aeson-picker

diff --git a/src/System/BCD/Config/Mongo.hs b/src/System/BCD/Config/Mongo.hs
@@ -6,17 +6,22 @@ module System.BCD.Config.Mongo
   ) where
 
 import           Data.Aeson.Picker ((|--))
+import           Data.Map.Strict   (Map)
+import           Data.Text         (Text)
 import           System.BCD.Config (FromJsonConfig (..), getConfigText)
 
-data MongoConfig = MongoConfig { _host     :: String
-                               , _port     :: Int
-                               , _user     :: String
-                               , _password :: String
-                               , _database :: String
-                               , _descr    :: String
+
+data MongoConfig = MongoConfig { _host      :: String
+                               , _port      :: Int
+                               , _user      :: String
+                               , _password  :: String
+                               , _databases :: Map String Text
+                               , _descr     :: String
                                }
   deriving (Show, Read, Eq)
 
+
+
 instance FromJsonConfig MongoConfig where
   fromJsonConfig = do
       jsonText <- getConfigText
@@ -25,5 +30,5 @@ instance FromJsonConfig MongoConfig where
                          (get "port")
                          (get "user")
                          (get "password")
-                         (get "database")
+                         (get "databases")
                          (get "descr")