MongoSync

Author: sfxcode

CHANGES.md

@@ -6,6 +6,7 @@
 ### 2.0.2
 * mongo-scala-driver 4.0.3
 * dependency updates
+* Sync for collections added
 
 ### 2.0.1
 * Mongo Java Server Support

src/main/scala/com/sfxcode/nosql/mongo/database/MongoConfig.scala

@@ -80,7 +80,13 @@ trait ConfigHelper {
 
   def stringConfig(configPath: String, key: String, default: String = ""): Option[String] =
     if (conf.hasPath("%s.%s".format(configPath, key))) {
-      Some(conf.getString("%s.%s".format(configPath, key)))
+      val str = conf.getString("%s.%s".format(configPath, key))
+      if (str.nonEmpty) {
+        Some(str)
+      }
+      else {
+        None
+      }
     }
     else {
       if (default.nonEmpty) {

src/main/scala/com/sfxcode/nosql/mongo/server/LocalServer.scala

@@ -12,8 +12,8 @@ case class LocalServer(serverConfig: ServerConfig = ServerConfig()) {
   private val server: MongoServer = {
     if (ServerBackend.H2 == serverConfig.backend) {
       if (serverConfig.h2BackendConfig.isDefined && !serverConfig.h2BackendConfig.get.inMemory) {
-        if (serverConfig.h2BackendConfig.get.path.nonEmpty) {
-          h2Path = serverConfig.h2BackendConfig.get.path
+        if (serverConfig.h2BackendConfig.get.path.isDefined) {
+          h2Path = serverConfig.h2BackendConfig.get.path.get
         }
         else {
           h2Path = File.temporaryFile().get().path.toString

src/main/scala/com/sfxcode/nosql/mongo/server/ServerConfig.scala

@@ -11,7 +11,7 @@ case class ServerConfig(
     h2BackendConfig: Option[H2BackendConfig] = None
 )
 
-case class H2BackendConfig(inMemory: Boolean = true, path: String = "")
+case class H2BackendConfig(inMemory: Boolean = true, path: Option[String] = None)
 
 object ServerBackend extends Enumeration {
   type ServerBackend = Value
@@ -46,7 +46,7 @@ object ServerConfig extends ConfigHelper {
     val h2BackendConfig: Option[H2BackendConfig] = {
       if (serverBackend == ServerBackend.H2 && conf.hasPath("%s.%s".format(configPath, "h2.inMemory"))) {
         val inMemory = booleanConfig(configPath, "h2.inMemory")
-        val path     = stringConfig(configPath, "h2.path").get
+        val path     = stringConfig(configPath, "h2.path")
         Some(H2BackendConfig(inMemory, path))
       }
       else {

src/main/scala/com/sfxcode/nosql/mongo/sync/MongoSyncOperation.scala

@@ -71,12 +71,13 @@ case class MongoSyncOperation(
       countBefore: Int,
       documentsToSync: Seq[Document]
   ): MongoSyncResult = {
-    val start    = System.currentTimeMillis()
-    val syncDate = new Date()
+    val start                   = System.currentTimeMillis()
+    val syncDate                = new Date()
+    var filteredDocumentsToSync = Seq[Document]()
     if (documentsToSync.nonEmpty) {
-      val idSet: Set[ObjectId]           = documentsToSync.map(doc => doc.getObjectId(idColumnName)).toSet
-      val documentsToSync: Seq[Document] = left.dao(collectionName).find(valueFilter(idColumnName, idSet)).results()
-      right.dao(collectionName).bulkWriteMany(documentsToSync).result()
+      val idSet: Set[ObjectId] = documentsToSync.map(doc => doc.getObjectId(idColumnName)).toSet
+      filteredDocumentsToSync = left.dao(collectionName).find(valueFilter(idColumnName, idSet)).results()
+      right.dao(collectionName).bulkWriteMany(filteredDocumentsToSync).result()
       val update = combine(
         set(MongoSyncOperation.SyncColumnLastSync, syncDate),
         set(MongoSyncOperation.SyncColumnLastUpdate, syncDate)
@@ -89,7 +90,7 @@ case class MongoSyncOperation(
       collectionName,
       syncDate,
       true,
-      documentsToSync.size,
+      filteredDocumentsToSync.size,
       countBefore,
       countAfter,
       (System.currentTimeMillis() - start)

src/test/resources/application.conf

@@ -32,6 +32,8 @@ unit.test.mongo.local {
   database = "simple-mongo-unit-test"
   host = "localhost"
   port = 28028
+  userName = "testy"
+  password = ""
   applicationName = "simple-mongo-config-test"
 }
 

src/test/scala/com/sfxcode/nosql/mongo/server/ServerConfigSpec.scala

@@ -21,7 +21,7 @@ class ServerConfigSpec extends Specification {
       config.port mustEqual 28028
       config.serverName mustEqual "local-unit-test-server"
       config.h2BackendConfig.get.inMemory must beFalse
-      config.h2BackendConfig.get.path mustEqual ""
+      config.h2BackendConfig.get.path must beNone
     }
   }
 }