Big refactoring #77
@@ -4,7 +4,6 @@ import fr.dcproject.component.citizen.Citizen
|
|||||||
import fr.dcproject.component.citizen.CitizenBasic
|
import fr.dcproject.component.citizen.CitizenBasic
|
||||||
import fr.dcproject.component.citizen.CitizenRef
|
import fr.dcproject.component.citizen.CitizenRef
|
||||||
import fr.dcproject.component.citizen.CitizenRepository
|
import fr.dcproject.component.citizen.CitizenRepository
|
||||||
import fr.dcproject.component.comment.generic.CommentRef
|
|
||||||
import fr.dcproject.component.constitution.Constitution
|
import fr.dcproject.component.constitution.Constitution
|
||||||
import fr.dcproject.component.constitution.ConstitutionRef
|
import fr.dcproject.component.constitution.ConstitutionRef
|
||||||
import fr.dcproject.component.constitution.ConstitutionRepository
|
import fr.dcproject.component.constitution.ConstitutionRepository
|
||||||
@@ -43,13 +42,8 @@ val converters: ConverterDeclaration = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
convert<CommentRef> {
|
// TODO remove converters of entities
|
||||||
decode { values, _ ->
|
|
||||||
values.singleOrNull()?.let {
|
|
||||||
CommentRef(UUID.fromString(it))
|
|
||||||
} ?: throw NotFoundException("""UUID "$values" is not valid for Comment""")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
convert<ConstitutionRef> {
|
convert<ConstitutionRef> {
|
||||||
decode { values, _ ->
|
decode { values, _ ->
|
||||||
values.singleOrNull()?.let {
|
values.singleOrNull()?.let {
|
||||||
|
|||||||
@@ -16,11 +16,13 @@ import io.ktor.locations.post
|
|||||||
import io.ktor.request.receive
|
import io.ktor.request.receive
|
||||||
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 CreateCommentChildren {
|
object CreateCommentChildren {
|
||||||
@Location("/comments/{comment}/children")
|
@Location("/comments/{comment}/children")
|
||||||
class CreateCommentChildrenRequest(val comment: CommentRef) {
|
class CreateCommentChildrenRequest(comment: UUID) {
|
||||||
|
val comment = CommentRef(comment)
|
||||||
class Input(val content: String)
|
class Input(val content: String)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,11 +14,14 @@ import io.ktor.locations.put
|
|||||||
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 EditComment {
|
object EditComment {
|
||||||
@Location("/comments/{comment}")
|
@Location("/comments/{comment}")
|
||||||
class EditCommentRequest(val comment: CommentRef)
|
class EditCommentRequest(comment: UUID) {
|
||||||
|
val comment = CommentRef(comment)
|
||||||
|
}
|
||||||
|
|
||||||
fun Route.editComment(repo: CommentRepository, ac: CommentAccessControl) {
|
fun Route.editComment(repo: CommentRepository, ac: CommentAccessControl) {
|
||||||
put<EditCommentRequest> {
|
put<EditCommentRequest> {
|
||||||
|
|||||||
@@ -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 GetOneComment {
|
object GetOneComment {
|
||||||
@Location("/comments/{comment}")
|
@Location("/comments/{comment}")
|
||||||
class CommentRequest(val comment: CommentRef)
|
class CommentRequest(comment: UUID) {
|
||||||
|
val comment = CommentRef(comment)
|
||||||
|
}
|
||||||
|
|
||||||
fun Route.getOneComment(repo: CommentRepository, ac: CommentAccessControl) {
|
fun Route.getOneComment(repo: CommentRepository, ac: CommentAccessControl) {
|
||||||
get<CommentRequest> {
|
get<CommentRequest> {
|
||||||
|
|||||||
Reference in New Issue
Block a user