fix immutable entities

Add Migration and Query definition class
Add Docker DB for tests

.idea/misc.xml

@@ -3,7 +3,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="adopt-openjdk-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="TaskProjectConfiguration">

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
     id("fr.coppernic.versioning") version "3.1.2"
 }
 
-group = "flecomte"
+group = "com.github.flecomte"
 version = versioning.info.tag
 
 repositories {

src/main/kotlin/fr/postgresjson/definition/Resource.kt

@@ -20,10 +20,10 @@ interface Resource {
 
         fun build(resource: String, path: Path): Resource =
             try {
-                Function(resource, path)
+                Migration(resource, path)
             } catch (e: ParseException) {
                 try {
-                    Migration(resource, path)
+                    Function(resource, path)
                 } catch (e: ParseException) {
                     try {
                         Query(resource, path)

src/main/kotlin/fr/postgresjson/entity/immutable/ImmutableEntity.kt

@@ -1,10 +1,6 @@
 package fr.postgresjson.entity.immutable
 
 import fr.postgresjson.entity.EntityI
-import fr.postgresjson.entity.mutable.EntityDeletedAt
-import fr.postgresjson.entity.mutable.EntityDeletedAtImp
-import fr.postgresjson.entity.mutable.EntityDeletedBy
-import fr.postgresjson.entity.mutable.EntityDeletedByImp
 import org.joda.time.DateTime
 import java.util.*
 
@@ -17,7 +13,7 @@ interface UuidEntityI : EntityRefI<UUID> {
 }
 
 abstract class Entity<T>(override val id: T) : EntityRefI<T>
-open class UuidEntity(override val id: UUID = UUID.randomUUID()) : UuidEntityI, Entity<UUID>(id)
+open class UuidEntity(id: UUID? = null) : UuidEntityI, Entity<UUID>(id ?: UUID.randomUUID())
 
 /* Version */
 interface EntityVersioning<ID, NUMBER> {
@@ -26,16 +22,27 @@ interface EntityVersioning<ID, NUMBER> {
 }
 
 class UuidEntityVersioning(
-    override var versionNumber: Int? = null,
-    override val versionId: UUID = UUID.randomUUID()
-) : EntityVersioning<UUID, Int?>
+    override val versionNumber: Int,
+    versionId: UUID? = null
+) : EntityVersioning<UUID, Int> {
+    override val versionId: UUID = versionId ?: UUID.randomUUID()
+}
 
 /* Dates */
 interface EntityCreatedAt {
     val createdAt: DateTime
 }
 interface EntityUpdatedAt {
-    var updatedAt: DateTime
+    val updatedAt: DateTime
+}
+
+interface EntityDeletedAt {
+    val deletedAt: DateTime?
+    fun isDeleted(): Boolean {
+        return deletedAt?.let {
+            it < DateTime.now()
+        } ?: false
+    }
 }
 
 class EntityCreatedAtImp(
@@ -43,15 +50,23 @@ class EntityCreatedAtImp(
 ) : EntityCreatedAt
 
 class EntityUpdatedAtImp(
-    override var updatedAt: DateTime = DateTime.now()
+    override val updatedAt: DateTime = DateTime.now()
 ) : EntityUpdatedAt
 
+class EntityDeletedAtImp(
+    override val deletedAt: DateTime? = null
+) : EntityDeletedAt
+
 /* Author */
 interface EntityCreatedBy<T : EntityI> {
     val createdBy: T
 }
 interface EntityUpdatedBy<T : EntityI> {
-    var updatedBy: T
+    val updatedBy: T
+}
+
+interface EntityDeletedBy<T : EntityI> {
+    val deletedBy: T?
 }
 
 class EntityCreatedByImp<UserT : EntityI>(
@@ -59,9 +74,13 @@ class EntityCreatedByImp<UserT : EntityI>(
 ) : EntityCreatedBy<UserT>
 
 class EntityUpdatedByImp<UserT : EntityI>(
-    override var updatedBy: UserT
+    override val updatedBy: UserT
 ) : EntityUpdatedBy<UserT>
 
+class EntityDeletedByImp<UserT : EntityI>(
+    override val deletedBy: UserT?
+) : EntityDeletedBy<UserT>
+
 /* Mixed */
 class EntityCreatedImp<UserT : EntityI>(
     override val createdAt: DateTime = DateTime.now(),
@@ -71,7 +90,7 @@ class EntityCreatedImp<UserT : EntityI>(
 
 class EntityUpdatedImp<UserT : EntityI>(
     updatedAt: DateTime = DateTime.now(),
-    override var updatedBy: UserT
+    override val updatedBy: UserT
 ) : EntityUpdatedBy<UserT>,
     EntityUpdatedAt by EntityUpdatedAtImp(updatedAt)
 

src/main/kotlin/fr/postgresjson/entity/mutable/MutableEntity.kt

@@ -17,7 +17,7 @@ interface IdEntityI : EntityRefI<Int> {
 }
 
 abstract class Entity<T>(override var id: T? = null) : EntityRefI<T>
-open class UuidEntity(override var id: UUID? = UUID.randomUUID()) : UuidEntityI, Entity<UUID>(id)
+open class UuidEntity(id: UUID? = null) : UuidEntityI, Entity<UUID>(id ?: UUID.randomUUID())
 open class IdEntity(override var id: Int? = null) : IdEntityI, Entity<Int>(id)
 
 /* Version */
@@ -28,8 +28,10 @@ interface EntityVersioning<ID, NUMBER> {
 
 class UuidEntityVersioning(
     override var versionNumber: Int? = null,
-    override var versionId: UUID = UUID.randomUUID()
-) : EntityVersioning<UUID, Int>
+    versionId: UUID? = null
+) : EntityVersioning<UUID, Int> {
+    override var versionId: UUID = versionId ?: UUID.randomUUID()
+}
 
 /* Dates */
 interface EntityCreatedAt {

src/main/kotlin/fr/postgresjson/migration/MigrationScript.kt

@@ -5,7 +5,7 @@ import fr.postgresjson.entity.mutable.Entity
 import fr.postgresjson.migration.Migration.Action
 import java.util.*
 
-data class Query(
+data class MigrationScript(
     val name: String,
     val up: String,
     val down: String,
@@ -57,7 +57,7 @@ data class Query(
         return Migration.Status.OK // TODO
     }
 
-    fun copy(): Query {
+    fun copy(): MigrationScript {
         return this.copy(name = name, up = up, down = down, connection = connection, executedAt = executedAt).also {
             it.doExecute = this.doExecute
         }

src/main/kotlin/fr/postgresjson/migration/Migrations.kt

@@ -36,12 +36,13 @@ interface Migration {
 
 data class Migrations private constructor(
     private val connection: Connection,
-    private val migrationsScripts: MutableMap<String, Query> = mutableMapOf(),
+    private val migrationsScripts: MutableMap<String, MigrationScript> = mutableMapOf(),
     private val functions: MutableMap<String, Function> = mutableMapOf()
 ) {
     private var directories: List<URI> = emptyList()
     private val logger: Logger? by LoggerDelegate()
     constructor(directory: URI, connection: Connection) : this(listOf(directory), connection)
+    constructor(connection: Connection, vararg directory: URI) : this(directory.toList(), connection)
 
     constructor(directories: List<URI>, connection: Connection) : this(connection) {
         initDB()
@@ -85,7 +86,7 @@ data class Migrations private constructor(
         this::class.java.classLoader.getResource("sql/migration/findAllHistory.sql")!!.readText().let {
             connection.select<MigrationEntity>(it, object : TypeReference<List<MigrationEntity>>() {})
                 .map { query ->
-                    migrationsScripts[query.filename] = Query(query.filename, query.up, query.down, connection, query.executedAt)
+                    migrationsScripts[query.filename] = MigrationScript(query.filename, query.up, query.down, connection, query.executedAt)
                 }
         }
     }
@@ -105,8 +106,8 @@ data class Migrations private constructor(
     private fun getMigrationFromDirectory(directory: URI) {
         val downs: MutableMap<String, DefinitionMigration> = mutableMapOf()
 
-        /* Set Down Migration */
         directory.searchSqlFiles().apply {
+            /* Set Down Migration */
             forEach { migration ->
                 if (migration is DefinitionMigration && migration.direction == DefinitionMigration.Direction.DOWN) {
                     downs += migration.name to migration
@@ -119,7 +120,7 @@ data class Migrations private constructor(
                     val down = downs[migration.name] ?: throw DownMigrationNotDefined(migration.name + ".down.sql")
                     downs -= migration.name
 
-                    addQuery(migration, down)
+                    addMigrationScript(migration, down)
                 } else if (migration is DefinitionFunction) {
                     addFunction(migration)
                 }
@@ -153,12 +154,12 @@ data class Migrations private constructor(
         return this
     }
 
-    fun addQuery(up: DefinitionMigration, down: DefinitionMigration, callback: (Query) -> Unit = {}): Migrations =
-        addQuery(up.name, up.script, down.script, callback)
+    fun addMigrationScript(up: DefinitionMigration, down: DefinitionMigration, callback: (MigrationScript) -> Unit = {}): Migrations =
+        addMigrationScript(up.name, up.script, down.script, callback)
 
-    fun addQuery(name: String, up: String, down: String, callback: (Query) -> Unit = {}): Migrations {
+    fun addMigrationScript(name: String, up: String, down: String, callback: (MigrationScript) -> Unit = {}): Migrations {
         if (migrationsScripts[name] === null) {
-            migrationsScripts[name] = Query(name, up, down, connection).apply {
+            migrationsScripts[name] = MigrationScript(name, up, down, connection).apply {
                 doExecute = Action.UP
             }
         } else {

src/main/kotlin/fr/postgresjson/utils/searchSqlFiles.kt

@@ -5,6 +5,7 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.net.URI
 import java.net.URL
+import java.nio.file.FileSystemNotFoundException
 import java.nio.file.FileSystems
 import java.nio.file.FileVisitOption
 import java.nio.file.Files
@@ -16,15 +17,19 @@ fun URL.searchSqlFiles() = this.toURI().searchSqlFiles()
 fun URI.searchSqlFiles() = sequence<Resource> {
     val logger: Logger = LoggerFactory.getLogger("sqlFilesSearch")
     val uri: URI = this@searchSqlFiles
+    logger.debug("""SQL files found in "${uri.toString().substringAfter('!')}" :""")
     if (uri.scheme == "jar") {
-        val relativePath = uri.toString().substringAfter('!')
-        FileSystems
-            .newFileSystem(uri, emptyMap<String, Any>())
-            .getPath(relativePath)
+        try {
+            FileSystems.getFileSystem(uri)
+        } catch (e: FileSystemNotFoundException) {
+            FileSystems.newFileSystem(uri, emptyMap<String, Any>())
+        }
+
+        uri
             .walk(5)
             .asSequence()
             .filter { it.fileName.toString().endsWith(".sql") }
-            .map { this::class.java.getResource(path.toString()) }
+            .map { it.toUri().toURL() }
             .forEach {
                 logger.debug(it.toString())
                 yield(Resource.build(it))

src/test/kotlin/fr/postgresjson/MigrationTest.kt

@@ -16,7 +16,7 @@ class MigrationTest() : TestAbstract() {
     @Test
     fun `run up query`() {
         val resources = this::class.java.getResource("/sql/migrations").toURI()
-        val m = Migrations(resources, connection)
+        val m = Migrations(connection, resources)
         m.up().apply {
             this `should contain` Pair("1", Migration.Status.OK)
             size `should be equal to` 1