Merge pull request #21 from jpbnetley/feature/config-file(#15)

fixed read config from file if not exists
jpbnetley · May 17, 2020 · 6ca8e88 · 6ca8e88
2 parents ba3f1be + fdcb821
commit 6ca8e88
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala
@@ -20,7 +20,7 @@ object Main extends TaskApp {
       db            <- EitherT.liftF[Task, Exception, MongoDatabase](database.getDatabase(config, mongoClient))
       userInput     <- EitherT(promptUser())
       csvFiles      <- EitherT(FileHelper.getCsvFiles(userInput.folderPath, userInput.skipFiles))
-      orderedFiles  =  csvFiles.zipWithIndex.toOrderedFile()
+      orderedFiles  =  csvFiles.zipWithIndex.toOrderedFile
       _             <- EitherT(Processing.csvFiles(orderedFiles)(db))
     } yield {
        database.close(mongoClient)

diff --git a/src/main/scala/util/config/ConfigFile.scala b/src/main/scala/util/config/ConfigFile.scala
@@ -9,13 +9,16 @@ import util.Logging.log
 import util.ImplicitConversions.RichConfig
 import util.models.enums.MongoDbEnvironmentNames
 
+import scala.reflect.io.{Directory, Path}
+
 case object ConfigFile extends SystemConfigProperties {
-  /** validate of the configeration method is present
+  /** validate of the configuration method is present
     *
     * @return Boolean, true if it exists
     */
   override def exists: Boolean = {
-    val exist = !ConfigFactory.load().isEmpty
+    val configPath = Path("src/main/resources/application.conf")
+    val exist = Directory(configPath).exists
     log.info(s"Check if config file: application.conf exists: $exist")
     exist
   }

diff --git a/src/main/scala/util/config/EnvironmentVariables.scala b/src/main/scala/util/config/EnvironmentVariables.scala
@@ -8,7 +8,7 @@ import util.Logging.log
 import util.models.enums.MongoDbEnvironmentNames
 
 case object EnvironmentVariables extends SystemConfigProperties {
-  /** validate of the configeration method is present
+  /** validate of the configuration method is present
     *
     * @return Boolean, true if it exists
     */

diff --git a/src/main/scala/util/databaseProvider/SystemConfigProperties.scala b/src/main/scala/util/databaseProvider/SystemConfigProperties.scala
@@ -3,7 +3,7 @@ package util.databaseProvider
 import util.models.SystemConfigPropertiesResponse
 
 trait SystemConfigProperties {
-  /** validate of the configeration method is present
+  /** validate of the configuration method is present
     *
     * @return Boolean, true if it exists
     */