fixs and move files

src/main/kotlin/fr/dcproject/entity/Article.kt

@@ -0,0 +1,18 @@
+package fr.dcproject.entity
+import fr.postgresjson.entity.*
+import java.util.*
+
+
+class Article(
+    id: UUID?,
+    var versionId: UUID?,
+    var versionNumber: Int?,
+    var title: String?,
+    var annonymous: Boolean?,
+    var content: String?,
+    var description: String?,
+    var tags: List<String>
+):
+    UuidEntity(id),
+    EntityCreatedAt by EntityCreatedAtImp(),
+    CreatedBy<Citizen> by EntityCreatedByImp()

src/main/kotlin/fr/dcproject/entity/Citizen.kt

@@ -0,0 +1,25 @@
+package fr.dcproject.entity
+
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.UuidEntity
+import org.joda.time.DateTime
+import java.util.*
+
+
+class Citizen(
+    id: UUID = UUID.randomUUID(),
+    var name: Name?,
+    var birthday: DateTime?,
+    var userId: String? = null,
+    var voteAnnonymous: Boolean? = null,
+    var followAnnonymous: Boolean? = null,
+    var user: User?
+) : UuidEntity(id),
+    EntityCreatedAt by EntityCreatedAtImp() {
+    data class Name(
+        var firstName: String?,
+        var lastName: String?,
+        var civility: String? = null
+    )
+}

src/main/kotlin/fr/dcproject/entity/User.kt

@@ -0,0 +1,14 @@
+package fr.dcproject.entity
+
+import fr.postgresjson.entity.*
+import org.joda.time.DateTime
+import java.util.*
+
+class User(
+    id: UUID? = UUID.randomUUID(),
+    var username: String?,
+    var blockedAt: DateTime? = null,
+    var plainPassword: String?
+) : UuidEntity(id),
+    EntityCreatedAt by EntityCreatedAtImp(),
+    EntityUpdatedAt by EntityUpdatedAtImp()