Continue to implement opinion

improve target reference
Improve Tests for Opinion
fix SQL:upsert_opinion

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

@@ -32,8 +32,6 @@ open class Comment<T : TargetI>(
         target = parent.target,
         content = content
     )
-
-    override val reference get() = TargetI.getReference(this)
 }
 
 open class CommentRef(id: UUID = UUID.randomUUID()) : CommentS(id)

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

@@ -6,7 +6,7 @@ import fr.postgresjson.entity.immutable.UuidEntity
 import fr.postgresjson.entity.immutable.UuidEntityI
 import java.util.*
 import kotlin.reflect.KClass
-import kotlin.reflect.full.isSuperclassOf
+import kotlin.reflect.full.isSubclassOf
 
 interface ExtraI<T : TargetI> :
     UuidEntityI,
@@ -26,16 +26,18 @@ interface TargetI : UuidEntityI {
     enum class TargetName(val targetReference: String) {
         Article("article"),
         Constitution("constitution"),
-        Comment("comment")
+        Comment("comment"),
+        Opinion("opinion")
     }
 
     companion object {
         fun <T : TargetI> getReference(t: KClass<T>): String {
             return when {
-                t.isSuperclassOf(Article::class) -> TargetName.Article.targetReference
-                t.isSuperclassOf(Constitution::class) -> TargetName.Constitution.targetReference
-                t.isSuperclassOf(Comment::class) -> TargetName.Comment.targetReference
-                else -> throw error("target not implemented")
+                t.isSubclassOf(ArticleRef::class) -> TargetName.Article.targetReference
+                t.isSubclassOf(ConstitutionRef::class) -> TargetName.Constitution.targetReference
+                t.isSubclassOf(CommentRef::class) -> TargetName.Comment.targetReference
+                t.isSubclassOf(Opinion::class) -> TargetName.Opinion.targetReference
+                else -> throw error("target not implemented: ${t.qualifiedName}")
             }
         }
 

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

@@ -1,6 +1,9 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.immutable.*
+import fr.postgresjson.entity.immutable.EntityCreatedAt
+import fr.postgresjson.entity.immutable.EntityCreatedAtImp
+import fr.postgresjson.entity.immutable.EntityCreatedBy
+import fr.postgresjson.entity.immutable.EntityCreatedByImp
 import java.util.*
 
 open class Opinion<T : TargetI>(
@@ -9,11 +12,16 @@ open class Opinion<T : TargetI>(
     override val target: T,
     val choice: OpinionChoice
 ) : ExtraI<T>,
-    UuidEntity(id),
+    TargetRef(id),
     EntityCreatedAt by EntityCreatedAtImp(),
     EntityCreatedBy<CitizenBasicI> by EntityCreatedByImp(createdBy) {
 
     fun getName(): String = choice.name
 }
 
-typealias OpinionArticle = Opinion<Article>
+class OpinionArticle(
+    id: UUID = UUID.randomUUID(),
+    createdBy: CitizenBasic,
+    target: ArticleRef,
+    choice: OpinionChoice
+) : Opinion<ArticleRef>(id, createdBy, target, choice)

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

@@ -10,7 +10,7 @@ import java.util.*
 class OpinionChoice(
     id: UUID,
     val name: String,
-    val target: List<String>
+    val target: List<String>?
 ) : OpinionChoiceRef(id),
     EntityCreatedAt by EntityCreatedAtImp(),
     EntityDeletedAt by EntityDeletedAtImp()

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

@@ -3,13 +3,13 @@ package fr.dcproject.entity
 import fr.postgresjson.entity.EntityI
 
 class OpinionAggregation(
-    override val entries: Set<Map.Entry<String, Int>> = emptySet()
-) : AbstractMap<String, Int>(), EntityI
+    private val underlying: MutableMap<String, Any> = mutableMapOf()
+) : MutableMap<String, Any> by underlying, EntityI
 
 interface Opinionable {
-    val opinions: MutableMap<String, Int>
+    var opinions: MutableMap<String, Int>
 }
 
 class OpinionableImp : Opinionable {
-    override val opinions: MutableMap<String, Int> = mutableMapOf()
+    override var opinions: MutableMap<String, Int> = mutableMapOf()
 }

src/main/kotlin/fr/dcproject/entity/request/ArticleOpinionRequest.kt

@@ -1,27 +0,0 @@
-package fr.dcproject.entity.request
-
-import fr.dcproject.entity.Citizen
-import fr.dcproject.entity.OpinionArticle
-import fr.dcproject.entity.OpinionChoiceRef
-import fr.dcproject.entity.TargetRef
-import fr.dcproject.repository.Article
-import fr.dcproject.repository.OpinionChoice
-import fr.dcproject.utils.toUUID
-import org.koin.core.KoinComponent
-import org.koin.core.get
-
-class ArticleOpinionRequest(
-    target: String,
-    opinionChoice: String
-) : RequestBuilderWithCreator<Citizen, OpinionArticle>, KoinComponent {
-    val target = TargetRef(target.toUUID())
-    val opinionChoice = OpinionChoiceRef(opinionChoice.toUUID())
-
-    override fun create(citizen: Citizen): OpinionArticle {
-        return OpinionArticle(
-            choice = get<OpinionChoice>().findOpinionChoiceById(opinionChoice.id)!!,
-            target = get<Article>().findById(target.id)!!,
-            createdBy = citizen
-        )
-    }
-}

src/main/kotlin/fr/dcproject/entity/request/Request.kt

@@ -1,14 +1,11 @@
 package fr.dcproject.entity.request
 
-import fr.dcproject.entity.CitizenRef
-import fr.postgresjson.entity.EntityI
+import io.ktor.application.ApplicationCall
 
 interface Request
 
-interface RequestBuilder<E: EntityI> : Request {
-    fun create(): E
+interface RequestBuilder<E> {
+    suspend fun getContent(call: ApplicationCall): E
 }
 
-interface RequestBuilderWithCreator<C: CitizenRef, E: EntityI> : Request {
-    fun create(citizen: C): E
-}
+suspend fun <E> ApplicationCall.getContent(builder: RequestBuilder<E>) = builder.getContent(this)