Add validation on route CreateComments & EditComment

rename POST /comments/{comment}/children
method edit and create comment of repository return edited/created comment

src/test/kotlin/integration/Comment routes.kt

@@ -2,16 +2,20 @@ package integration
 
 import fr.dcproject.component.citizen.database.CitizenI
 import integration.steps.`when`.`When I send a GET request`
+import integration.steps.`when`.`When I send a POST request`
 import integration.steps.`when`.`When I send a PUT request`
 import integration.steps.`when`.`with body`
 import integration.steps.given.`Given I have article`
 import integration.steps.given.`Given I have citizen`
 import integration.steps.given.`Given I have comment on article`
+import integration.steps.given.`Given I have comment on comment`
 import integration.steps.given.`authenticated as`
 import integration.steps.then.`And the response should contain`
 import integration.steps.then.`And the response should not be null`
 import integration.steps.then.`Then the response should be`
 import integration.steps.then.and
+import io.ktor.http.HttpStatusCode.Companion.BadRequest
+import io.ktor.http.HttpStatusCode.Companion.Created
 import io.ktor.http.HttpStatusCode.Companion.OK
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Tags
@@ -35,27 +39,105 @@ class `Comment routes` : BaseTest() {
         }
     }
 
+    @Test
+    fun `I can create comment`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Hubert", "Reeves")
+            `Given I have comment on comment`(id = "49933147-fc0f-4e5c-aa8d-f77fa0d88fa6")
+            `When I send a POST request`("/comments/49933147-fc0f-4e5c-aa8d-f77fa0d88fa6") {
+                `authenticated as`("Hubert", "Reeves")
+                `with body`(
+                    """
+                    {
+                      "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+                    }
+                    """
+                )
+            } `Then the response should be` Created and {
+                `And the response should not be null`()
+                `And the response should contain`("$.content", "Lorem ipsum dolor sit amet, consectetur adipiscing elit.")
+            }
+        }
+    }
+
+    @Test
+    @Tag("BadRequest")
+    fun `I cannot create comment with bad request`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Hubert", "Reeves")
+            `Given I have comment on comment`(id = "49933147-fc0f-4e5c-aa8d-f77fa0d88fa6")
+            `When I send a POST request`("/comments/49933147-fc0f-4e5c-aa8d-f77fa0d88fa6") {
+                `authenticated as`("Hubert", "Reeves")
+                `with body`(
+                    """
+                    {
+                      "content": "small content"
+                    }
+                    """
+                )
+            } `Then the response should be` BadRequest and {
+                `And the response should not be null`()
+                `And the response should contain`("$.invalidParams[0].name", ".content")
+                `And the response should contain`("$.invalidParams[0].reason", "must have at least 20 characters")
+            }
+        }
+    }
+
     @Test
     fun `I can edit comment`() {
         withIntegrationApplication {
             `Given I have citizen`("Hubert", "Reeves")
             `Given I have article`(id = "bb05e4a3-55a1-4088-85e7-8d8c23be29b1")
-            `Given I have comment on article`(article = "bb05e4a3-55a1-4088-85e7-8d8c23be29b1", createdBy = CitizenI.Name(
-                "Hubert",
-                "Reeves"
-            ), id = "fd30d20f-656c-42c6-8955-f61c04537464")
+            `Given I have comment on article`(
+                article = "bb05e4a3-55a1-4088-85e7-8d8c23be29b1",
+                createdBy = CitizenI.Name(
+                    "Hubert",
+                    "Reeves"
+                ),
+                id = "fd30d20f-656c-42c6-8955-f61c04537464"
+            )
             `When I send a PUT request`("/comments/fd30d20f-656c-42c6-8955-f61c04537464") {
                 `authenticated as`("Hubert", "Reeves")
                 `with body`(
                     """
                     {
-                      "content": "Hello boy"
+                      "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
                     }
                     """
                 )
             } `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And the response should contain`("$.content", "Hello boy")
+                `And the response should contain`("$.content", "Lorem ipsum dolor sit amet, consectetur adipiscing elit.")
+            }
+        }
+    }
+
+    @Test
+    fun `I cannot edit comment with bad request`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Hubert", "Reeves")
+            `Given I have article`(id = "bb05e4a3-55a1-4088-85e7-8d8c23be29b1")
+            `Given I have comment on article`(
+                article = "bb05e4a3-55a1-4088-85e7-8d8c23be29b1",
+                createdBy = CitizenI.Name(
+                    "Hubert",
+                    "Reeves"
+                ),
+                id = "fd30d20f-656c-42c6-8955-f61c04537464"
+            )
+            `When I send a PUT request`("/comments/fd30d20f-656c-42c6-8955-f61c04537464") {
+                `authenticated as`("Hubert", "Reeves")
+                `with body`(
+                    """
+                    {
+                      "content": "small content"
+                    }
+                    """
+                )
+            } `Then the response should be` BadRequest and {
+                `And the response should not be null`()
+                `And the response should contain`("$.invalidParams[0].name", ".content")
+                `And the response should contain`("$.invalidParams[0].reason", "must have at least 20 characters")
             }
         }
     }

