Remove converter for ConstitutionRef

This commit is contained in:
2021-02-05 21:52:10 +01:00
parent 8ead83941f
commit 929d248841
6 changed files with 20 additions and 13 deletions

View File

@@ -44,14 +44,6 @@ val converters: ConverterDeclaration = {
// TODO remove converters of entities // TODO remove converters of entities
convert<ConstitutionRef> {
decode { values, _ ->
values.singleOrNull()?.let {
ConstitutionRef(UUID.fromString(it))
} ?: throw NotFoundException("""UUID "$values" is not valid for Constitution""")
}
}
convert<Constitution> { convert<Constitution> {
decode { values, _ -> decode { values, _ ->
val id = values.singleOrNull()?.let { UUID.fromString(it) } val id = values.singleOrNull()?.let { UUID.fromString(it) }

View File

@@ -16,11 +16,14 @@ import io.ktor.locations.post
import io.ktor.request.receiveText import io.ktor.request.receiveText
import io.ktor.response.respond import io.ktor.response.respond
import io.ktor.routing.Route import io.ktor.routing.Route
import java.util.UUID
@KtorExperimentalLocationsAPI @KtorExperimentalLocationsAPI
object CreateConstitutionComment { object CreateConstitutionComment {
@Location("/constitutions/{constitution}/comments") @Location("/constitutions/{constitution}/comments")
class CreateConstitutionCommentRequest(val constitution: ConstitutionRef) class CreateConstitutionCommentRequest(constitution: UUID) {
val constitution = ConstitutionRef(constitution)
}
fun Route.createConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) { fun Route.createConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
post<CreateConstitutionCommentRequest> { post<CreateConstitutionCommentRequest> {

View File

@@ -12,11 +12,14 @@ import io.ktor.locations.Location
import io.ktor.locations.get import io.ktor.locations.get
import io.ktor.response.respond import io.ktor.response.respond
import io.ktor.routing.Route import io.ktor.routing.Route
import java.util.UUID
@KtorExperimentalLocationsAPI @KtorExperimentalLocationsAPI
object GetConstitutionComment { object GetConstitutionComment {
@Location("/constitutions/{constitution}/comments") @Location("/constitutions/{constitution}/comments")
class GetConstitutionCommentRequest(val constitution: ConstitutionRef) class GetConstitutionCommentRequest(constitution: UUID) {
val constitution = ConstitutionRef(constitution)
}
fun Route.getConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) { fun Route.getConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
get<GetConstitutionCommentRequest> { get<GetConstitutionCommentRequest> {

View File

@@ -14,11 +14,14 @@ import io.ktor.locations.Location
import io.ktor.locations.post import io.ktor.locations.post
import io.ktor.response.respond import io.ktor.response.respond
import io.ktor.routing.Route import io.ktor.routing.Route
import java.util.UUID
@KtorExperimentalLocationsAPI @KtorExperimentalLocationsAPI
object FollowConstitution { object FollowConstitution {
@Location("/constitutions/{constitution}/follows") @Location("/constitutions/{constitution}/follows")
class ConstitutionFollowRequest(val constitution: ConstitutionRef) class ConstitutionFollowRequest(constitution: UUID) {
val constitution = ConstitutionRef(constitution)
}
fun Route.followConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) { fun Route.followConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
post<ConstitutionFollowRequest> { post<ConstitutionFollowRequest> {

View File

@@ -13,11 +13,14 @@ import io.ktor.locations.Location
import io.ktor.locations.get import io.ktor.locations.get
import io.ktor.response.respond import io.ktor.response.respond
import io.ktor.routing.Route import io.ktor.routing.Route
import java.util.UUID
@KtorExperimentalLocationsAPI @KtorExperimentalLocationsAPI
object GetFollowConstitution { object GetFollowConstitution {
@Location("/constitutions/{constitution}/follows") @Location("/constitutions/{constitution}/follows")
class ConstitutionFollowRequest(val constitution: ConstitutionRef) class ConstitutionFollowRequest(constitution: UUID) {
val constitution = ConstitutionRef(constitution)
}
fun Route.getFollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) { fun Route.getFollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
get<ConstitutionFollowRequest> { get<ConstitutionFollowRequest> {

View File

@@ -14,11 +14,14 @@ import io.ktor.locations.Location
import io.ktor.locations.delete import io.ktor.locations.delete
import io.ktor.response.respond import io.ktor.response.respond
import io.ktor.routing.Route import io.ktor.routing.Route
import java.util.UUID
@KtorExperimentalLocationsAPI @KtorExperimentalLocationsAPI
object UnfollowConstitution { object UnfollowConstitution {
@Location("/constitutions/{constitution}/follows") @Location("/constitutions/{constitution}/follows")
class ConstitutionUnfollowRequest(val constitution: ConstitutionRef) class ConstitutionUnfollowRequest(constitution: UUID) {
val constitution = ConstitutionRef(constitution)
}
fun Route.unfollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) { fun Route.unfollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
delete<ConstitutionUnfollowRequest> { delete<ConstitutionUnfollowRequest> {