feat #143 MongoDriver.listExecutedScripts() modification + test

4sh · Sep 21, 2021 · 775d6e6 · 775d6e6
1 parent e619abe
commit 775d6e6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriver.kt b/modules/driver-mongo/src/main/kotlin/datamaintain/db/driver/mongo/MongoDriver.kt
@@ -2,10 +2,7 @@ package datamaintain.db.driver.mongo
 
 import datamaintain.core.db.driver.DatamaintainDriver
 import datamaintain.core.exception.DatamaintainMongoQueryException
-import datamaintain.core.script.ExecutedScript
-import datamaintain.core.script.ExecutionStatus
-import datamaintain.core.script.FileScript
-import datamaintain.core.script.ScriptWithContent
+import datamaintain.core.script.*
 import datamaintain.core.step.executor.Execution
 import datamaintain.core.util.runProcess
 import datamaintain.db.driver.mongo.serialization.KJsonParser
@@ -80,9 +77,9 @@ class MongoDriver(mongoUri: String,
         return null
     }
 
-    override fun listExecutedScripts(): Sequence<ExecutedScript> {
-        val executionOutput: String = executeMongoQuery("db.$EXECUTED_SCRIPTS_COLLECTION.find().toArray()")
-        return if (executionOutput.isNotBlank()) jsonParser.parseArrayOfExecutedScripts(executionOutput) else emptySequence()
+    override fun listExecutedScripts(): Sequence<LightExecutedScript> {
+        val executionOutput: String = executeMongoQuery("db.$EXECUTED_SCRIPTS_COLLECTION.find({}, { \"name\": 1, \"checksum\": 1, \"identifier\": 1}).toArray()")
+        return if (executionOutput.isNotBlank()) jsonParser.parseArrayOfLightExecutedScripts(executionOutput) else emptySequence()
     }
 
     override fun markAsExecuted(executedScript: ExecutedScript): ExecutedScript {

diff --git a/modules/driver-mongo/src/test/kotlin/datamaintain/db/driver/mongo/MongoDriverTest.kt b/modules/driver-mongo/src/test/kotlin/datamaintain/db/driver/mongo/MongoDriverTest.kt
@@ -1,10 +1,7 @@
 package datamaintain.db.driver.mongo
 
 import com.mongodb.client.model.Filters
-import datamaintain.core.script.ExecutedScript
-import datamaintain.core.script.ExecutionStatus
-import datamaintain.core.script.FileScript
-import datamaintain.core.script.ScriptAction
+import datamaintain.core.script.*
 import datamaintain.db.driver.mongo.serialization.ExecutedScriptDb
 import datamaintain.db.driver.mongo.serialization.toExecutedScriptDb
 import datamaintain.db.driver.mongo.test.AbstractMongoDbTest
@@ -36,7 +33,7 @@ internal class MongoDriverTest : AbstractMongoDbTest() {
         // Then
         expectThat(executedScripts.toList()) {
             size.isEqualTo(2)
-            contains(script1, script2)
+            contains(lightExecutedScript1, lightExecutedScript2)
         }
     }
 
@@ -363,5 +360,17 @@ internal class MongoDriverTest : AbstractMongoDbTest() {
             ExecutionStatus.OK,
             ScriptAction.RUN
     )
+
+    private val lightExecutedScript1 = LightExecutedScript(
+        script1.name,
+        script1.checksum,
+        script1.identifier
+    )
+
+    private val lightExecutedScript2 = LightExecutedScript(
+        script2.name,
+        script2.checksum,
+        script2.identifier
+    )
 }