src/test/kotlin/integration/steps/given/Comment.kt

@@ -2,11 +2,16 @@ package integration.steps.given
 
 import com.thedeanda.lorem.LoremIpsum
 import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.entity.TargetRef
 import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.database.ArticleRef
 import fr.dcproject.component.article.database.ArticleRepository
+import fr.dcproject.component.citizen.database.CitizenCreator
 import fr.dcproject.component.citizen.database.CitizenI.Name
 import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.generic.database.CommentForView
+import fr.dcproject.component.comment.generic.database.CommentI
+import fr.dcproject.component.comment.generic.database.CommentRef
 import fr.dcproject.component.comment.generic.database.CommentRepository
 import fr.dcproject.component.constitution.database.ConstitutionRef
 import fr.dcproject.component.constitution.database.ConstitutionRepository
@@ -32,14 +37,14 @@ fun TestApplicationEngine.`Given I have comments on article`(
     }
 }
 
-fun createComment(
+fun <A : ArticleRef> createComment(
     id: UUID? = null,
-    article: ArticleRef? = null,
+    article: A? = null,
     createdBy: Name? = null,
     content: String? = null
-) {
+): CommentForView<TargetRef, CitizenCreator> {
     val articleRepository: ArticleRepository by lazy { GlobalContext.get().koin.get() }
-    createCommentOnTarget(
+    return createCommentOnTarget(
         id,
         article?.id?.let { articleRepository.findById(article.id) } ?: createArticle(article?.id),
         createdBy,
@@ -56,14 +61,14 @@ fun TestApplicationEngine.`Given I have comment on constitution`(
     createComment(id?.toUUID(), ConstitutionRef(constitution?.toUUID()), createdBy, content)
 }
 
-fun createComment(
+fun <C : ConstitutionRef> createComment(
     id: UUID? = null,
-    constitution: ConstitutionRef? = null,
+    constitution: C? = null,
     createdBy: Name? = null,
     content: String? = null
-) {
+): CommentForView<TargetRef, CitizenCreator> {
     val constitutionRepository: ConstitutionRepository by lazy { GlobalContext.get().koin.get() }
-    createCommentOnTarget(
+    return createCommentOnTarget(
         id,
         constitution?.id?.let { constitutionRepository.findById(constitution.id) } ?: createConstitution(constitution?.id),
         createdBy,
@@ -71,12 +76,12 @@ fun createComment(
     )
 }
 
-fun createCommentOnTarget(
+fun <T : TargetI> createCommentOnTarget(
     id: UUID? = null,
-    target: TargetI,
+    target: T,
     createdBy: Name? = null,
     content: String? = null
-) {
+): CommentForView<TargetRef, CitizenCreator> {
     val commentRepository: CommentRepository by lazy { GlobalContext.get().koin.get() }
     val creator = createCitizen(createdBy)
     val comment = CommentForUpdate(
@@ -85,5 +90,41 @@ fun createCommentOnTarget(
         target = target,
         content = content ?: LoremIpsum().getParagraphs(1, 3)
     )
-    commentRepository.comment(comment)
+    return commentRepository.comment(comment)
+}
+
+fun TestApplicationEngine.`Given I have comment on comment`(
+    id: String? = null,
+    parent: String? = null,
+    createdBy: Name? = null,
+    content: String? = null,
+): CommentForView<out TargetRef, CitizenCreator> {
+    return createCommentOnComment(
+        id?.toUUID() ?: UUID.randomUUID(),
+        parent?.run { CommentRef(toUUID()) },
+        createdBy,
+        content,
+    )
+}
+
+fun createCommentOnComment(
+    id: UUID? = null,
+    parent: CommentI? = createComment<ArticleRef>(),
+    createdBy: Name? = null,
+    content: String? = null
+): CommentForView<out TargetRef, CitizenCreator> {
+    val creator = createCitizen(createdBy)
+    val commentRepository: CommentRepository by lazy { GlobalContext.get().koin.get() }
+    val parentComment = if (parent == null) {
+        createComment<ArticleRef>()
+    } else {
+        commentRepository.findById(parent.id) ?: error("Parent of comment not found")
+    }
+    val comment = CommentForUpdate(
+        id = id ?: UUID.randomUUID(),
+        createdBy = creator,
+        content = content ?: LoremIpsum().getParagraphs(1, 3),
+        parent = parentComment,
+    )
+    return commentRepository.comment(comment)
 }