Add developer documentation fo create action

README.md

@@ -1,5 +1,7 @@
 # DC Project
 
+[![CodeFactor](https://www.codefactor.io/repository/github/flecomte/dc-project/badge?s=869dc426625a253a07bea95f9380e23fdb048b94)](https://www.codefactor.io/repository/github/flecomte/dc-project)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/0ec4fe63370148ca956974f90f8d55be)](https://www.codacy.com/gh/flecomte/dc-project/dashboard?utm_source=github.com&utm_medium=referral&utm_content=flecomte/dc-project&utm_campaign=Badge_Grade)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=dc-project&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=dc-project)
 
 [![Tests](https://github.com/flecomte/dc-project/actions/workflows/tests.yml/badge.svg)](https://github.com/flecomte/dc-project/actions/workflows/tests.yml)

build.gradle.kts

@@ -197,7 +197,7 @@ val sourcesJar by tasks.registering(Jar::class) {
 tasks.test {
     useJUnit()
     useJUnitPlatform()
-    // systemProperty("junit.jupiter.execution.parallel.enabled", true)
+    systemProperty("junit.jupiter.execution.parallel.enabled", true)
     dependsOn(testSql)
     finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
 }
@@ -320,43 +320,6 @@ tasks.named("testComposeUp").configure {
     }
 }
 
-tasks.register("testArticles", Test::class) {
-    group = "tests"
-    useJUnitPlatform {
-        includeTags("article")
-    }
-}
-tasks.register("testCitizens", Test::class) {
-    group = "tests"
-    useJUnitPlatform {
-        includeTags("citizen")
-    }
-}
-tasks.register("testComments", Test::class) {
-    group = "tests"
-    useJUnitPlatform {
-        includeTags("comment")
-    }
-}
-tasks.register("testConstitutions", Test::class) {
-    group = "tests"
-    useJUnitPlatform {
-        includeTags("constitution")
-    }
-}
-tasks.register("testFollows", Test::class) {
-    group = "tests"
-    useJUnitPlatform {
-        includeTags("follow")
-    }
-}
-tasks.register("testNotifications", Test::class) {
-    group = "tests"
-    useJUnitPlatform {
-        includeTags("notification")
-    }
-}
-
 dependencyCheck {
     formats = listOf(ReportGenerator.Format.HTML, ReportGenerator.Format.XML)
 }
@@ -364,9 +327,8 @@ dependencyCheck {
 repositories {
     mavenLocal()
     jcenter()
-    maven("https://kotlin.bintray.com/ktor")
-    maven("https://jitpack.io")
-    maven("https://dl.bintray.com/konform-kt/konform")
+    maven { url = uri("https://kotlin.bintray.com/ktor") }
+    maven { url = uri("https://jitpack.io") }
 }
 
 dependencies {
@@ -397,7 +359,6 @@ dependencies {
     implementation("org.elasticsearch.client:elasticsearch-rest-client:6.7.1")
     implementation("com.jayway.jsonpath:json-path:2.5.0")
     implementation("com.avast.gradle:gradle-docker-compose-plugin:0.14.0")
-    implementation("io.konform:konform-jvm:0.2.0")
 
     testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
     testImplementation("io.ktor:ktor-client-mock:$ktorVersion")

doc/CreateAction.md

@@ -0,0 +1,30 @@
+Create Action
+============
+
+* [ ] Create [OpenApi](../src/main/resources/openapi.yaml) documentation
+* [ ] Create route
+    * [ ] Create request with [Location](https://ktor.io/docs/features-locations.html)
+        * [ ] Create Validation of request with [Konform](https://www.konform.io)
+            * [ ] Test validation
+    * [ ] [Check auth](../src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt) on protected route
+        * [ ] [Create test for auth](../src/test/kotlin/integration/steps/given/Auth.kt)
+    * [ ] Return must not be an Entity
+    * [ ] Tests request:
+        * [ ] Route with these params
+        * [ ] Body of the request
+          * [ ] Success
+          * [ ] BadRequest
+        * [ ] Body and request params must [match with the openapi schema](../src/test/kotlin/integration/steps/then/schema.kt)
+* [ ] Create [AccessControl](../src/main/kotlin/fr/dcproject/common/security/AccessControlModule.kt)
+    * [ ] Test [AccessControl](../src/test/kotlin/integration/steps/given/Auth.kt)
+  
+
+* [ ] Create Entity
+  
+
+* [ ] Create Repository
+* [ ] Create SQL function in file
+    * [ ] Create Tests SQL
+  
+* [ ] Tests
+    * [ ] Test BadRequest

src/main/kotlin/fr/dcproject/application/Converters.kt

@@ -1,10 +1,6 @@
 package fr.dcproject.application
 
-import fr.dcproject.application.http.BadRequestException
-import fr.dcproject.application.http.HttpErrorBadRequest
-import fr.dcproject.application.http.HttpErrorBadRequest.InvalidParam
 import io.ktor.features.DataConversion
-import io.ktor.http.HttpStatusCode
 import io.ktor.util.KtorExperimentalAPI
 import org.koin.core.context.GlobalContext
 import org.koin.core.parameter.ParametersDefinition
@@ -12,7 +8,6 @@ import org.koin.core.qualifier.Qualifier
 import java.util.UUID
 
 private typealias ConverterDeclaration = DataConversion.Configuration.() -> Unit
-
 private inline fun <reified T> DataConversion.Configuration.get(
     qualifier: Qualifier? = null,
     noinline parameters: ParametersDefinition? = null
@@ -22,21 +17,7 @@ private inline fun <reified T> DataConversion.Configuration.get(
 val converters: ConverterDeclaration = {
     convert<UUID> {
         decode { values, _ ->
-            try {
-                values.singleOrNull()?.let { UUID.fromString(it) }
-            } catch (e: Throwable) {
-                throw BadRequestException(
-                    HttpErrorBadRequest(
-                        HttpStatusCode.BadRequest,
-                        invalidParams = listOf(
-                            InvalidParam(
-                                "ID",
-                                "must be UUID"
-                            )
-                        )
-                    )
-                )
-            }
+            values.singleOrNull()?.let { UUID.fromString(it) }
         }
 
         encode { value ->

src/main/kotlin/fr/dcproject/application/http/HttpErrorBadRequest.kt

@@ -1,35 +0,0 @@
-package fr.dcproject.application.http
-
-import fr.dcproject.application.http.HttpErrorBadRequest.InvalidParam
-import io.konform.validation.ValidationResult
-import io.ktor.http.HttpStatusCode
-
-class BadRequestException(val httpError: HttpErrorBadRequest) : Exception()
-
-class HttpErrorBadRequest(
-    statusCode: HttpStatusCode,
-    val title: String = statusCode.description,
-    val invalidParams: List<InvalidParam>,
-) {
-    val statusCode: Int = statusCode.value
-    data class InvalidParam(
-        val name: String,
-        val reason: String
-    )
-}
-
-fun ValidationResult<*>.toOutput() = HttpErrorBadRequest(
-    HttpStatusCode.BadRequest,
-    invalidParams = this.errors.map {
-        InvalidParam(
-            it.dataPath,
-            it.message
-        )
-    }
-)
-
-fun ValidationResult<*>.badRequestIfNotValid() {
-    if (errors.size > 0) {
-        throw BadRequestException(toOutput())
-    }
-}

src/main/kotlin/fr/dcproject/application/http/HttpStatusError.kt

@@ -6,7 +6,6 @@ import fr.dcproject.component.auth.ForbiddenException
 import fr.dcproject.component.auth.user
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
-import io.ktor.features.ParameterConversionException
 import io.ktor.features.StatusPages
 import io.ktor.http.HttpStatusCode
 import io.ktor.response.respond
@@ -14,10 +13,18 @@ import java.util.concurrent.CompletionException
 
 class HttpError(
     statusCode: HttpStatusCode,
-    cause: Throwable? = null,
+    val cause: Throwable? = null,
+    val type: String? = null,
     val title: String = cause?.message ?: statusCode.description,
+    val detail: String? = null,
+    val invalidParams: List<InvalidParam>? = null,
+    val stackTrace: String? = cause?.stackTraceToString()
 ) {
     val statusCode: Int = statusCode.value
+    data class InvalidParam(
+        val name: String,
+        val reason: String
+    )
 }
 
 fun statusPagesInstallation(): StatusPages.Configuration.() -> Unit = {
@@ -72,15 +79,4 @@ fun statusPagesInstallation(): StatusPages.Configuration.() -> Unit = {
             call.respond(HttpStatusCode.Forbidden, it)
         }
     }
-    exception<BadRequestException> { e ->
-        call.respond(HttpStatusCode.BadRequest, e.httpError)
-    }
-    exception<ParameterConversionException> { e ->
-        val parent = e.cause
-        if (parent is BadRequestException) {
-            call.respond(HttpStatusCode.BadRequest, parent.httpError)
-        } else {
-            throw e
-        }
-    }
 }

src/main/kotlin/fr/dcproject/common/request/PaginatedRequest.kt

@@ -6,6 +6,9 @@ interface PaginatedRequestI {
 }
 
 open class PaginatedRequest(
-    override val page: Int = 1,
-    override val limit: Int = 50
-) : PaginatedRequestI
+    page: Int = 1,
+    limit: Int = 50
+) : PaginatedRequestI {
+    override val page: Int = if (page < 1) 1 else page
+    override val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
+}

src/main/kotlin/fr/dcproject/common/utils/Elastic.kt

@@ -4,6 +4,7 @@ import com.jayway.jsonpath.JsonPath
 import com.jayway.jsonpath.PathNotFoundException
 import org.apache.http.util.EntityUtils
 import org.elasticsearch.client.Response
+import org.slf4j.LoggerFactory
 
 fun Response.contentToString(): String {
     return EntityUtils.toString(this.entity)
@@ -21,6 +22,8 @@ fun String.getJsonField(jsonPath: String): Int? {
     return try {
         JsonPath.read(this, jsonPath)
     } catch (e: PathNotFoundException) {
+        LoggerFactory.getLogger("fr.dcproject.utils.getJsonField")
+            .warn("No value for Json path ${JsonPath.compile(jsonPath).path}")
         null
     }
 }

src/main/kotlin/fr/dcproject/common/validation/Email.kt

@@ -1,6 +0,0 @@
-package fr.dcproject.common.validation
-
-import io.konform.validation.ValidationBuilder
-import io.konform.validation.jsonschema.pattern
-
-fun ValidationBuilder<String>.email() = pattern(""".+@.+\..+""")

src/main/kotlin/fr/dcproject/common/validation/Password.kt

@@ -1,22 +0,0 @@
-package fr.dcproject.common.validation
-
-import io.konform.validation.ValidationBuilder
-
-fun ValidationBuilder<String>.passwordScore(minScore: Int) =
-    addConstraint("is not enough strong. Use Upper case, Lower case and special characters or juste use more characters.") { value ->
-        value.passwordScore() >= minScore
-    }
-
-fun String.passwordScore(): Int {
-    var score: Int = length
-    val alphaNum = ('a'..'z').toList() + ('A'..'Z').toList() + ('0'..'9').toList()
-    val specialCount = length - toList().intersect(alphaNum).size
-    score += specialCount.let { if (it > 3) 3 else it }
-
-    val hasAlphaLower = toList().intersect(('a'..'z').toList()).size.let { if (it > 2) 2 else it }
-    val hasAlphaUpper = toList().intersect(('A'..'Z').toList()).size.let { if (it > 2) 2 else it }
-    val hasNum = toList().intersect(('0'..'9').toList()).size.let { if (it > 2) 2 else it }
-    score += (hasAlphaLower + hasAlphaUpper + hasNum - 2) * 2
-
-    return score
-}

src/main/kotlin/fr/dcproject/common/validation/Uuid.kt

@@ -1,14 +0,0 @@
-package fr.dcproject.common.validation
-
-import io.konform.validation.ValidationBuilder
-import java.util.UUID
-
-fun ValidationBuilder<String>.isUuid() =
-    addConstraint("must be UUID") {
-        try {
-            UUID.fromString(it)
-            true
-        } catch (exception: IllegalArgumentException) {
-            false
-        }
-    }

src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt

@@ -1,69 +1,42 @@
 package fr.dcproject.component.article.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
-import fr.dcproject.common.utils.toUUID
-import fr.dcproject.common.validation.isUuid
 import fr.dcproject.component.article.ArticleAccessControl
 import fr.dcproject.component.article.database.ArticleForListing
+import fr.dcproject.component.article.database.ArticleRef
 import fr.dcproject.component.article.database.ArticleRepository
 import fr.dcproject.component.auth.citizenOrNull
-import fr.dcproject.routes.PaginatedRequest
-import fr.dcproject.routes.PaginatedRequestI
 import fr.postgresjson.repository.RepositoryI
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.enum
-import io.konform.validation.jsonschema.maximum
-import io.konform.validation.jsonschema.minimum
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location
 import io.ktor.locations.get
 import io.ktor.response.respond
 import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object FindArticleVersions {
     @Location("/articles/{article}/versions")
     class ArticleVersionsRequest(
-        val article: String,
+        article: UUID,
         page: Int = 1,
         limit: Int = 50,
         val sort: String? = null,
         val direction: RepositoryI.Direction? = null,
         val search: String? = null
-    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
-        fun validate() = Validation<ArticleVersionsRequest> {
-            ArticleVersionsRequest::page {
-                minimum(1)
-                maximum(100)
-            }
-            ArticleVersionsRequest::limit {
-                minimum(1)
-                maximum(50)
-            }
-            ArticleVersionsRequest::sort ifPresent {
-                enum(
-                    "title",
-                    "createdAt",
-                    "vote",
-                    "popularity",
-                )
-            }
-            ArticleVersionsRequest::article {
-                isUuid()
-            }
-        }.validate(this)
+    ) {
+        val page: Int = if (page < 1) 1 else page
+        val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
+        val article = ArticleRef(article)
     }
 
     private fun ArticleRepository.findVersions(request: ArticleVersionsRequest) =
-        findVersionsById(request.page, request.limit, request.article.toUUID())
+        findVersionsById(request.page, request.limit, request.article.id)
 
     fun Route.findArticleVersions(repo: ArticleRepository, ac: ArticleAccessControl) {
         get<ArticleVersionsRequest> {
-            it.validate().badRequestIfNotValid()
-
             repo.findVersions(it)
                 .apply { ac.assert { canView(result, citizenOrNull) } }
                 .run {

src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt

@@ -1,9 +1,7 @@
 package fr.dcproject.component.article.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
-import fr.dcproject.common.validation.isUuid
 import fr.dcproject.component.article.ArticleAccessControl
 import fr.dcproject.component.article.database.ArticleForListing
 import fr.dcproject.component.article.database.ArticleRepository
@@ -12,10 +10,6 @@ import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.repository.RepositoryI
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.enum
-import io.konform.validation.jsonschema.maximum
-import io.konform.validation.jsonschema.minimum
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location
@@ -34,31 +28,7 @@ object FindArticles {
         val search: String? = null,
         val createdBy: String? = null,
         val workgroup: String? = null
-    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
-        fun validate() = Validation<ArticlesRequest> {
-            ArticlesRequest::page {
-                minimum(1)
-            }
-            ArticlesRequest::limit {
-                minimum(1)
-                maximum(50)
-            }
-            ArticlesRequest::sort ifPresent {
-                enum(
-                    "title",
-                    "createdAt",
-                    "vote",
-                    "popularity",
-                )
-            }
-            ArticlesRequest::createdBy ifPresent {
-                isUuid()
-            }
-            ArticlesRequest::workgroup ifPresent {
-                isUuid()
-            }
-        }.validate(this)
-    }
+    ) : PaginatedRequestI by PaginatedRequest(page, limit)
 
     private fun ArticleRepository.findArticles(request: ArticlesRequest): Paginated<ArticleForListing> {
         return find(
@@ -73,8 +43,6 @@ object FindArticles {
 
     fun Route.findArticles(repo: ArticleRepository, ac: ArticleAccessControl) {
         get<ArticlesRequest> {
-            it.validate().badRequestIfNotValid()
-
             repo.findArticles(it)
                 .apply { ac.assert { canView(result, citizenOrNull) } }
                 .let {

src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt

@@ -1,6 +1,5 @@
 package fr.dcproject.component.article.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.security.assert
 import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.article.ArticleAccessControl
@@ -13,11 +12,6 @@ import fr.dcproject.component.auth.mustBeAuth
 import fr.dcproject.component.notification.ArticleUpdateNotification
 import fr.dcproject.component.notification.Publisher
 import fr.dcproject.component.workgroup.database.WorkgroupRef
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.maxItems
-import io.konform.validation.jsonschema.maxLength
-import io.konform.validation.jsonschema.minItems
-import io.konform.validation.jsonschema.minLength
 import io.ktor.application.ApplicationCall
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -41,31 +35,11 @@ object UpsertArticle {
             val draft: Boolean = false,
             val versionId: UUID,
             val workgroup: WorkgroupRef? = null,
-        ) {
-            fun validate() = Validation<Input> {
-                Input::title {
-                    minLength(5)
-                    maxLength(80)
-                }
-                Input::content {
-                    minLength(50)
-                    maxLength(6000)
-                }
-                Input::description {
-                    minLength(50)
-                    maxLength(6000)
-                }
-                Input::tags {
-                    minItems(0)
-                    maxItems(15)
-                }
-            }.validate(this)
-        }
+        )
     }
 
     fun Route.upsertArticle(repo: ArticleRepository, publisher: Publisher, ac: ArticleAccessControl) {
         suspend fun ApplicationCall.convertRequestToEntity(): ArticleForUpdate = receiveOrBadRequest<Input>().run {
-            validate().badRequestIfNotValid()
             ArticleForUpdate(
                 id = id ?: UUID.randomUUID(),
                 title = title,

src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt

@@ -1,10 +1,7 @@
 package fr.dcproject.component.auth.routes
 
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.utils.receiveOrBadRequest
-import fr.dcproject.common.validation.email
-import fr.dcproject.common.validation.passwordScore
 import fr.dcproject.component.auth.database.UserForCreate
 import fr.dcproject.component.auth.database.UserI
 import fr.dcproject.component.auth.jwt.makeToken
@@ -12,9 +9,6 @@ import fr.dcproject.component.auth.routes.Register.RegisterRequest.Input
 import fr.dcproject.component.citizen.database.CitizenForCreate
 import fr.dcproject.component.citizen.database.CitizenI
 import fr.dcproject.component.citizen.database.CitizenRepository
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.maxLength
-import io.konform.validation.jsonschema.minLength
 import io.ktor.application.call
 import io.ktor.features.BadRequestException
 import io.ktor.http.ContentType
@@ -49,35 +43,6 @@ object Register {
                 val username: String,
                 val password: String
             )
-
-            fun validate() = Validation<Input> {
-                Input::name {
-                    Name::firstName {
-                        minLength(2)
-                        maxLength(50)
-                    }
-                    Name::lastName {
-                        minLength(2)
-                        maxLength(50)
-                    }
-                    Name::civility ifPresent {
-                        minLength(1)
-                        maxLength(10)
-                    }
-                }
-                Input::user {
-                    User::username {
-                        minLength(7)
-                        maxLength(30)
-                    }
-                    User::password {
-                        passwordScore(15)
-                    }
-                }
-                Input::email {
-                    email()
-                }
-            }.validate(this)
         }
     }
 
@@ -97,10 +62,7 @@ object Register {
 
         post<RegisterRequest> {
             try {
-                val citizen = call.receiveOrBadRequest<Input>()
-                    .apply { validate().badRequestIfNotValid() }
-                    .toCitizen()
-
+                val citizen = call.receiveOrBadRequest<Input>().toCitizen()
                 citizenRepo.insertWithUser(citizen)?.user?.makeToken()?.let { token ->
                     if (call.request.accept() == ContentType.Application.Json.toString()) {
                         call.respond(

src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt

@@ -1,9 +1,7 @@
 package fr.dcproject.component.citizen.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.security.assert
 import fr.dcproject.common.utils.receiveOrBadRequest
-import fr.dcproject.common.validation.passwordScore
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.auth.database.UserRepository
@@ -11,7 +9,6 @@ import fr.dcproject.component.auth.database.UserWithPassword
 import fr.dcproject.component.auth.mustBeAuth
 import fr.dcproject.component.citizen.CitizenAccessControl
 import fr.dcproject.component.citizen.database.CitizenRef
-import io.konform.validation.Validation
 import io.ktor.application.call
 import io.ktor.auth.UserPasswordCredential
 import io.ktor.features.BadRequestException
@@ -28,21 +25,14 @@ object ChangeMyPassword {
     @Location("/citizens/{citizen}/password/change")
     class ChangePasswordCitizenRequest(citizen: UUID) {
         val citizen = CitizenRef(citizen)
-        data class Input(val oldPassword: String, val newPassword: String) {
-            fun validate() = Validation<Input> {
-                Input::newPassword {
-                    passwordScore(15)
-                }
-            }.validate(this)
-        }
+        data class Input(val oldPassword: String, val newPassword: String)
     }
 
     fun Route.changeMyPassword(ac: CitizenAccessControl, userRepository: UserRepository) {
         put<ChangePasswordCitizenRequest> {
             mustBeAuth()
-            val content = call.receiveOrBadRequest<ChangePasswordCitizenRequest.Input>()
-                .apply { validate().badRequestIfNotValid() }
             ac.assert { canChangePassword(it.citizen, citizenOrNull) }
+            val content = call.receiveOrBadRequest<ChangePasswordCitizenRequest.Input>()
             userRepository.findByCredentials(UserPasswordCredential(citizen.user.username, content.oldPassword)) ?: throw BadRequestException("Bad Password")
             userRepository.changePassword(
                 UserWithPassword(

src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt

@@ -1,6 +1,5 @@
 package fr.dcproject.component.citizen.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
@@ -11,10 +10,6 @@ import fr.dcproject.component.citizen.database.CitizenRepository
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
 import fr.postgresjson.repository.RepositoryI
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.enum
-import io.konform.validation.jsonschema.maximum
-import io.konform.validation.jsonschema.minimum
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location
@@ -32,28 +27,11 @@ object FindCitizens {
         val sort: String? = null,
         val direction: RepositoryI.Direction? = null,
         val search: String? = null
-    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
-        fun validate() = Validation<CitizensRequest> {
-            CitizensRequest::page {
-                minimum(1)
-            }
-            CitizensRequest::limit {
-                minimum(1)
-                maximum(50)
-            }
-            CitizensRequest::sort ifPresent {
-                enum(
-                    "title",
-                    "createdAt",
-                )
-            }
-        }.validate(this)
-    }
+    ) : PaginatedRequestI by PaginatedRequest(page, limit)
 
     fun Route.findCitizen(ac: CitizenAccessControl, repo: CitizenRepository) {
         get<CitizensRequest> {
             mustBeAuth()
-            it.validate().badRequestIfNotValid()
             val citizens = repo.find(it.page, it.limit, it.sort, it.direction, it.search)
             ac.assert { canView(citizens.result, citizenOrNull) }
             call.respond(

src/main/kotlin/fr/dcproject/component/comment/article/database/CommentArticleRepository.kt

@@ -41,7 +41,7 @@ class CommentArticleRepository(requester: Requester) : CommentRepositoryAbs<Arti
         target: EntityI,
         page: Int,
         limit: Int,
-        sort: String
+        sort: Sort
     ): Paginated<CommentForView<ArticleForView, CitizenCreatorI>> {
         return requester
             .getFunction("find_comments_by_target")
@@ -49,7 +49,18 @@ class CommentArticleRepository(requester: Requester) : CommentRepositoryAbs<Arti
                 page,
                 limit,
                 "target_id" to target.id,
-                "sort" to sort
+                "sort" to sort.sql
             ) as Paginated<CommentForView<ArticleForView, CitizenCreatorI>>
     }
+
+    enum class Sort(val sql: String) {
+        CREATED_AT("created_at"),
+        VOTES("votes");
+
+        companion object {
+            fun fromString(string: String): Sort? {
+                return values().firstOrNull { it.sql == string }
+            }
+        }
+    }
 }

src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.comment.article.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
+import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.article.database.ArticleRef
@@ -12,9 +12,6 @@ import fr.dcproject.component.comment.article.routes.CreateCommentArticle.PostAr
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.database.CommentForUpdate
 import fr.dcproject.component.comment.toOutput
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.maxLength
-import io.konform.validation.jsonschema.minLength
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -29,36 +26,27 @@ object CreateCommentArticle {
     @Location("/articles/{article}/comments")
     class PostArticleCommentRequest(article: UUID) {
         val article = ArticleRef(article)
-        class Input(val content: String) {
-            fun validate() = Validation<Input> {
-                Input::content {
-                    minLength(20)
-                    maxLength(6000)
-                }
-            }.validate(this)
-        }
+        class Input(val content: String)
     }
 
     fun Route.createCommentArticle(repo: CommentArticleRepository, ac: CommentAccessControl) {
         post<PostArticleCommentRequest> {
             mustBeAuth()
-            call.receiveOrBadRequest<Input>()
-                .apply { validate().badRequestIfNotValid() }
-                .run {
-                    CommentForUpdate(
-                        target = it.article,
-                        createdBy = citizen,
-                        content = content
-                    )
-                }.let { comment ->
-                    ac.assert { canCreate(comment, citizenOrNull) }
-                    repo.comment(comment)
+            call.receiveOrBadRequest<Input>().run {
+                CommentForUpdate(
+                    target = it.article,
+                    createdBy = citizen,
+                    content = content
+                )
+            }.let { comment ->
+                ac.assert { canCreate(comment, citizenOrNull) }
+                repo.comment(comment)
 
-                    call.respond(
-                        HttpStatusCode.Created,
-                        comment.toOutput()
-                    )
-                }
+                call.respond(
+                    HttpStatusCode.Created,
+                    comment.toOutput()
+                )
+            }
         }
     }
 }

src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt

@@ -1,6 +1,5 @@
 package fr.dcproject.component.comment.article.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.database.ArticleRef
@@ -10,10 +9,6 @@ import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.toOutput
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.enum
-import io.konform.validation.jsonschema.maximum
-import io.konform.validation.jsonschema.minimum
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -31,31 +26,14 @@ object GetArticleComments {
         page: Int = 1,
         limit: Int = 50,
         val search: String? = null,
-        val sort: String = "createdAt"
+        sort: String = CommentArticleRepository.Sort.CREATED_AT.sql
     ) : PaginatedRequestI by PaginatedRequest(page, limit) {
         val article = ArticleRef(article)
-
-        fun validate() = Validation<ArticleCommentsRequest> {
-            ArticleCommentsRequest::page {
-                minimum(1)
-            }
-            ArticleCommentsRequest::limit {
-                minimum(1)
-                maximum(50)
-            }
-            ArticleCommentsRequest::sort ifPresent {
-                enum(
-                    "votes",
-                    "createdAt",
-                )
-            }
-        }.validate(this)
+        val sort: CommentArticleRepository.Sort = CommentArticleRepository.Sort.fromString(sort) ?: CommentArticleRepository.Sort.CREATED_AT
     }
 
     fun Route.getArticleComments(repo: CommentArticleRepository, ac: CommentAccessControl) {
         get<ArticleCommentsRequest> {
-            it.validate().badRequestIfNotValid()
-
             val comments = repo.findByTarget(it.article, it.page, it.limit, it.sort)
             if (comments.result.isNotEmpty()) {
                 ac.assert { canView(comments.result, citizenOrNull) }

src/main/kotlin/fr/dcproject/component/comment/constitution/database/CommentConstitutionRepository.kt

@@ -5,6 +5,7 @@ import fr.dcproject.common.entity.TargetI
 import fr.dcproject.component.citizen.database.CitizenCreator
 import fr.dcproject.component.citizen.database.CitizenCreatorI
 import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
 import fr.dcproject.component.comment.generic.database.CommentForView
 import fr.dcproject.component.comment.generic.database.CommentRepositoryAbs
 import fr.dcproject.component.constitution.database.ConstitutionRef
@@ -40,7 +41,7 @@ class CommentConstitutionRepository(requester: Requester) : CommentRepositoryAbs
         target: EntityI,
         page: Int,
         limit: Int,
-        sort: String
+        sort: CommentArticleRepository.Sort
     ): Paginated<CommentForView<ConstitutionRef, CitizenCreatorI>> {
         return requester.run {
             getFunction("find_comments_by_target")
@@ -48,7 +49,7 @@ class CommentConstitutionRepository(requester: Requester) : CommentRepositoryAbs
                     page,
                     limit,
                     "target_id" to target.id,
-                    "sort" to sort
+                    "sort" to sort.sql
                 )
                 as Paginated<CommentForView<ConstitutionRef, CitizenCreatorI>>
         }

src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt

@@ -1,6 +1,5 @@
 package fr.dcproject.component.comment.constitution.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.common.utils.receiveOrBadRequest
@@ -13,9 +12,6 @@ import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.database.CommentForUpdate
 import fr.dcproject.component.comment.toOutput
 import fr.dcproject.component.constitution.database.ConstitutionRef
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.maxLength
-import io.konform.validation.jsonschema.minLength
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -30,37 +26,27 @@ object CreateConstitutionComment {
     @Location("/constitutions/{constitution}/comments")
     class CreateConstitutionCommentRequest(constitution: UUID) {
         val constitution = ConstitutionRef(constitution)
-        class Input(val content: String) {
-            fun validate() = Validation<Input> {
-                Input::content {
-                    minLength(20)
-                    maxLength(6000)
-                }
-            }.validate(this)
-        }
+        class Input(val content: String)
     }
 
     fun Route.createConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
         post<CreateConstitutionCommentRequest> {
             mustBeAuth()
+            call.receiveOrBadRequest<Input>().run {
+                CommentForUpdate(
+                    target = it.constitution,
+                    createdBy = citizen,
+                    content = content
+                )
+            }.let { comment ->
+                ac.assert { canCreate(comment, citizenOrNull) }
+                repo.comment(comment)
 
-            call.receiveOrBadRequest<Input>()
-                .apply { validate().badRequestIfNotValid() }
-                .run {
-                    CommentForUpdate(
-                        target = it.constitution,
-                        createdBy = citizen,
-                        content = content
-                    )
-                }.let { comment ->
-                    ac.assert { canCreate(comment, citizenOrNull) }
-                    repo.comment(comment)
-
-                    call.respond(
-                        HttpStatusCode.Created,
-                        comment.toOutput()
-                    )
-                }
+                call.respond(
+                    HttpStatusCode.Created,
+                    comment.toOutput()
+                )
+            }
         }
     }
 }

src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt

@@ -1,6 +1,5 @@
 package fr.dcproject.component.comment.constitution.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
@@ -8,12 +7,6 @@ import fr.dcproject.component.comment.constitution.database.CommentConstitutionR
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.toOutput
 import fr.dcproject.component.constitution.database.ConstitutionRef
-import fr.dcproject.routes.PaginatedRequest
-import fr.dcproject.routes.PaginatedRequestI
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.enum
-import io.konform.validation.jsonschema.maximum
-import io.konform.validation.jsonschema.minimum
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -26,36 +19,12 @@ import java.util.UUID
 @KtorExperimentalLocationsAPI
 object GetConstitutionComment {
     @Location("/constitutions/{constitution}/comments")
-    class GetConstitutionCommentRequest(
-        constitution: UUID,
-        page: Int = 1,
-        limit: Int = 50,
-        val search: String? = null,
-        val sort: String = "createdAt"
-    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
+    class GetConstitutionCommentRequest(constitution: UUID) {
         val constitution = ConstitutionRef(constitution)
-
-        fun validate() = Validation<GetConstitutionCommentRequest> {
-            GetConstitutionCommentRequest::page {
-                minimum(1)
-            }
-            GetConstitutionCommentRequest::limit {
-                minimum(1)
-                maximum(50)
-            }
-            GetConstitutionCommentRequest::sort ifPresent {
-                enum(
-                    "votes",
-                    "createdAt",
-                )
-            }
-        }.validate(this)
     }
 
     fun Route.getConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
         get<GetConstitutionCommentRequest> {
-            it.validate().badRequestIfNotValid()
-
             val comments = repo.findByTarget(it.constitution)
             ac.assert { canView(comments.result, citizenOrNull) }
             call.respond(

src/main/kotlin/fr/dcproject/component/comment/generic/database/Comment.kt

@@ -63,14 +63,12 @@ open class CommentForUpdate<T : TargetI, C : CitizenI>(
     constructor(
         createdBy: C,
         parent: CommentParent<T>,
-        content: String,
-        id: UUID? = null,
+        content: String
     ) : this(
         createdBy = createdBy,
         parent = parent,
         target = parent.target,
-        content = content,
-        id = id ?: UUID.randomUUID(),
+        content = content
     )
 }
 

src/main/kotlin/fr/dcproject/component/comment/generic/database/CommentRepository.kt

@@ -6,6 +6,7 @@ import fr.dcproject.common.entity.TargetRef
 import fr.dcproject.component.citizen.database.CitizenCreator
 import fr.dcproject.component.citizen.database.CitizenCreatorI
 import fr.dcproject.component.citizen.database.CitizenI
+import fr.dcproject.component.comment.article.database.CommentArticleRepository
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
@@ -48,7 +49,7 @@ abstract class CommentRepositoryAbs<T : TargetI>(override var requester: Request
         target: EntityI,
         page: Int = 1,
         limit: Int = 50,
-        sort: String = "createdAt"
+        sort: CommentArticleRepository.Sort = CommentArticleRepository.Sort.CREATED_AT
     ): Paginated<CommentForView<T, CitizenCreatorI>> {
         return findByTarget(target.id, page, limit, sort)
     }
@@ -57,30 +58,36 @@ abstract class CommentRepositoryAbs<T : TargetI>(override var requester: Request
         targetId: UUID,
         page: Int = 1,
         limit: Int = 50,
-        sort: String = "createdAt"
-    ): Paginated<CommentForView<T, CitizenCreatorI>> = requester
-        .getFunction("find_comments_by_target")
-        .select<CommentForView<T, CitizenCreator>>(
-            page,
-            limit,
-            "target_id" to targetId,
-            "sort" to sort
-        ) as Paginated<CommentForView<T, CitizenCreatorI>>
+        sort: CommentArticleRepository.Sort = CommentArticleRepository.Sort.CREATED_AT
+    ): Paginated<CommentForView<T, CitizenCreatorI>> {
+        return requester.run {
+            getFunction("find_comments_by_target")
+                .select<CommentForView<T, CitizenCreator>>(
+                    page,
+                    limit,
+                    "target_id" to targetId,
+                    "sort" to sort.sql
+                )
+                as Paginated<CommentForView<T, CitizenCreatorI>>
+        }
+    }
 
-    fun <I : TargetI, C : CitizenCreatorI> comment(comment: CommentForUpdate<I, C>): CommentForView<TargetRef, CitizenCreator> = requester
-        .getFunction("comment")
-        .selectOne(
-            "reference" to comment.target.reference,
-            "resource" to comment
-        )!!
+    fun <I : TargetI, C : CitizenCreatorI> comment(comment: CommentForUpdate<I, C>) {
+        requester
+            .getFunction("comment")
+            .sendQuery(
+                "reference" to comment.target.reference,
+                "resource" to comment
+            )
+    }
 
-    fun <I : T> edit(comment: CommentForUpdate<I, CitizenCreatorI>): CommentForView<TargetRef, CitizenCreator> {
-        return requester
+    fun <I : T> edit(comment: CommentForUpdate<I, CitizenCreatorI>) {
+        requester
             .getFunction("edit_comment")
-            .selectOne(
+            .sendQuery(
                 "id" to comment.id,
                 "content" to comment.content
-            )!!
+            )
     }
 }
 

src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateComment.kt

@@ -1,63 +0,0 @@
-package fr.dcproject.component.comment.generic.routes
-
-import fr.dcproject.application.http.badRequestIfNotValid
-import fr.dcproject.common.security.assert
-import fr.dcproject.common.utils.receiveOrBadRequest
-import fr.dcproject.component.auth.citizen
-import fr.dcproject.component.auth.citizenOrNull
-import fr.dcproject.component.auth.mustBeAuth
-import fr.dcproject.component.comment.generic.CommentAccessControl
-import fr.dcproject.component.comment.generic.database.CommentForUpdate
-import fr.dcproject.component.comment.generic.database.CommentRef
-import fr.dcproject.component.comment.generic.database.CommentRepository
-import fr.dcproject.component.comment.toOutput
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.maxLength
-import io.konform.validation.jsonschema.minLength
-import io.ktor.application.call
-import io.ktor.features.NotFoundException
-import io.ktor.http.HttpStatusCode
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.locations.Location
-import io.ktor.locations.post
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import java.util.UUID
-
-@KtorExperimentalLocationsAPI
-object CreateComment {
-    @Location("/comments/{comment}")
-    class CreateCommentRequest(comment: UUID) {
-        val comment = CommentRef(comment)
-        class Input(val content: String) {
-            fun validate() = Validation<Input> {
-                Input::content {
-                    minLength(20)
-                    maxLength(6000)
-                }
-            }.validate(this)
-        }
-    }
-
-    fun Route.createCommentChildren(repo: CommentRepository, ac: CommentAccessControl) {
-        post<CreateCommentRequest> {
-            mustBeAuth()
-
-            call.receiveOrBadRequest<CreateCommentRequest.Input>()
-                .apply { validate().badRequestIfNotValid() }
-                .run {
-                    val parent = repo.findById(it.comment.id) ?: throw NotFoundException("Comment not found")
-                    CommentForUpdate(
-                        content = content,
-                        createdBy = citizen,
-                        target = parent.target,
-                        parent = parent,
-                    )
-                }.let { newComment ->
-                    ac.assert { canCreate(newComment, citizenOrNull) }
-                    repo.comment(newComment)
-                    call.respond(HttpStatusCode.Created, newComment.toOutput())
-                }
-        }
-    }
-}

src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt

@@ -0,0 +1,47 @@
+package fr.dcproject.component.comment.generic.routes
+
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.component.auth.citizen
+import fr.dcproject.component.auth.citizenOrNull
+import fr.dcproject.component.auth.mustBeAuth
+import fr.dcproject.component.comment.generic.CommentAccessControl
+import fr.dcproject.component.comment.generic.database.CommentForUpdate
+import fr.dcproject.component.comment.generic.database.CommentRef
+import fr.dcproject.component.comment.generic.database.CommentRepository
+import fr.dcproject.component.comment.toOutput
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
+
+@KtorExperimentalLocationsAPI
+object CreateCommentChildren {
+    @Location("/comments/{comment}/children")
+    class CreateCommentChildrenRequest(comment: UUID) {
+        val comment = CommentRef(comment)
+        class Input(val content: String)
+    }
+
+    fun Route.createCommentChildren(repo: CommentRepository, ac: CommentAccessControl) {
+        post<CreateCommentChildrenRequest> {
+            mustBeAuth()
+            val parent = repo.findById(it.comment.id) ?: throw NotFoundException("Comment not found")
+            val newComment = CommentForUpdate(
+                content = call.receiveOrBadRequest<CreateCommentChildrenRequest.Input>().content,
+                createdBy = citizen,
+                parent = parent
+            )
+
+            ac.assert { canCreate(newComment, citizenOrNull) }
+            repo.comment(newComment)
+
+            call.respond(HttpStatusCode.Created, newComment.toOutput())
+        }
+    }
+}

src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt

@@ -1,18 +1,14 @@
 package fr.dcproject.component.comment.generic.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
+import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.auth.mustBeAuth
 import fr.dcproject.component.comment.generic.CommentAccessControl
-import fr.dcproject.component.comment.generic.database.CommentForUpdate
 import fr.dcproject.component.comment.generic.database.CommentRef
 import fr.dcproject.component.comment.generic.database.CommentRepository
 import fr.dcproject.component.comment.toOutput
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.maxLength
-import io.konform.validation.jsonschema.minLength
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.http.HttpStatusCode
@@ -28,40 +24,22 @@ object EditComment {
     @Location("/comments/{comment}")
     class EditCommentRequest(comment: UUID) {
         val comment = CommentRef(comment)
-        class Input(val content: String) {
-            fun validate() = Validation<Input> {
-                Input::content {
-                    minLength(20)
-                    maxLength(6000)
-                }
-            }.validate(this)
-        }
+        class Input(val content: String)
     }
 
     fun Route.editComment(repo: CommentRepository, ac: CommentAccessControl) {
         put<EditCommentRequest> {
             mustBeAuth()
-            val commentOld = repo.findById(it.comment.id) ?: throw NotFoundException("Comment not found")
-            ac.assert { canUpdate(commentOld, citizenOrNull) }
+            val comment = repo.findById(it.comment.id) ?: throw NotFoundException("Comment not found")
+            ac.assert { canUpdate(comment, citizenOrNull) }
 
-            call.receiveOrBadRequest<EditCommentRequest.Input>()
-                .apply { validate().badRequestIfNotValid() }
-                .run {
-                    CommentForUpdate(
-                        id = commentOld.id,
-                        createdBy = commentOld.createdBy,
-                        target = commentOld.target,
-                        parent = commentOld.parent,
-                        content = content,
-                    )
-                }
-                .let { repo.edit(it) }
-                .let {
-                    call.respond(
-                        HttpStatusCode.OK,
-                        it.toOutput()
-                    )
-                }
+            comment.content = call.receiveOrBadRequest<EditCommentRequest.Input>().content
+            repo.edit(comment)
+
+            call.respond(
+                HttpStatusCode.OK,
+                comment.toOutput()
+            )
         }
     }
 }

src/main/kotlin/fr/dcproject/component/comment/generic/routes/install.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.comment.generic.routes
 
-import fr.dcproject.component.comment.generic.routes.CreateComment.createCommentChildren
+import fr.dcproject.component.comment.generic.routes.CreateCommentChildren.createCommentChildren
 import fr.dcproject.component.comment.generic.routes.EditComment.editComment
 import fr.dcproject.component.comment.generic.routes.GetCommentChildren.getChildrenComments
 import fr.dcproject.component.comment.generic.routes.GetOneComment.getOneComment

src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt

@@ -1,6 +1,5 @@
 package fr.dcproject.component.constitution.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.common.utils.receiveOrBadRequest
@@ -16,9 +15,6 @@ import fr.dcproject.component.constitution.database.ConstitutionForUpdate.TitleF
 import fr.dcproject.component.constitution.database.ConstitutionRepository
 import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input
 import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input.Title
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.maxLength
-import io.konform.validation.jsonschema.minLength
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -40,6 +36,7 @@ object CreateConstitution {
             val draft: Boolean = false,
             val versionId: UUID = UUID.randomUUID()
         ) {
+
             class Title(
                 val id: UUID = UUID.randomUUID(),
                 val name: String,
@@ -47,25 +44,10 @@ object CreateConstitution {
             ) {
                 class ArticleRef(val id: UUID)
             }
-
-            fun validate() = Validation<Input> {
-                Input::title {
-                    minLength(10)
-                    maxLength(80)
-                }
-                Input::titles onEach {
-                    Title::name {
-                        minLength(10)
-                        maxLength(80)
-                    }
-                }
-            }.validate(this)
         }
     }
 
     private fun getNewConstitution(input: Input, citizen: Citizen) = input.run {
-        validate().badRequestIfNotValid()
-
         ConstitutionForUpdate<CitizenWithUserI, TitleForUpdate<ArticleRef>>(
             id = UUID.randomUUID(),
             title = title,

src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt

@@ -1,6 +1,5 @@
 package fr.dcproject.component.constitution.routes
 
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.common.response.toOutput
 import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
@@ -9,10 +8,6 @@ import fr.dcproject.component.constitution.database.ConstitutionRepository
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
 import fr.postgresjson.repository.RepositoryI
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.enum
-import io.konform.validation.jsonschema.maximum
-import io.konform.validation.jsonschema.minimum
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -32,27 +27,10 @@ object FindConstitutions {
         val sort: String? = null,
         val direction: RepositoryI.Direction? = null,
         val search: String? = null
-    ) : PaginatedRequestI by PaginatedRequest(page, limit) {
-        fun validate() = Validation<FindConstitutionsRequest> {
-            FindConstitutionsRequest::page {
-                minimum(1)
-            }
-            FindConstitutionsRequest::limit {
-                minimum(1)
-                maximum(50)
-            }
-            FindConstitutionsRequest::sort ifPresent {
-                enum(
-                    "title",
-                    "createdAt",
-                )
-            }
-        }.validate(this)
-    }
+    ) : PaginatedRequestI by PaginatedRequest(page, limit)
 
     fun Route.findConstitutions(repo: ConstitutionRepository, ac: ConstitutionAccessControl) {
         get<FindConstitutionsRequest> {
-            it.validate().badRequestIfNotValid()
             val constitutions = repo.find(it.page, it.limit, it.sort, it.direction, it.search)
             ac.assert { canView(constitutions.result, citizenOrNull) }
             call.respond(

src/main/kotlin/fr/dcproject/component/notification/Notification.kt

@@ -1,7 +1,5 @@
 package fr.dcproject.component.notification
 
-import com.fasterxml.jackson.annotation.JsonSubTypes
-import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.SerializationFeature
@@ -11,15 +9,9 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import fr.dcproject.common.entity.Entity
 import fr.dcproject.component.article.database.ArticleForView
-import io.konform.validation.Validation
-import io.konform.validation.jsonschema.enum
 import org.joda.time.DateTime
 import java.util.concurrent.atomic.AtomicInteger
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", visible = true)
-@JsonSubTypes(
-    JsonSubTypes.Type(value = ArticleUpdateNotification::class, name = "article")
-)
 open class Notification(
     val type: String,
     val createdAt: DateTime = DateTime.now()
@@ -52,14 +44,6 @@ open class Notification(
 
         inline fun <reified T : Notification> fromString(raw: String): T = mapper.readValue(raw)
     }
-
-    fun getValidation() = Validation<Notification> {
-        Notification::type {
-            enum(
-                "article"
-            )
-        }
-    }
 }
 
 open class EntityNotification(

src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt

@@ -1,7 +1,6 @@
 package fr.dcproject.component.notification
 
 import com.fasterxml.jackson.core.JsonProcessingException
-import fr.dcproject.application.http.badRequestIfNotValid
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.citizen.database.CitizenI
 import io.ktor.http.cio.websocket.Frame
@@ -29,12 +28,12 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
 
-class NotificationsPush (
+class NotificationsPush private constructor(
     private val redis: RedisAsyncCommands<String, String>,
     private val redisConnectionPubSub: StatefulRedisPubSubConnection<String, String>,
     citizen: CitizenI,
     incoming: Flow<Notification>,
-    onReceive: suspend (Notification) -> Unit,
+    onRecieve: suspend (Notification) -> Unit,
 ) {
     class Builder(val redisClient: RedisClient) {
         private val redisConnection = redisClient.connect() ?: error("Unable to connect to redis")
@@ -44,8 +43,8 @@ class NotificationsPush (
         fun build(
             citizen: CitizenI,
             incoming: Flow<Notification>,
-            onReceive: suspend (Notification) -> Unit,
-        ): NotificationsPush = NotificationsPush(redis, redisConnectionPubSub, citizen, incoming, onReceive)
+            onRecieve: suspend (Notification) -> Unit,
+        ): NotificationsPush = NotificationsPush(redis, redisConnectionPubSub, citizen, incoming, onRecieve)
 
         @ExperimentalCoroutinesApi
         fun build(ws: DefaultWebSocketServerSession): NotificationsPush {
@@ -53,10 +52,7 @@ class NotificationsPush (
             val incomingFlow: Flow<Notification> = ws.incoming.consumeAsFlow()
                 .mapNotNull<Frame, Text> { it as? Frame.Text }
                 .map { it.readText() }
-                .map {
-                    Notification.fromString<Notification>(it)
-                        .apply { getValidation().validate(this).badRequestIfNotValid() }
-                }
+                .map { Notification.fromString(it) }
 
             return build(ws.call.citizen, incomingFlow) {
                 ws.outgoing.send(Text(it.toString()))
@@ -73,7 +69,7 @@ class NotificationsPush (
         override fun message(pattern: String?, channel: String?, message: String?) {
             runBlocking {
                 getNotifications().collect {
-                    onReceive(it)
+                    onRecieve(it)
                 }
             }
         }
@@ -89,12 +85,10 @@ class NotificationsPush (
 
         /* Get old notification and sent it to websocket */
         runBlocking {
-            getNotifications().collect {
-                onReceive(it)
-            }
+            getNotifications().collect { onRecieve(it) }
         }
 
-        /* Listen redis event, and sent the new notification into websocket */
+        /* Lisen redis event, and sent the new notification into websocket */
         redisConnectionPubSub.run {
             addListener(listener)
 

src/main/resources/openapi.yaml

@@ -41,12 +41,6 @@ paths:
                         maxItems: 50
                         items:
                           $ref: '#/components/schemas/ArticleListingResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
     post:
       security:
         - JWTAuth: []
@@ -71,21 +65,16 @@ paths:
                     Limit power of press
                 content:
                   type: string
-                  minLength: 50
-                  maxLength: 6000
                   example:
                     Lorem upsum...
                 description:
                   type: string
-                  minLength: 50
-                  maxLength: 6000
                   example:
                     I think is the bether choice
                 tags:
                   type: array
                   items:
                     type: string
-                    maxItems: 15
                   default: [ ]
                   example: [ power, press ]
                 anonymous:
@@ -117,12 +106,6 @@ paths:
                     format: uuid
                   versionNumber:
                     type: integer
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
         401:
           $ref: '#/components/responses/401'
         403:
@@ -145,12 +128,6 @@ paths:
       tags:
         - article
       operationId: getArticle
-      parameters:
-        - $ref: '#/components/parameters/page'
-        - $ref: '#/components/parameters/limit'
-        - $ref: '#/components/parameters/sort'
-        - $ref: '#/components/parameters/direction'
-        - $ref: '#/components/parameters/search'
       responses:
         200:
           description: The Article objects
@@ -158,19 +135,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/ArticleResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
-        404:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/404'
-
   /articles/{article}/versions:
     parameters:
       - $ref: '#/components/parameters/article'
@@ -179,12 +143,6 @@ paths:
       tags:
         - article
       operationId: getArticleVersions
-      parameters:
-        - $ref: '#/components/parameters/page'
-        - $ref: '#/components/parameters/limit'
-        - $ref: '#/components/parameters/sort'
-        - $ref: '#/components/parameters/direction'
-        - $ref: '#/components/parameters/search'
       responses:
         200:
           description: The versions of Article
@@ -235,12 +193,6 @@ paths:
                                   format: uuid
                                 name:
                                   type: string
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
 
   /login:
     post:
@@ -358,7 +310,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/400'
+                description: sdf
   /auth/passwordless:
     post:
       summary: Send a connexion link by email
@@ -402,7 +354,7 @@ paths:
       parameters:
         - $ref: '#/components/parameters/page'
         - $ref: '#/components/parameters/limit'
-        - $ref: '#/components/parameters/citizenSort'
+        - $ref: '#/components/parameters/sort'
         - $ref: '#/components/parameters/direction'
         - $ref: '#/components/parameters/search'
       responses:
@@ -419,12 +371,6 @@ paths:
                         type: array
                         items:
                           $ref: '#/components/schemas/CitizenListResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
         401:
           $ref: '#/components/responses/401'
   /citizens/current:
@@ -497,10 +443,6 @@ paths:
           description: Password changed
         400:
           description: Bad request
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
         401:
           $ref: '#/components/responses/401'
         404:
@@ -522,13 +464,13 @@ paths:
           in: query
           required: false
           example:
-            - createdAt
+            - created_at
             - votes
           schema:
             type: string
-            default: createdAt
+            default: created_at
             enum:
-              - createdAt
+              - created_at
               - votes
       responses:
         200:
@@ -544,12 +486,6 @@ paths:
                         type: array
                         items:
                           $ref: '#/components/schemas/CommentResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
     post:
       security:
         - JWTAuth: [ ]
@@ -567,10 +503,8 @@ paths:
               properties:
                 content:
                   type: string
-                  minLength: 20
-                  maxLength: 6000
                   example:
-                    Lorem ipsum dolor sit amet, consectetur adipiscing elit.Lorem ipsum...
+                    Lorem ipsum...
       responses:
         201:
           description: Return created Comment
@@ -578,12 +512,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/CommentResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
         401:
           $ref: '#/components/responses/401'
   /comments/{comment}:
@@ -600,42 +528,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/CommentResponse'
-    post:
-      security:
-        - JWTAuth: []
-      summary: create comment
-      tags:
-        - comment
-      requestBody:
-        content:
-          application/json:
-            schema:
-              required:
-                - content
-              properties:
-                content:
-                  type: string
-                  minLength: 20
-                  maxLength: 6000
-                  example:
-                    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-      responses:
-        201:
-          description: Return updated comment
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/CommentResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
-        401:
-          $ref: '#/components/responses/401'
-        404:
-          description: No comment found
     put:
       security:
         - JWTAuth: []
@@ -651,10 +543,8 @@ paths:
               properties:
                 content:
                   type: string
-                  minLength: 20
-                  maxLength: 6000
                   example:
-                    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+                    Lorem ipsum...
       responses:
         200:
           description: Return updated comment
@@ -662,12 +552,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/CommentResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
         401:
           $ref: '#/components/responses/401'
   /comments/{comment}/children:
@@ -753,42 +637,13 @@ paths:
       tags:
         - comment
         - constitution
-      parameters:
-        - $ref: '#/components/parameters/page'
-        - $ref: '#/components/parameters/limit'
-        - $ref: '#/components/parameters/search'
-        - name: sort
-          in: query
-          required: false
-          example:
-            - createdAt
-            - votes
-          schema:
-            type: string
-            default: createdAt
-            enum:
-              - createdAt
-              - votes
       responses:
         200:
           description: Return Comment and children
           content:
             application/json:
               schema:
-                allOf:
-                  - $ref: '#/components/schemas/Paginated'
-                  - type: object
-                    properties:
-                      result:
-                        type: array
-                        items:
-                          $ref: '#/components/schemas/CommentResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
+                $ref: '#/components/schemas/CommentResponse'
     post:
       security:
         - JWTAuth: []
@@ -805,10 +660,8 @@ paths:
               properties:
                 content:
                   type: string
-                  minLength: 20
-                  maxLength: 6000
                   example:
-                    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+                    Lorem ipsum...
       responses:
         201:
           description: Return created comment
@@ -816,12 +669,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/CommentResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
         401:
           $ref: '#/components/responses/401'
 
@@ -851,12 +698,6 @@ paths:
                         type: array
                         items:
                           $ref: '#/components/schemas/ConstitutionListingResponse'
-        400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
     post:
       security:
         - JWTAuth: [ ]
@@ -881,11 +722,7 @@ paths:
         401:
           $ref: '#/components/responses/401'
         400:
-          description: BadReqest
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/400'
+          $ref: '#/components/responses/400'
   /constitutions/{constitution}:
     parameters:
       - $ref: '#/components/parameters/constitution'
@@ -1536,17 +1373,6 @@ components:
           - createdAt
           - vote
           - popularity
-    citizenSort:
-      name: sort
-      in: query
-      description: The sort field name
-      example: createdAt
-      required: false
-      schema:
-        type: string
-        enum:
-          - title
-          - createdAt
     workgroupSort:
       name: sort
       in: query
@@ -2029,8 +1855,6 @@ components:
           $ref: '#/components/schemas/UUID'
         title:
           type: string
-          minLength: 10
-          maxLength: 80
           example:
             Constitution for the liberty
         titles:
@@ -2046,8 +1870,6 @@ components:
                 $ref: '#/components/schemas/UUID'
               name:
                 type: string
-                minLength: 10
-                maxLength: 80
                 example:
                   The liberties
               articles:
@@ -2387,47 +2209,6 @@ components:
                 - REPORTER
               example: MASTER
 
-    400:
-      description: Bad Request
-      required:
-        - title
-        - invalidParams
-      additionalProperties: false
-      properties:
-        statusCode:
-          type: integer
-          example: 400
-        title:
-          type: string
-          example: Bad Request
-        invalidParams:
-          type: array
-          items:
-            required:
-              - name
-              - reason
-            properties:
-              name:
-                type: string
-                example: '.title'
-              reason:
-                type: string
-                example: 'Cannot be null'
-
-    404:
-      description: Not Found
-      required:
-        - title
-        - statusCode
-      additionalProperties: false
-      properties:
-        statusCode:
-          type: integer
-          example: 404
-        title:
-          type: string
-          example: Bad Request
-
   securitySchemes:
     JWTAuth:
       type: http

src/main/resources/sql/functions/article/find_articles.sql

@@ -45,7 +45,7 @@ begin
         case direction when 'asc' then
             case sort
                 when 'title' then a.title
-                when 'createdAt' then a.created_at::text
+                when 'created_at' then a.created_at::text
                 when 'vote' then ca.score::text
                 when 'popularity' then ca.total::text
                 else null
@@ -54,7 +54,7 @@ begin
         case direction when 'desc' then
             case sort
                 when 'title' then a.title
-                when 'createdAt' then a.created_at::text
+                when 'created_at' then a.created_at::text
                 when 'vote' then ca.score::text
                 when 'popularity' then ca.total::text
             end

src/main/resources/sql/functions/citizen/find_citizens.sql

@@ -23,14 +23,14 @@ begin
         case direction when 'asc' then
             case sort
                 when 'name' then (z.name->'first_name')::text
-                when 'createdAt' then z.created_at::text
+                when 'created_at' then z.created_at::text
                 else null
             end
         end,
         case direction when 'desc' then
             case sort
                 when 'name' then (z.name->'first_name')::text
-                when 'createdAt' then z.created_at::text
+                when 'created_at' then z.created_at::text
             end
         end
         desc,

src/main/resources/sql/functions/comment/comment.sql

@@ -1,4 +1,4 @@
-create or replace function comment(reference regclass, inout resource json)
+create or replace function comment(reference regclass, resource json, out _id uuid)
     language plpgsql as
 $$
 declare
@@ -17,8 +17,7 @@ begin
     else
         raise exception 'comment with target as "%", is not implemented', reference::text;
     end if;
-
-    select find_comment_by_id(_new_id) into resource;
+    _id = _new_id;
 end;
 $$;
 

src/main/resources/sql/functions/comment/edit_comment.sql

@@ -1,11 +1,9 @@
-create or replace function edit_comment(_id uuid, _content text, out resource json)
+create or replace function edit_comment(_id uuid, _content text) returns void
     language plpgsql as
 $$
 begin
     update comment c set
         "content" = _content
     where c.id = _id;
-
-    select find_comment_by_id(_id) into resource;
 end;
 $$;

src/main/resources/sql/functions/comment/find_comments_by_target.sql

@@ -26,7 +26,7 @@ begin
                 else null
             end desc,
             case sort
-                when 'createdAt' then com.created_at::text
+                when 'created_at' then com.created_at::text
                 else null
             end desc,
         com.created_at desc

src/main/resources/sql/functions/constitution/find_constitutions.sql

@@ -22,14 +22,14 @@ begin
         case direction when 'asc' then
             case sort
                 when 'title' then c.title
-                when 'createdAt' then c.created_at::text
+                when 'created_at' then c.created_at::text
                 else null
             end
         end,
         case direction when 'desc' then
             case sort
                 when 'title' then c.title
-                when 'createdAt' then c.created_at::text
+                when 'created_at' then c.created_at::text
             end
         end
         desc,

src/main/resources/sql/functions/follow/find_follows_article_by_target.sql

@@ -21,7 +21,7 @@ begin
             f.created_at,
             f.target_reference,
             json_build_object('id', f.target_id) as target,
-            find_citizen_by_id_with_user(f.created_by_id) as created_by
+            json_build_object('id', f.created_by_id) as created_by
         from follow_article as f
         join article a on f.target_id = a.id
         where a.version_id = _version_id

src/test/kotlin/functional/NotificationsPushTest.kt

@@ -30,7 +30,7 @@ internal class NotificationsPushTest {
         @BeforeAll
         @JvmStatic
         fun before() {
-            val config = Configuration("application-test.conf")
+            val config: Configuration = Configuration("application-test.conf")
             RedisClient.create(config.redis).connect().sync().flushall()
 
             /* Purge rabbit notification queues */
@@ -45,7 +45,7 @@ internal class NotificationsPushTest {
 
     @Test
     fun `Notification from redis is well catch and return`() = runBlocking {
-        val config = Configuration("application-test.conf")
+        val config: Configuration = Configuration("application-test.conf")
         /* Redis client for test */
         val redisClientTest = RedisClient.create(config.redis)
 
@@ -74,7 +74,7 @@ internal class NotificationsPushTest {
         }
         val notifAfterSubscribe = ArticleUpdateNotification(article)
 
-        /* init event for emulate incoming message from websocket */
+        /* init event for emulate incomint message from websocket */
         val event = MutableSharedFlow<Notification>()
         val incomingFlow = event.asSharedFlow()
 

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

@@ -1,7 +1,5 @@
 package integration
 
-import fr.dcproject.common.utils.toUUID
-import integration.steps.`when`.Validate
 import integration.steps.`when`.`When I send a GET request`
 import integration.steps.`when`.`When I send a POST request`
 import integration.steps.`when`.`with body`
@@ -18,11 +16,9 @@ import integration.steps.then.`And the response should contain`
 import integration.steps.then.`And the response should not be null`
 import integration.steps.then.`And the response should not contain`
 import integration.steps.then.`Then the response should be`
-import integration.steps.then.`which contains`
+import integration.steps.then.`whish contains`
 import integration.steps.then.and
-import io.ktor.http.HttpStatusCode.Companion.BadRequest
 import io.ktor.http.HttpStatusCode.Companion.Forbidden
-import io.ktor.http.HttpStatusCode.Companion.NotFound
 import io.ktor.http.HttpStatusCode.Companion.OK
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Tags
@@ -36,24 +32,13 @@ class `Article routes` : BaseTest() {
     fun `I can get article list`() {
         withIntegrationApplication {
             `Given I have articles`(3)
-            `Given I have article`(createdBy = "ddb17f17-e8ab-4ada-bdf7-bfd6b0f1b5ed".toUUID())
-            `When I send a GET request`("/articles?page=1&limit=10&sort=title&createdBy=ddb17f17-e8ab-4ada-bdf7-bfd6b0f1b5ed") `Then the response should be` OK and {
+            `When I send a GET request`("/articles") `Then the response should be` OK and {
                 `And the response should not be null`()
                 `And the response should contain pattern`("$.result[0].createdBy.name.firstName", "firstName.+")
-                `And the response should not contain`("$.result[1]")
-                `And the response should contain list`("$.result", 1)
-            }
-        }
-    }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get article list`() {
-        withIntegrationApplication {
-            `Given I have articles`(3)
-            `When I send a GET request`("/articles?page=1&limit=10&sort=title&createdBy=hello", Validate.ALL - Validate.REQUEST_PARAM) `Then the response should be` BadRequest and {
-                `And the response should contain`("$.invalidParams[*].name", ".createdBy")
-                `And the response should contain`("$.invalidParams[*].reason", "must be UUID")
+                `And the response should contain pattern`("$.result[1].createdBy.name.firstName", "firstName.+")
+                `And the response should contain pattern`("$.result[2].createdBy.name.firstName", "firstName.+")
+                `And the response should not contain`("$.result[3]")
+                `And the response should contain list`("$.result", 3)
             }
         }
     }
@@ -66,8 +51,8 @@ class `Article routes` : BaseTest() {
             `Given I have article created by workgroup`("2bccd5a7-9082-4b31-88f8-e25d70b22b12")
             `When I send a GET request`("/articles?workgroup=2bccd5a7-9082-4b31-88f8-e25d70b22b12") `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And have property`("$.total") `which contains` 1
-                `And have property`("$.result[0]workgroup.name") `which contains` "Les papy"
+                `And have property`("$.total") `whish contains` 1
+                `And have property`("$.result[0]workgroup.name") `whish contains` "Les papy"
             }
         }
     }
@@ -78,31 +63,7 @@ class `Article routes` : BaseTest() {
             `Given I have article`(id = "65cda9f3-8991-4420-8d41-1da9da72c9bb")
             `When I send a GET request`("/articles/65cda9f3-8991-4420-8d41-1da9da72c9bb") `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And have property`("$.id") `which contains` "65cda9f3-8991-4420-8d41-1da9da72c9bb"
-            }
-        }
-    }
-
-    @Test
-    fun `I cannot get article with id doesn't exist`() {
-        withIntegrationApplication {
-            `When I send a GET request`("/articles/635fe2e8-2dbc-4c80-b306-101d38a4ab23") `Then the response should be` NotFound and {
-                `And the response should not be null`()
-                `And the response should contain`("$.title", "Article 635fe2e8-2dbc-4c80-b306-101d38a4ab23 not found")
-                `And the response should contain`("$.statusCode", 404)
-            }
-        }
-    }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get article by id with wrong id format`() {
-        withIntegrationApplication {
-            `Given I have article`(id = "65cda9f3-8991-4420-8d41-1da9da72c9bb")
-            `When I send a GET request`("/articles/abcd") `Then the response should be` BadRequest and {
-                `And the response should not be null`()
-                `And the response should contain`("$.invalidParams[0].name", "ID")
-                `And the response should contain`("$.invalidParams[0].reason", "must be UUID")
+                `And have property`("$.id") `whish contains` "65cda9f3-8991-4420-8d41-1da9da72c9bb"
             }
         }
     }
@@ -111,36 +72,10 @@ class `Article routes` : BaseTest() {
     fun `I can get versions of article by the id`() {
         withIntegrationApplication {
             `Given I have article`(id = "13e6091c-8fed-4600-b079-a97a6b7a9800")
-            `When I send a GET request`("/articles/13e6091c-8fed-4600-b079-a97a6b7a9800/versions?page=1&limit=10&sort=title") `Then the response should be` OK and {
+            `When I send a GET request`("/articles/13e6091c-8fed-4600-b079-a97a6b7a9800/versions") `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And have property`("$.total") `which contains` 1
-                `And have property`("$.result[0].id") `which contains` "13e6091c-8fed-4600-b079-a97a6b7a9800"
-            }
-        }
-    }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get versions of article by the id with wrong id`() {
-        withIntegrationApplication {
-            `Given I have article`(id = "13e6091c-8fed-4600-b079-a97a6b7a9800")
-            `When I send a GET request`("/articles/abcd/versions") `Then the response should be` BadRequest and {
-                `And the response should not be null`()
-                `And the response should contain`("$.invalidParams[0].name", ".article")
-                `And the response should contain`("$.invalidParams[0].reason", "must be UUID")
-            }
-        }
-    }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get versions of article by the id with wrong request`() {
-        withIntegrationApplication {
-            `Given I have article`(id = "13e6091c-8fed-4600-b079-a97a6b7a9800")
-            `When I send a GET request`("/articles/13e6091c-8fed-4600-b079-a97a6b7a9800/versions?page=1&limit=10&sort=wrong") `Then the response should be` BadRequest and {
-                `And the response should not be null`()
-                `And the response should contain`("$.invalidParams[0].name", ".sort")
-                `And the response should contain pattern`("$.invalidParams[0].reason", "must be one of: ('[^']+'(, )?)+")
+                `And have property`("$.total") `whish contains` 1
+                `And have property`("$.result[0].id") `whish contains` "13e6091c-8fed-4600-b079-a97a6b7a9800"
             }
         }
     }
@@ -157,8 +92,8 @@ class `Article routes` : BaseTest() {
                       "versionId": "09c418b6-63ba-448b-b38b-502b41cd500e",
                       "title": "title2",
                       "anonymous": false,
-                      "content": "Sed malesuada ante et sem congue, scelerisque feugiat lorem viverra.",
-                      "description": "Sed vulputate, ligula id porta posuere, sapien lorem mattis arcu, sit amet luctus erat orci sed tellus.",
+                      "content": "content2",
+                      "description": "description2",
                       "tags": [
                           "green"
                       ]
@@ -167,13 +102,12 @@ class `Article routes` : BaseTest() {
                 )
             } `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And have property`("$.versionId") `which contains` "09c418b6-63ba-448b-b38b-502b41cd500e"
+                `And have property`("$.versionId") `whish contains` "09c418b6-63ba-448b-b38b-502b41cd500e"
             }
         }
     }
 
     @Test
-    @Tag("Forbidden")
     fun `I cannot create an article if I'm not connected`() {
         withIntegrationApplication {
             `When I send a POST request`("/articles") {
@@ -183,8 +117,8 @@ class `Article routes` : BaseTest() {
                       "versionId": "e3c7ce42-241c-4caf-9a59-aba4e466440e",
                       "title": "title2",
                       "anonymous": false,
-                      "content": "Sed malesuada ante et sem congue, scelerisque feugiat lorem viverra.",
-                      "description": "Sed vulputate, ligula id porta posuere, sapien lorem mattis arcu, sit amet luctus erat orci sed tellus.",
+                      "content": "content2",
+                      "description": "description2",
                       "tags": [
                           "green"
                       ]
@@ -198,35 +132,4 @@ class `Article routes` : BaseTest() {
             }
         }
     }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot create an article with wrong request`() {
-        withIntegrationApplication {
-            `Given I have citizen`("John", "Doe")
-            `When I send a POST request`("/articles", Validate.NONE) {
-                `authenticated as`("John", "Doe")
-                `with body`(
-                    """
-                    {
-                      "versionId": "09c418b6-63ba-448b-b38b-502b41cd500e",
-                      "title": "title2",
-                      "anonymous": false,
-                      "content": "content2",
-                      "description": "description2",
-                      "tags": [
-                          "green"
-                      ]
-                    }
-                    """
-                )
-            } `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 50 characters")
-                `And the response should contain`("$.invalidParams[1].name", ".description")
-                `And the response should contain`("$.invalidParams[1].reason", "must have at least 50 characters")
-            }
-        }
-    }
 }

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

@@ -9,7 +9,7 @@ import integration.steps.given.`authenticated as`
 import integration.steps.then.`And have property`
 import integration.steps.then.`And the response should not be null`
 import integration.steps.then.`Then the response should be`
-import integration.steps.then.`which contains`
+import integration.steps.then.`whish contains`
 import integration.steps.then.and
 import io.ktor.http.HttpStatusCode.Companion.BadRequest
 import io.ktor.http.HttpStatusCode.Companion.Created
@@ -26,7 +26,7 @@ class `Citizen routes` : BaseTest() {
     fun `I can get Citizens information`() {
         withIntegrationApplication {
             `Given I have citizen`("Jean", "Perrin", id = "5267a5c6-af42-4a02-aa2b-6b71d2e43973")
-            `When I send a GET request`("/citizens?page=1&limit=5&sort=createdAt") {
+            `When I send a GET request`("/citizens") {
                 `authenticated as`("Jean", "Perrin")
             } `Then the response should be` OK and {
                 `And the response should not be null`()
@@ -34,19 +34,6 @@ class `Citizen routes` : BaseTest() {
         }
     }
 
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get Citizens information with wrong request`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Jean", "Perrin", id = "5267a5c6-af42-4a02-aa2b-6b71d2e43973")
-            `When I send a GET request`("/citizens?page=1&limit=5&sort=created_at", Validate.ALL - Validate.REQUEST_PARAM) {
-                `authenticated as`("Jean", "Perrin")
-            } `Then the response should be` BadRequest and {
-                `And the response should not be null`()
-            }
-        }
-    }
-
     @Test
     fun `I can get specific Citizen information`() {
         withIntegrationApplication {
@@ -55,7 +42,7 @@ class `Citizen routes` : BaseTest() {
                 `authenticated as`("Linus", "Pauling")
             } `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And have property`("$.id") `which contains` "47a05c0f-7329-46c3-a7d0-325db37e9114"
+                `And have property`("$.id") `whish contains` "47a05c0f-7329-46c3-a7d0-325db37e9114"
             }
         }
     }
@@ -68,7 +55,7 @@ class `Citizen routes` : BaseTest() {
                 `authenticated as`("Henri", "Becquerel")
             } `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And have property`("$.id") `which contains` "47356809-c8ef-4649-8b99-1c5cb9886d38"
+                `And have property`("$.id") `whish contains` "47356809-c8ef-4649-8b99-1c5cb9886d38"
             }
         }
     }
@@ -82,8 +69,8 @@ class `Citizen routes` : BaseTest() {
                 `with body`(
                     """
                     {
-                      "oldPassword": "Azerty123!",
-                      "newPassword": "Qwerty123!"
+                      "oldPassword": "azerty",
+                      "newPassword": "qwerty"
                     }
                     """
                 )
@@ -92,7 +79,6 @@ class `Citizen routes` : BaseTest() {
     }
 
     @Test
-    @Tag("BadRequest")
     fun `I cannot change my password if request is bad formatted`() {
         withIntegrationApplication {
             `Given I have citizen`("Louis", "Breguet", id = "6cf2a19d-d15d-4ee5-b2a9-907afd26b525")

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

@@ -1,11 +1,9 @@
 package integration
 
 import fr.dcproject.component.citizen.database.CitizenI.Name
-import integration.steps.`when`.Validate.ALL
-import integration.steps.`when`.Validate.REQUEST_BODY
-import integration.steps.`when`.Validate.REQUEST_PARAM
 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`
@@ -15,7 +13,6 @@ 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
@@ -36,37 +33,14 @@ class `Comment articles routes` : BaseTest() {
                 `with body`(
                     """
                     {
-                      "content": "Hello mister MARABOUTCHA"
+                      "content": "Hello mister"
                     }
                     """
                 )
             } `Then the response should be` Created and {
                 `And the response should not be null`()
                 `And the response should contain`("$.target.id", "aa16c635-28da-46f0-9a89-934eef88c7ca")
-                `And the response should contain`("$.content", "Hello mister MARABOUTCHA")
-            }
-        }
-    }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot comment article with bad request`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Michael", "Faraday")
-            `Given I have article`(id = "aa16c635-28da-46f0-9a89-934eef88c7ca")
-            `When I send a POST request`("/articles/aa16c635-28da-46f0-9a89-934eef88c7ca/comments", ALL - REQUEST_BODY) {
-                `authenticated as`("Michael", "Faraday")
-                `with body`(
-                    """
-                    {
-                      "content": "To 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")
+                `And the response should contain`("$.content", "Hello mister")
             }
         }
     }
@@ -78,7 +52,7 @@ class `Comment articles routes` : BaseTest() {
             `Given I have citizen`("Enrico", "Fermi")
             `Given I have article`(id = "6166c078-ca97-4366-b0aa-2a5cd558c78a")
             `Given I have comment on article`(article = "6166c078-ca97-4366-b0aa-2a5cd558c78a", createdBy = Name("Enrico", "Fermi"))
-            `When I send a GET request`("/articles/6166c078-ca97-4366-b0aa-2a5cd558c78a/comments?page=1&limit=40&sort=votes") {
+            `When I send a GET request`("/articles/6166c078-ca97-4366-b0aa-2a5cd558c78a/comments") {
                 `authenticated as`("Enrico", "Fermi")
             } `Then the response should be` OK and {
                 `And the response should not be null`()
@@ -87,23 +61,6 @@ class `Comment articles routes` : BaseTest() {
         }
     }
 
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get all comment on article with wrong parameters`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Enrico", "Fermi")
-            `Given I have article`(id = "6166c078-ca97-4366-b0aa-2a5cd558c78a")
-            `Given I have comment on article`(article = "6166c078-ca97-4366-b0aa-2a5cd558c78a", createdBy = Name("Enrico", "Fermi"))
-            `When I send a GET request`("/articles/6166c078-ca97-4366-b0aa-2a5cd558c78a/comments?page=1&limit=40&sort=wrong", ALL - REQUEST_PARAM) {
-                `authenticated as`("Enrico", "Fermi")
-            } `Then the response should be` BadRequest and {
-                `And the response should not be null`()
-                `And the response should contain`("$.invalidParams[*].name", ".sort")
-                `And the response should contain`("$.invalidParams[*].reason", "must be one of: 'votes', 'createdAt'")
-            }
-        }
-    }
-
     /* TODO add votes */
     @Test
     fun `I can get all comment on article sorted by votes`() {
@@ -136,4 +93,45 @@ class `Comment articles routes` : BaseTest() {
             }
         }
     }
+
+    @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 = 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"
+                    }
+                    """
+                )
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.content", "Hello boy")
+            }
+        }
+    }
+
+    @Test
+    fun `I can get comment by its ID`() {
+        withIntegrationApplication {
+            `Given I have citizen`("Alfred", "Kastler")
+            `Given I have article`(id = "3897465b-19d2-43a0-86ea-1e29dbb11ec9")
+            `Given I have comment on article`(
+                article = "3897465b-19d2-43a0-86ea-1e29dbb11ec9",
+                createdBy = Name("Alfred", "Kastler"),
+                id = "edd296a8-fc7a-4717-a2bb-9f035ceca3c2",
+                content = "Hello boy"
+            )
+            `When I send a GET request`("/comments/edd296a8-fc7a-4717-a2bb-9f035ceca3c2") {
+            } `Then the response should be` OK and {
+                `And the response should not be null`()
+                `And the response should contain`("$.content", "Hello boy")
+            }
+        }
+    }
 }

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

@@ -1,9 +1,6 @@
 package integration
 
 import fr.dcproject.component.citizen.database.CitizenI.Name
-import integration.steps.`when`.Validate
-import integration.steps.`when`.Validate.ALL
-import integration.steps.`when`.Validate.REQUEST_BODY
 import integration.steps.`when`.`When I send a GET request`
 import integration.steps.`when`.`When I send a POST request`
 import integration.steps.`when`.`with body`
@@ -16,7 +13,6 @@ 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
@@ -37,69 +33,12 @@ class `Comment constitutions routes` : BaseTest() {
                 `with body`(
                     """
                     {
-                      "content": "Hello mister MARABOUTCHA"
+                      "content": "Hello mister"
                     }
                     """
                 )
             } `Then the response should be` Created and {
                 `And the response should not be null`()
-                `And the response should contain`("$.target.id", "1707c287-a472-4a62-89f2-9e85030e915c")
-                `And the response should contain`("$.content", "Hello mister MARABOUTCHA")
-            }
-        }
-    }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot comment constitution with bad request`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Nicolas", "Copernic")
-            `Given I have constitution`(id = "aa16c635-28da-46f0-9a89-934eef88c7ca")
-            `When I send a POST request`("/constitutions/aa16c635-28da-46f0-9a89-934eef88c7ca/comments", ALL - REQUEST_BODY) {
-                `authenticated as`("Nicolas", "Copernic")
-                `with body`(
-                    """
-                    {
-                      "content": "To 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 get all comment on constitution`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Enrico", "Fermi")
-            `Given I have constitution`(id = "6166c078-ca97-4366-b0aa-2a5cd558c78a")
-            `Given I have comment on constitution`(constitution = "6166c078-ca97-4366-b0aa-2a5cd558c78a", createdBy = Name("Enrico", "Fermi"))
-            `When I send a GET request`("/constitutions/6166c078-ca97-4366-b0aa-2a5cd558c78a/comments?page=1&limit=40&sort=votes") {
-                `authenticated as`("Enrico", "Fermi")
-            } `Then the response should be` OK and {
-                `And the response should not be null`()
-                `And the response should contain`("$.result[0].target.id", "6166c078-ca97-4366-b0aa-2a5cd558c78a")
-            }
-        }
-    }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get all comment on constitution with wrong parameters`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Enrico", "Fermi")
-            `Given I have constitution`(id = "6166c078-ca97-4366-b0aa-2a5cd558c78a")
-            `Given I have comment on constitution`(constitution = "6166c078-ca97-4366-b0aa-2a5cd558c78a", createdBy = Name("Enrico", "Fermi"))
-            `When I send a GET request`("/constitutions/6166c078-ca97-4366-b0aa-2a5cd558c78a/comments?page=1&limit=40&sort=wrong", ALL - Validate.REQUEST_PARAM) {
-                `authenticated as`("Enrico", "Fermi")
-            } `Then the response should be` BadRequest and {
-                `And the response should not be null`()
-                `And the response should contain`("$.invalidParams[*].name", ".sort")
-                `And the response should contain`("$.invalidParams[*].reason", "must be one of: 'votes', 'createdAt'")
             }
         }
     }

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

@@ -1,23 +1,13 @@
 package integration
 
-import fr.dcproject.component.citizen.database.CitizenI
-import integration.steps.`when`.Validate.ALL
-import integration.steps.`when`.Validate.REQUEST_BODY
 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
@@ -40,126 +30,4 @@ 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", ALL - REQUEST_BODY) {
-                `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"
-            )
-            `When I send a PUT request`("/comments/fd30d20f-656c-42c6-8955-f61c04537464") {
-                `authenticated as`("Hubert", "Reeves")
-                `with body`(
-                    """
-                    {
-                      "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", "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", ALL - REQUEST_BODY) {
-                `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 get comment by its ID`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Alfred", "Kastler")
-            `Given I have article`(id = "3897465b-19d2-43a0-86ea-1e29dbb11ec9")
-            `Given I have comment on article`(
-                article = "3897465b-19d2-43a0-86ea-1e29dbb11ec9",
-                createdBy = CitizenI.Name("Alfred", "Kastler"),
-                id = "edd296a8-fc7a-4717-a2bb-9f035ceca3c2",
-                content = "Hello boy"
-            )
-            `When I send a GET request`("/comments/edd296a8-fc7a-4717-a2bb-9f035ceca3c2") {
-            } `Then the response should be` OK and {
-                `And the response should not be null`()
-                `And the response should contain`("$.content", "Hello boy")
-            }
-        }
-    }
 }

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

@@ -1,8 +1,6 @@
 package integration
 
-import integration.steps.`when`.Validate.ALL
-import integration.steps.`when`.Validate.REQUEST_BODY
-import integration.steps.`when`.Validate.REQUEST_PARAM
+import integration.steps.`when`.Validate
 import integration.steps.`when`.`When I send a GET request`
 import integration.steps.`when`.`When I send a POST request`
 import integration.steps.`when`.`with body`
@@ -11,10 +9,9 @@ import integration.steps.given.`Given I have constitution`
 import integration.steps.given.`Given I have constitutions`
 import integration.steps.given.`authenticated as`
 import integration.steps.then.`And have property`
-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.`which contains`
+import integration.steps.then.`whish contains`
 import integration.steps.then.and
 import io.ktor.http.HttpStatusCode.Companion.BadRequest
 import io.ktor.http.HttpStatusCode.Companion.Created
@@ -31,25 +28,12 @@ class `Constitution routes` : BaseTest() {
     fun `I can get constitution list`() {
         withIntegrationApplication {
             `Given I have constitutions`(3)
-            `When I send a GET request`("/constitutions?page=1&limit=10&sort=title&direction=desc") `Then the response should be` OK and {
+            `When I send a GET request`("/constitutions") `Then the response should be` OK and {
                 `And the response should not be null`()
             }
         }
     }
 
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot get constitution list with wrong request`() {
-        withIntegrationApplication {
-            `Given I have constitutions`(3)
-            `When I send a GET request`("/constitutions?page=1&limit=5000&sort=title&direction=desc", ALL - REQUEST_PARAM) `Then the response should be` BadRequest and {
-                `And the response should not be null`()
-                `And the response should contain`("$.invalidParams[0].name", ".limit")
-                `And the response should contain`("$.invalidParams[0].reason", "must be at most '50'")
-            }
-        }
-    }
-
     @Test
     fun `I can get constitution by ID`() {
         withIntegrationApplication {
@@ -57,7 +41,7 @@ class `Constitution routes` : BaseTest() {
             `Given I have constitution`("0321c8d1-4ce3-4763-b5f4-a92611d280b4")
             `When I send a GET request`("/constitutions/0321c8d1-4ce3-4763-b5f4-a92611d280b4") `Then the response should be` OK and {
                 `And the response should not be null`()
-                `And have property`("$.id") `which contains` "0321c8d1-4ce3-4763-b5f4-a92611d280b4"
+                `And have property`("$.id") `whish contains` "0321c8d1-4ce3-4763-b5f4-a92611d280b4"
             }
         }
     }
@@ -86,11 +70,11 @@ class `Constitution routes` : BaseTest() {
                     """
                     {
                        "versionId":"15814bb6-8d90-4c6a-a456-c3939a8ec75e",
-                       "title":"Cras sit amet sapien mattis nulla rutrum blandit.",
+                       "title":"Hello world!",
                        "anonymous":true,
                        "titles":[
                           {
-                             "name":"Cras sit amet sapien mattis nulla rutrum blandit."
+                             "name":"plop"
                           }
                        ]
                     }
@@ -98,18 +82,17 @@ class `Constitution routes` : BaseTest() {
                 )
             } `Then the response should be` Created and {
                 `And the response should not be null`()
-                `And have property`("$.versionId") `which contains` "15814bb6-8d90-4c6a-a456-c3939a8ec75e"
-                `And have property`("$.title") `which contains` "Cras sit amet sapien mattis nulla rutrum blandit."
+                `And have property`("$.versionId") `whish contains` "15814bb6-8d90-4c6a-a456-c3939a8ec75e"
+                `And have property`("$.title") `whish contains` "Hello world!"
             }
         }
     }
 
     @Test
-    @Tag("BadRequest")
     fun `I cannot create an constitution if bad request`() {
         withIntegrationApplication {
             `Given I have citizen`("Henri", "Poincaré")
-            `When I send a POST request`("/constitutions", ALL - REQUEST_BODY) {
+            `When I send a POST request`("/constitutions", Validate.ALL - Validate.REQUEST_BODY) {
                 `authenticated as`("Henri", "Poincaré")
                 `with body`(
                     """
@@ -129,34 +112,4 @@ class `Constitution routes` : BaseTest() {
             } `Then the response should be` BadRequest
         }
     }
-
-    @Test
-    @Tag("BadRequest")
-    fun `I cannot create an constitution if request is not valid`() {
-        withIntegrationApplication {
-            `Given I have citizen`("Henri", "Poincaré")
-            `When I send a POST request`("/constitutions", ALL - REQUEST_BODY) {
-                `authenticated as`("Henri", "Poincaré")
-                `with body`(
-                    """
-                    {
-                       "versionId":"15814bb6-8d90-4c6a-a456-c3939a8ec75e",
-                       "title":"too small",
-                       "anonymous":true,
-                       "titles":[
-                          {
-                             "name":"too small"
-                          }
-                       ]
-                    }
-                    """
-                )
-            } `Then the response should be` BadRequest and {
-                `And the response should contain`("$.invalidParams[0].name", ".title")
-                `And the response should contain`("$.invalidParams[0].reason", "must have at least 10 characters")
-                `And the response should contain`("$.invalidParams[1].name", ".titles[0].name")
-                `And the response should contain`("$.invalidParams[1].reason", "must have at least 10 characters")
-            }
-        }
-    }
 }

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

@@ -27,7 +27,7 @@ class `Login routes` : BaseTest() {
                     """
                     {
                       "username": "niels-bohr",
-                      "password": "Azerty123!"
+                      "password": "azerty"
                     }
                     """
                 )

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

@@ -1,78 +0,0 @@
-package integration
-
-import fr.dcproject.common.utils.toUUID
-import fr.dcproject.component.article.database.ArticleForView
-import fr.dcproject.component.auth.database.UserCreator
-import fr.dcproject.component.citizen.database.CitizenCreator
-import fr.dcproject.component.citizen.database.CitizenI.Name
-import fr.dcproject.component.notification.ArticleUpdateNotification
-import fr.dcproject.component.notification.Notification
-import fr.dcproject.component.notification.Publisher
-import integration.steps.given.`Given I have article`
-import integration.steps.given.`Given I have citizen`
-import integration.steps.given.`Given I have follow on article`
-import integration.steps.given.`authenticated in url as`
-import io.ktor.http.cio.websocket.Frame
-import io.ktor.http.cio.websocket.readText
-import kotlinx.coroutines.launch
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Tags
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.koin.test.get
-import kotlin.test.assertEquals
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Tags(Tag("integration"), Tag("notification"))
-class `Notification routes` : BaseTest() {
-    @Test
-    fun `I can send notification`() {
-        withIntegrationApplication {
-            `Given I have citizen`("John", "Doe", id = "1a34191a-9cde-45ba-8ac1-230138a102d3")
-            `Given I have article`(id = "a06cbfb7-3094-4d64-aaa1-7486c0c292f4", createdBy = Name(firstName = "John", lastName = "Doe"))
-            `Given I have follow on article`("John", "Doe", article = "a06cbfb7-3094-4d64-aaa1-7486c0c292f4")
-            val notification = ArticleUpdateNotification(
-                ArticleForView(
-                    id = "a06cbfb7-3094-4d64-aaa1-7486c0c292f4".toUUID(),
-                    title = "MyTitle",
-                    content = "myContent",
-                    description = "myDescription",
-                    createdBy = CitizenCreator(
-                        id = "1a34191a-9cde-45ba-8ac1-230138a102d3".toUUID(),
-                        name = Name(firstName = "John", lastName = "Doe"),
-                        email = "john-doe@plop.com",
-                        user = UserCreator(username = "john-doe"),
-                    )
-                )
-            )
-            val publisher = get<Publisher>()
-            launch {
-                publisher
-                    .publish(notification)
-                    .await()
-            }
-
-            Thread.sleep(1000)
-
-            handleWebSocketConversation(
-                "/notifications",
-                {
-                    `authenticated in url as`("John", "Doe")
-                }
-            ) { incoming, outgoing ->
-                incoming.receive().let {
-                    when (it) {
-                        is Frame.Text -> Notification.fromString<ArticleUpdateNotification>(it.readText()).let { notif ->
-                            assertEquals(
-                                "a06cbfb7-3094-4d64-aaa1-7486c0c292f4",
-                                notif.target.id.toString()
-                            )
-                            outgoing.send(it)
-                        }
-                        else -> error(it.toString())
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -29,7 +29,7 @@ class `Register routes` : BaseTest() {
                       "birthday": "2001-01-01",
                       "user":{
                         "username": "george-junior",
-                        "password": "Azerty123!"
+                        "password": "azerty"
                       },
                       "email": "george-junior@gmail.com"
                     }

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

@@ -6,7 +6,6 @@ import fr.dcproject.component.article.database.ArticleForUpdate
 import fr.dcproject.component.article.database.ArticleForView
 import fr.dcproject.component.article.database.ArticleRepository
 import fr.dcproject.component.citizen.database.CitizenI.Name
-import fr.dcproject.component.citizen.database.CitizenRef
 import fr.dcproject.component.workgroup.database.WorkgroupRef
 import io.ktor.server.testing.TestApplicationEngine
 import org.koin.core.context.GlobalContext
@@ -17,15 +16,7 @@ fun TestApplicationEngine.`Given I have article`(
     workgroup: WorkgroupRef? = null,
     createdBy: Name? = null
 ) {
-    createArticle(id?.toUUID(), workgroup, createCitizen(name = createdBy))
-}
-
-fun TestApplicationEngine.`Given I have article`(
-    id: String? = null,
-    workgroup: WorkgroupRef? = null,
-    createdBy: UUID
-) {
-    createArticle(id?.toUUID(), workgroup, createCitizen(id = createdBy))
+    createArticle(id?.toUUID(), workgroup, createdBy)
 }
 
 fun TestApplicationEngine.`Given I have articles`(
@@ -44,16 +35,18 @@ fun TestApplicationEngine.`Given I have article created by workgroup`(
 fun createArticle(
     id: UUID? = null,
     workgroup: WorkgroupRef? = null,
-    createdBy: CitizenRef = createCitizen()
+    createdBy: Name? = null
 ): ArticleForView {
     val articleRepository: ArticleRepository by lazy { GlobalContext.get().koin.get() }
 
+    val citizen = createCitizen(createdBy)
+
     val article = ArticleForUpdate(
         id = id ?: UUID.randomUUID(),
         title = LoremIpsum().getTitle(3),
         content = LoremIpsum().getParagraphs(1, 2),
         description = LoremIpsum().getParagraphs(1, 2),
-        createdBy = createdBy,
+        createdBy = citizen,
         workgroup = workgroup,
         versionId = UUID.randomUUID()
     )

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

@@ -3,7 +3,6 @@ package integration.steps.given
 import com.auth0.jwt.JWT
 import fr.dcproject.component.auth.jwt.JwtConfig
 import fr.dcproject.component.citizen.database.Citizen
-import fr.dcproject.component.citizen.database.CitizenI
 import fr.dcproject.component.citizen.database.CitizenRepository
 import io.ktor.http.HttpHeaders
 import io.ktor.server.testing.TestApplicationRequest
@@ -26,23 +25,3 @@ fun TestApplicationRequest.`authenticated as`(
 
     return citizen
 }
-fun TestApplicationRequest.`authenticated in url as`(
-    firstName: String,
-    lastName: String,
-): Citizen {
-    val repo: CitizenRepository by lazy<CitizenRepository> { GlobalContext.get().koin.get() }
-    val citizen = repo.findByName(CitizenI.Name(firstName, lastName)) ?: error("Citizen not exist with name $firstName $lastName")
-    val algorithm = GlobalContext.get().koin.get<JwtConfig>().algorithm
-    val jwtAsString: String = JWT.create()
-        .withIssuer("dc-project.fr")
-        .withClaim("id", citizen.user.id.toString())
-        .sign(algorithm)
-
-    uri += when (uri.contains('?')) {
-        true -> '&'
-        false -> '?'
-    }
-    uri += "token=$jwtAsString"
-
-    return citizen
-}

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

@@ -23,7 +23,7 @@ fun TestApplicationEngine.`Given I have citizen`(
     val user = UserForCreate(
         id = id.toUUID(),
         username = "$firstName-$lastName".toLowerCase(),
-        password = "Azerty123!",
+        password = "azerty",
     )
     val citizen = CitizenForCreate(
         id = id.toUUID(),
@@ -36,24 +36,23 @@ fun TestApplicationEngine.`Given I have citizen`(
     return repo.insertWithUser(citizen)?.also { callback(it) }
 }
 
-fun createCitizen(name: CitizenI.Name? = null, id: UUID = UUID.randomUUID()): Citizen {
+fun createCitizen(createdBy: CitizenI.Name? = null): Citizen {
     val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
 
-    return if (name != null) {
-        citizenRepository.findByName(name) ?: error("Citizen not exist")
+    return if (createdBy != null) {
+        citizenRepository.findByName(createdBy) ?: error("Citizen not exist")
     } else {
         val first = "firstName" + UUID.randomUUID().toString()
         val last = "lastName" + UUID.randomUUID().toString()
         val username = ("username" + UUID.randomUUID().toString())
         CitizenForCreate(
-            id = id,
             birthday = DateTime.now(),
             name = CitizenI.Name(
                 first,
                 last
             ),
             email = "$first@fakeemail.com",
-            user = UserForCreate(username = username, password = "Azerty123!")
+            user = UserForCreate(username = username, password = "azerty")
         ).let {
             citizenRepository.insertWithUser(it) ?: error("Unable to create User")
         }

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

@@ -2,16 +2,11 @@ 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
@@ -37,14 +32,14 @@ fun TestApplicationEngine.`Given I have comments on article`(
     }
 }
 
-fun <A : ArticleRef> createComment(
+fun createComment(
     id: UUID? = null,
-    article: A? = null,
+    article: ArticleRef? = null,
     createdBy: Name? = null,
     content: String? = null
-): CommentForView<TargetRef, CitizenCreator> {
+) {
     val articleRepository: ArticleRepository by lazy { GlobalContext.get().koin.get() }
-    return createCommentOnTarget(
+    createCommentOnTarget(
         id,
         article?.id?.let { articleRepository.findById(article.id) } ?: createArticle(article?.id),
         createdBy,
@@ -61,14 +56,14 @@ fun TestApplicationEngine.`Given I have comment on constitution`(
     createComment(id?.toUUID(), ConstitutionRef(constitution?.toUUID()), createdBy, content)
 }
 
-fun <C : ConstitutionRef> createComment(
+fun createComment(
     id: UUID? = null,
-    constitution: C? = null,
+    constitution: ConstitutionRef? = null,
     createdBy: Name? = null,
     content: String? = null
-): CommentForView<TargetRef, CitizenCreator> {
+) {
     val constitutionRepository: ConstitutionRepository by lazy { GlobalContext.get().koin.get() }
-    return createCommentOnTarget(
+    createCommentOnTarget(
         id,
         constitution?.id?.let { constitutionRepository.findById(constitution.id) } ?: createConstitution(constitution?.id),
         createdBy,
@@ -76,12 +71,12 @@ fun <C : ConstitutionRef> createComment(
     )
 }
 
-fun <T : TargetI> createCommentOnTarget(
+fun createCommentOnTarget(
     id: UUID? = null,
-    target: T,
+    target: TargetI,
     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(
@@ -90,41 +85,5 @@ fun <T : TargetI> createCommentOnTarget(
         target = target,
         content = content ?: LoremIpsum().getParagraphs(1, 3)
     )
-    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)
+    commentRepository.comment(comment)
 }

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

@@ -3,7 +3,6 @@ package integration.steps.given
 import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.database.ArticleRef
 import fr.dcproject.component.citizen.database.Citizen
-import fr.dcproject.component.citizen.database.CitizenI
 import fr.dcproject.component.citizen.database.CitizenRef
 import fr.dcproject.component.citizen.database.CitizenRepository
 import fr.dcproject.component.constitution.database.ConstitutionRef
@@ -31,7 +30,7 @@ fun TestApplicationEngine.`Given I have follow on article`(
     article: String,
 ) {
     val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
-    val citizen = citizenRepository.findByName(CitizenI.Name(firstName, lastName)) ?: error("Citizen not exist")
+    val citizen = citizenRepository.findByUsername("$firstName-$lastName".toLowerCase()) ?: error("Citizen not exist")
     createFollow(citizen, ArticleRef(article.toUUID()))
 }
 
@@ -41,7 +40,7 @@ fun TestApplicationEngine.`Given I have follow on constitution`(
     constitution: String,
 ) {
     val citizenRepository: CitizenRepository by lazy { GlobalContext.get().koin.get() }
-    val citizen = citizenRepository.findByName(CitizenI.Name(firstName, lastName)) ?: error("Citizen not exist")
+    val citizen = citizenRepository.findByUsername("$firstName-$lastName".toLowerCase()) ?: error("Citizen not exist")
     createFollow(citizen, ArticleRef(constitution.toUUID()))
 }
 

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

@@ -65,7 +65,7 @@ private fun createWorkgroup(
             .toLowerCase().replace(' ', '-')
         val user = UserForCreate(
             username = username,
-            password = "Azerty123!",
+            password = "azerty",
         )
         CitizenForCreate(
             name = creatorName,

src/test/kotlin/integration/steps/then/request.kt

@@ -46,7 +46,7 @@ infix fun TestApplicationResponse.`And have property`(path: String): Pair<JsonPa
         } ?: throw AssertionError("\"${path}\" element not found on json response")
     }
 
-infix fun Pair<JsonPath, Any>.`which contains`(expected: Any): Pair<JsonPath, Any> = this.apply {
+infix fun Pair<JsonPath, Any>.`whish contains`(expected: Any): Pair<JsonPath, Any> = this.apply {
     second `should be equal to` expected
 }
 

src/test/kotlin/integration/steps/when/request.kt

@@ -14,7 +14,6 @@ import io.ktor.server.testing.TestApplicationRequest
 import io.ktor.server.testing.setBody
 
 enum class Validate(override val bit: Long) : BitMaskI {
-    NONE(0),
     REQUEST_BODY(1),
     REQUEST_PARAM(2),
     REQUEST_HEADER(4),
@@ -41,7 +40,7 @@ fun TestApplicationCall.valid(validate: BitMaskI): TestApplicationCall {
     return this
 }
 
-fun TestApplicationEngine.`When I send a GET request`(uri: String? = null, validate: BitMaskI = Validate.ALL, setup: (TestApplicationRequest.() -> Unit)? = null): TestApplicationCall {
+fun TestApplicationEngine.`When I send a GET request`(uri: String? = null, validate: Validate = Validate.ALL, setup: (TestApplicationRequest.() -> Unit)? = null): TestApplicationCall {
     return handleRequest(true) {
         method = HttpMethod.Get
         if (uri != null) {
@@ -75,7 +74,7 @@ fun TestApplicationEngine.`When I send a PUT request`(uri: String? = null, valid
     }.valid(validate)
 }
 
-fun TestApplicationEngine.`When I send a DELETE request`(uri: String? = null, validate: BitMaskI = Validate.ALL, setup: (TestApplicationRequest.() -> String?)? = null): TestApplicationCall {
+fun TestApplicationEngine.`When I send a DELETE request`(uri: String? = null, validate: Validate = Validate.ALL, setup: (TestApplicationRequest.() -> String?)? = null): TestApplicationCall {
     return handleRequest(true) {
         method = HttpMethod.Delete
         if (uri != null) {

src/test/kotlin/unit/Email Validation.kt

@@ -1,32 +0,0 @@
-package unit
-
-import fr.dcproject.common.validation.email
-import io.konform.validation.Invalid
-import io.konform.validation.Valid
-import io.konform.validation.Validation
-import org.amshove.kluent.`should be instance of`
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Tags
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.junit.jupiter.api.parallel.Execution
-import org.junit.jupiter.api.parallel.ExecutionMode
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Execution(ExecutionMode.CONCURRENT)
-@Tags(Tag("validation"), Tag("unit"))
-internal class `Email Validation` {
-    @Test
-    fun passwordScore() {
-        Validation<ObjectToValid> {
-            ObjectToValid::email {
-                email()
-            }
-        }.run {
-            validate(ObjectToValid("abc@123.com")) `should be instance of` Valid::class
-            validate(ObjectToValid("abc123.com")) `should be instance of` Invalid::class
-        }
-    }
-
-    class ObjectToValid(val email: String)
-}

src/test/kotlin/unit/Password Validation.kt

@@ -1,46 +0,0 @@
-package unit
-
-import fr.dcproject.common.validation.passwordScore
-import io.konform.validation.Invalid
-import io.konform.validation.Valid
-import io.konform.validation.Validation
-import org.amshove.kluent.`should be equal to`
-import org.amshove.kluent.`should be instance of`
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Tags
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestInstance
-import org.junit.jupiter.api.parallel.Execution
-import org.junit.jupiter.api.parallel.ExecutionMode
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@Execution(ExecutionMode.CONCURRENT)
-@Tags(Tag("validation"), Tag("unit"))
-internal class `Password Validation` {
-    @Test
-    fun password() {
-        "1234567890".passwordScore() `should be equal to` 10
-        "1234567A".passwordScore() `should be equal to` 10
-        "1234Aa".passwordScore() `should be equal to` 10
-        "12Aab".passwordScore() `should be equal to` 11
-        "1234Aa".passwordScore() `should be equal to` 10
-        "12abCD-+".passwordScore() `should be equal to` 18
-        "Abcde12!".passwordScore() `should be equal to` 15
-        "Hello world".passwordScore() `should be equal to` 16
-        "hello WORLD".passwordScore() `should be equal to` 17
-    }
-
-    @Test
-    fun passwordScore() {
-        Validation<ObjectToValid> {
-            ObjectToValid::password {
-                this.passwordScore(10)
-            }
-        }.run {
-            validate(ObjectToValid("1234567890")) `should be instance of` Valid::class
-            validate(ObjectToValid("12345678")) `should be instance of` Invalid::class
-        }
-    }
-
-    class ObjectToValid(val password: String)
-}

src/test/resources/sql/follow.sql

@@ -29,9 +29,6 @@ begin
     assert (select following = true from find_follow(first_article_id, _citizen_id, 'article')), '(v1) find_follow must return the following';
     assert (select following = true from find_follow(first_article_updated_id, _citizen_id, 'article')), '(v2) find_follow must return the following';
 
-    assert (select f.total = 1 from find_follows_article_by_target(first_article_id) as f), 'find_follows_article_by_target must return 1 follow';
-    assert (select (f.resource#>>'{0, created_by, id}')::uuid = _citizen_id from find_follows_article_by_target(first_article_id) as f), 'find_follows_article_by_target must return follows with creator';
-
     perform unfollow('article'::regclass, first_article_id, _citizen_id);
     assert (select count(*) = 0 from follow), 'follow must be deleted after unfollow, event if article is on other version';