Implement comment constitution

fix bugs

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

@@ -3,7 +3,6 @@ package fr.dcproject.routes
 import fr.dcproject.security.voter.CommentVoter.Action.UPDATE
 import fr.dcproject.security.voter.CommentVoter.Action.VIEW
 import fr.dcproject.security.voter.assertCan
-import fr.postgresjson.entity.UuidEntity
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -14,10 +13,8 @@ import io.ktor.request.receiveText
 import io.ktor.response.respond
 import io.ktor.routing.Route
 import java.util.*
-import fr.dcproject.entity.Comment as CommentEntity
 import fr.dcproject.repository.CommentGeneric as CommentRepository
 
-typealias CommentEntityGeneric = CommentEntity<UuidEntity>
 @KtorExperimentalLocationsAPI
 object CommentPaths {
     // TODO: change UUID by entity converter
@@ -38,7 +35,7 @@ fun Route.comment(repo: CommentRepository) {
         assertCan(UPDATE,comment)
 
         comment.content = call.receiveText()
-        repo.edit(comment as CommentEntity<UuidEntity>)
+        repo.edit(comment)
 
         call.respond(HttpStatusCode.OK, comment)
     }

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

@@ -11,7 +11,7 @@ import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location
 import io.ktor.locations.get
 import io.ktor.locations.post
-import io.ktor.request.receive
+import io.ktor.request.receiveText
 import io.ktor.response.respond
 import io.ktor.routing.Route
 import fr.dcproject.entity.Article as ArticleEntity
@@ -37,7 +37,7 @@ fun Route.commentArticle(repo: CommentArticleRepository) {
     post<CommentArticlePaths.ArticleCommentRequest> {
         assertCan(CREATE, it.article)
 
-        val content = call.receive<String>()
+        val content = call.receiveText()
         val comment = CommentEntity(
             target = it.article,
             createdBy = citizen,

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

@@ -0,0 +1,55 @@
+package fr.dcproject.routes
+
+import fr.dcproject.citizen
+import fr.dcproject.entity.Citizen
+import fr.dcproject.security.voter.CommentVoter.Action.CREATE
+import fr.dcproject.security.voter.CommentVoter.Action.VIEW
+import fr.dcproject.security.voter.assertCan
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.request.receiveText
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import fr.dcproject.entity.Comment as CommentEntity
+import fr.dcproject.entity.Constitution as ConstitutionEntity
+import fr.dcproject.repository.CommentConstitution as CommentConstitutionRepository
+
+@KtorExperimentalLocationsAPI
+object CommentConstitutionPaths {
+    @Location("/constitutions/{constitution}/comments") class ConstitutionCommentRequest(val constitution: ConstitutionEntity)
+    @Location("/citizens/{citizen}/comments/constitutions") class CitizenCommentConstitutionRequest(val citizen: Citizen)
+}
+
+@KtorExperimentalLocationsAPI
+fun Route.commentConstitution(repo: CommentConstitutionRepository) {
+    get<CommentConstitutionPaths.ConstitutionCommentRequest> {
+        assertCan(VIEW, it.constitution)
+
+        val comment = repo.findByTarget(it.constitution)
+
+        call.respond(HttpStatusCode.OK, comment)
+    }
+
+    post<CommentConstitutionPaths.ConstitutionCommentRequest> {
+        assertCan(CREATE, it.constitution)
+
+        val content = call.receiveText()
+        val comment = CommentEntity(
+            target = it.constitution,
+            createdBy = citizen,
+            content = content
+        )
+        repo.comment(comment)
+
+        call.respond(HttpStatusCode.Created, comment)
+    }
+
+    get<CommentConstitutionPaths.CitizenCommentConstitutionRequest> {
+        val comments = repo.findByCitizen(it.citizen)
+        call.respond(comments)
+    }
+}