Test openapi schema of route /opinions/*
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package fr.dcproject.component.opinion.routes
|
||||
|
||||
import fr.dcproject.common.response.toOutput
|
||||
import fr.dcproject.common.security.assert
|
||||
import fr.dcproject.common.utils.toUUID
|
||||
import fr.dcproject.component.article.database.ArticleRef
|
||||
@@ -8,6 +9,7 @@ import fr.dcproject.component.citizen.database.CitizenRef
|
||||
import fr.dcproject.component.opinion.OpinionAccessControl
|
||||
import fr.dcproject.component.opinion.database.Opinion
|
||||
import io.ktor.application.call
|
||||
import io.ktor.http.HttpStatusCode
|
||||
import io.ktor.locations.KtorExperimentalLocationsAPI
|
||||
import io.ktor.locations.Location
|
||||
import io.ktor.locations.get
|
||||
@@ -32,7 +34,10 @@ object GetCitizenOpinions {
|
||||
val opinionsEntities: List<Opinion<ArticleRef>> = repo.findCitizenOpinionsByTargets(it.citizen, it.id)
|
||||
ac.assert { canView(opinionsEntities, citizenOrNull) }
|
||||
|
||||
call.respond(opinionsEntities)
|
||||
call.respond(
|
||||
HttpStatusCode.OK,
|
||||
opinionsEntities.map { it.toOutput() }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package fr.dcproject.component.opinion.routes
|
||||
|
||||
import fr.dcproject.common.entity.TargetRef
|
||||
import fr.dcproject.common.response.toOutput
|
||||
import fr.dcproject.common.security.assert
|
||||
import fr.dcproject.component.auth.citizen
|
||||
import fr.dcproject.component.auth.citizenOrNull
|
||||
@@ -11,6 +12,7 @@ import fr.dcproject.routes.PaginatedRequest
|
||||
import fr.dcproject.routes.PaginatedRequestI
|
||||
import fr.postgresjson.connexion.Paginated
|
||||
import io.ktor.application.call
|
||||
import io.ktor.http.HttpStatusCode
|
||||
import io.ktor.locations.KtorExperimentalLocationsAPI
|
||||
import io.ktor.locations.Location
|
||||
import io.ktor.locations.get
|
||||
@@ -37,7 +39,10 @@ object GetMyOpinionsArticle {
|
||||
get<CitizenOpinionsArticleRequest> {
|
||||
val opinions: Paginated<Opinion<TargetRef>> = repo.findCitizenOpinions(citizen, it.page, it.limit)
|
||||
ac.assert { canView(opinions.result, citizenOrNull) }
|
||||
call.respond(opinions)
|
||||
call.respond(
|
||||
HttpStatusCode.OK,
|
||||
opinions.toOutput { it.toOutput() }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import fr.dcproject.component.opinion.database.OpinionChoiceRef
|
||||
import fr.dcproject.component.opinion.database.OpinionChoiceRepository
|
||||
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.get
|
||||
@@ -26,7 +27,10 @@ object GetOpinionChoice {
|
||||
val opinionChoice = opinionChoiceRepository.findOpinionChoiceById(it.opinionChoice.id) ?: throw NotFoundException("OpinionChoice ${it.opinionChoice.id} not found")
|
||||
ac.assert { canView(it.opinionChoice, citizenOrNull) }
|
||||
|
||||
call.respond(opinionChoice)
|
||||
call.respond(
|
||||
HttpStatusCode.OK,
|
||||
opinionChoice.toOutput()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import fr.dcproject.component.auth.citizenOrNull
|
||||
import fr.dcproject.component.opinion.OpinionChoiceAccessControl
|
||||
import fr.dcproject.component.opinion.database.OpinionChoiceRepository
|
||||
import io.ktor.application.call
|
||||
import io.ktor.http.HttpStatusCode
|
||||
import io.ktor.locations.KtorExperimentalLocationsAPI
|
||||
import io.ktor.locations.Location
|
||||
import io.ktor.locations.get
|
||||
@@ -21,7 +22,10 @@ object GetOpinionChoices {
|
||||
val opinionChoices = repo.findOpinionsChoices(it.targets)
|
||||
ac.assert { canView(opinionChoices, citizenOrNull) }
|
||||
|
||||
call.respond(opinionChoices)
|
||||
call.respond(
|
||||
HttpStatusCode.OK,
|
||||
opinionChoices.map { it.toOutput() }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,10 @@ object OpinionArticle {
|
||||
ac.assert { canCreate(opinions, citizenOrNull) }
|
||||
repo.updateOpinions(opinions)
|
||||
}.let {
|
||||
call.respond(HttpStatusCode.Created, it)
|
||||
call.respond(
|
||||
HttpStatusCode.Created,
|
||||
it.map { it.toOutput() }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
package fr.dcproject.component.opinion.routes
|
||||
|
||||
import fr.dcproject.common.response.toOutput
|
||||
import fr.dcproject.component.opinion.database.Opinion
|
||||
import fr.dcproject.component.opinion.database.OpinionChoice
|
||||
import org.joda.time.DateTime
|
||||
import java.util.UUID
|
||||
|
||||
fun OpinionChoice.toOutput(): Any = this.let { o ->
|
||||
object {
|
||||
val id: UUID = o.id
|
||||
val name: String = o.name
|
||||
val target: List<String>? = o.target
|
||||
}
|
||||
}
|
||||
|
||||
fun Opinion<*>.toOutput(): Any = this.let { o ->
|
||||
object {
|
||||
val id: UUID = o.id
|
||||
val name: String = o.getName()
|
||||
val target: Any = o.target.let { t ->
|
||||
val id: UUID = t.id
|
||||
val reference: String = t.reference
|
||||
}
|
||||
val choice: Any = o.choice.toOutput()
|
||||
val reference: String = o.reference
|
||||
val createdBy: Any = o.createdBy.toOutput()
|
||||
val createdAt: DateTime = o.createdAt
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user