diff --git a/src/main/kotlin/application/Converters.kt b/src/main/kotlin/application/Converters.kt index 08dd7ae..75fe342 100644 --- a/src/main/kotlin/application/Converters.kt +++ b/src/main/kotlin/application/Converters.kt @@ -4,7 +4,6 @@ import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenBasic import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.component.comment.generic.CommentRef import fr.dcproject.component.constitution.Constitution import fr.dcproject.component.constitution.ConstitutionRef import fr.dcproject.component.constitution.ConstitutionRepository @@ -43,13 +42,8 @@ val converters: ConverterDeclaration = { } } - convert { - decode { values, _ -> - values.singleOrNull()?.let { - CommentRef(UUID.fromString(it)) - } ?: throw NotFoundException("""UUID "$values" is not valid for Comment""") - } - } + // TODO remove converters of entities + convert { decode { values, _ -> values.singleOrNull()?.let { diff --git a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt index 3185e62..33f9fe5 100644 --- a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt +++ b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt @@ -16,11 +16,13 @@ import io.ktor.locations.post import io.ktor.request.receive import io.ktor.response.respond import io.ktor.routing.Route +import java.util.UUID @KtorExperimentalLocationsAPI object CreateCommentChildren { @Location("/comments/{comment}/children") - class CreateCommentChildrenRequest(val comment: CommentRef) { + class CreateCommentChildrenRequest(comment: UUID) { + val comment = CommentRef(comment) class Input(val content: String) } diff --git a/src/main/kotlin/component/comment/generic/routes/EditComment.kt b/src/main/kotlin/component/comment/generic/routes/EditComment.kt index 556cc5b..2229c31 100644 --- a/src/main/kotlin/component/comment/generic/routes/EditComment.kt +++ b/src/main/kotlin/component/comment/generic/routes/EditComment.kt @@ -14,11 +14,14 @@ import io.ktor.locations.put import io.ktor.request.receiveText import io.ktor.response.respond import io.ktor.routing.Route +import java.util.UUID @KtorExperimentalLocationsAPI object EditComment { @Location("/comments/{comment}") - class EditCommentRequest(val comment: CommentRef) + class EditCommentRequest(comment: UUID) { + val comment = CommentRef(comment) + } fun Route.editComment(repo: CommentRepository, ac: CommentAccessControl) { put { diff --git a/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt b/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt index fa02f76..7d05881 100644 --- a/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt +++ b/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt @@ -13,11 +13,14 @@ 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 GetOneComment { @Location("/comments/{comment}") - class CommentRequest(val comment: CommentRef) + class CommentRequest(comment: UUID) { + val comment = CommentRef(comment) + } fun Route.getOneComment(repo: CommentRepository, ac: CommentAccessControl) { get {