Continue to implement opinion

improve target reference
Improve Tests for Opinion
fix SQL:upsert_opinion

src/main/kotlin/fr/dcproject/routes/OpinionArticle.kt

@@ -1,11 +1,18 @@
 package fr.dcproject.routes
 
 import fr.dcproject.citizen
-import fr.dcproject.entity.request.ArticleOpinionRequest
+import fr.dcproject.entity.Citizen
+import fr.dcproject.entity.OpinionArticle
+import fr.dcproject.entity.OpinionChoiceRef
+import fr.dcproject.entity.request.RequestBuilder
+import fr.dcproject.entity.request.getContent
+import fr.dcproject.repository.OpinionChoice
 import fr.dcproject.security.voter.OpinionVoter.Action.VIEW
 import fr.dcproject.security.voter.assertCan
 import fr.dcproject.utils.toUUID
+import io.ktor.application.ApplicationCall
 import io.ktor.application.call
+import io.ktor.features.BadRequestException
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location
@@ -17,6 +24,7 @@ import io.ktor.routing.Route
 import io.ktor.util.KtorExperimentalAPI
 import org.koin.core.KoinComponent
 import org.koin.core.get
+import java.util.*
 import fr.dcproject.entity.Article as ArticleEntity
 import fr.dcproject.entity.Citizen as CitizenEntity
 import fr.dcproject.repository.OpinionArticle as OpinionArticleRepository
@@ -24,7 +32,7 @@ import fr.dcproject.repository.OpinionArticle as OpinionArticleRepository
 @KtorExperimentalLocationsAPI
 object OpinionArticlePaths {
     /**
-     * Get paginated opinion of citizen for one article
+     * Get paginated opinions of citizen for all articles
      */
     @Location("/citizens/{citizen}/opinions/articles")
     class CitizenOpinionArticleRequest(
@@ -36,16 +44,37 @@ object OpinionArticlePaths {
     /**
      * Put an opinion on one article
      */
-    @Location("/articles/{article}/opinons")
-    class ArticleOpinion(val article: ArticleEntity)
+    @Location("/articles/{article}/opinions")
+    @KtorExperimentalAPI
+    class ArticleOpinion(val article: ArticleEntity) : RequestBuilder<OpinionArticle> {
+
+        private class Content(
+            opinionChoice: String
+        ) : KoinComponent {
+            val opinionChoice = OpinionChoiceRef(opinionChoice.toUUID())
+
+            fun create(citizen: Citizen, article: ArticleEntity): OpinionArticle {
+                return OpinionArticle(
+                    choice = get<OpinionChoice>().findOpinionChoiceById(opinionChoice.id) ?: throw BadRequestException("OpinionChoice not exist: id(${opinionChoice.id})"),
+                    target = article,
+                    createdBy = citizen
+                )
+            }
+        }
+
+        override suspend fun getContent(call: ApplicationCall): OpinionArticle {
+            return call.receive<Content>().create(call.citizen, article)
+        }
+    }
 
     /**
      * Get all Opinion of citizen on targets by target ids
      */
-    @Location("/citizen/{citizen}/opinions")
-    class CitizenOpinions(val citizen: CitizenEntity, id: List<String>): KoinComponent {
+    @Location("/citizens/{citizen}/opinions")
+    class CitizenOpinions(val citizen: CitizenEntity, id: List<String>) : KoinComponent {
+        val id: List<UUID> = id.toUUID()
         val opinionsEntities = get<OpinionArticleRepository>()
-            .findCitizenOpinionsByTargets(citizen, id.toUUID())
+            .findCitizenOpinionsByTargets(citizen, this.id)
     }
 }
 
@@ -64,9 +93,12 @@ fun Route.opinionArticle(repo: OpinionArticleRepository) {
     }
 
     put<OpinionArticlePaths.ArticleOpinion> {
-        val optionArticle = call.receive<ArticleOpinionRequest>().create(citizen)
-        assertCan(VIEW, optionArticle)
-
-        call.respond(HttpStatusCode.Created, optionArticle)
+        call.getContent(it)
+            .let { opinion ->
+                assertCan(VIEW, opinion)
+                repo.opinion(opinion)
+            }.let {
+                call.respond(HttpStatusCode.Created, it)
+            }
     }
 }

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

@@ -1,7 +1,7 @@
 package fr.dcproject.routes
 
 import fr.dcproject.entity.OpinionChoice
-import fr.dcproject.security.voter.OpinionVoter.Action.VIEW
+import fr.dcproject.security.voter.OpinionChoiceVoter.Action.VIEW
 import fr.dcproject.security.voter.assertCan
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -17,7 +17,7 @@ object OpinionChoicePaths {
     class OpinionChoiceRequest(val opinionChoice: OpinionChoice)
 
     @Location("/opinions")
-    class OpinionChoicesRequest(val targets: List<String>)
+    class OpinionChoicesRequest(val targets: List<String> = emptyList())
 }
 
 @KtorExperimentalLocationsAPI