Remove last converter for Workgroup
This commit is contained in:
@@ -1,11 +1,6 @@
|
|||||||
package fr.dcproject.application
|
package fr.dcproject.application
|
||||||
|
|
||||||
import fr.dcproject.component.citizen.CitizenBasic
|
|
||||||
import fr.dcproject.component.workgroup.Workgroup
|
|
||||||
import fr.dcproject.component.workgroup.WorkgroupRef
|
|
||||||
import fr.dcproject.component.workgroup.WorkgroupRepository
|
|
||||||
import io.ktor.features.DataConversion
|
import io.ktor.features.DataConversion
|
||||||
import io.ktor.features.NotFoundException
|
|
||||||
import io.ktor.util.KtorExperimentalAPI
|
import io.ktor.util.KtorExperimentalAPI
|
||||||
import org.koin.core.context.GlobalContext
|
import org.koin.core.context.GlobalContext
|
||||||
import org.koin.core.parameter.ParametersDefinition
|
import org.koin.core.parameter.ParametersDefinition
|
||||||
@@ -33,23 +28,4 @@ val converters: ConverterDeclaration = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO remove converters of entities
|
|
||||||
|
|
||||||
convert<WorkgroupRef> {
|
|
||||||
decode { values, _ ->
|
|
||||||
values.singleOrNull()?.let {
|
|
||||||
WorkgroupRef(UUID.fromString(it))
|
|
||||||
} ?: throw NotFoundException("""UUID "$values" is not valid for Workgroup""")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
convert<Workgroup<CitizenBasic>> {
|
|
||||||
decode { values, _ ->
|
|
||||||
val id = values.singleOrNull()?.let { UUID.fromString(it) }
|
|
||||||
?: throw InternalError("Cannot convert $values to UUID")
|
|
||||||
get<WorkgroupRepository>().findById(id)
|
|
||||||
?: throw NotFoundException("Workgroup $values not found")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import fr.dcproject.component.auth.citizenOrNull
|
|||||||
import fr.dcproject.component.opinion.OpinionChoiceAccessControl
|
import fr.dcproject.component.opinion.OpinionChoiceAccessControl
|
||||||
import fr.dcproject.component.opinion.OpinionChoiceRepository
|
import fr.dcproject.component.opinion.OpinionChoiceRepository
|
||||||
import fr.dcproject.security.assert
|
import fr.dcproject.security.assert
|
||||||
import fr.dcproject.utils.toUUID
|
|
||||||
import io.ktor.application.call
|
import io.ktor.application.call
|
||||||
import io.ktor.locations.KtorExperimentalLocationsAPI
|
import io.ktor.locations.KtorExperimentalLocationsAPI
|
||||||
import io.ktor.locations.Location
|
import io.ktor.locations.Location
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package fr.dcproject.component.workgroup.routes
|
|||||||
|
|
||||||
import fr.dcproject.component.auth.citizenOrNull
|
import fr.dcproject.component.auth.citizenOrNull
|
||||||
import fr.dcproject.component.workgroup.WorkgroupAccessControl
|
import fr.dcproject.component.workgroup.WorkgroupAccessControl
|
||||||
|
import fr.dcproject.component.workgroup.WorkgroupRef
|
||||||
import fr.dcproject.component.workgroup.WorkgroupRepository
|
import fr.dcproject.component.workgroup.WorkgroupRepository
|
||||||
import fr.dcproject.security.assert
|
import fr.dcproject.security.assert
|
||||||
import io.ktor.application.call
|
import io.ktor.application.call
|
||||||
@@ -15,12 +16,14 @@ import java.util.UUID
|
|||||||
|
|
||||||
@KtorExperimentalLocationsAPI
|
@KtorExperimentalLocationsAPI
|
||||||
object GetWorkgroup {
|
object GetWorkgroup {
|
||||||
@Location("/workgroups/{workgroupId}")
|
@Location("/workgroups/{workgroup}")
|
||||||
class WorkgroupRequest(val workgroupId: UUID)
|
class WorkgroupRequest(workgroup: UUID) {
|
||||||
|
val workgroup = WorkgroupRef(workgroup)
|
||||||
|
}
|
||||||
|
|
||||||
fun Route.getWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
|
fun Route.getWorkgroup(repo: WorkgroupRepository, ac: WorkgroupAccessControl) {
|
||||||
get<WorkgroupRequest> {
|
get<WorkgroupRequest> {
|
||||||
repo.findById(it.workgroupId)?.let { workgroup ->
|
repo.findById(it.workgroup.id)?.let { workgroup ->
|
||||||
ac.assert { canView(workgroup, citizenOrNull) }
|
ac.assert { canView(workgroup, citizenOrNull) }
|
||||||
call.respond(workgroup)
|
call.respond(workgroup)
|
||||||
} ?: call.respond(HttpStatusCode.NotFound)
|
} ?: call.respond(HttpStatusCode.NotFound)
|
||||||
|
|||||||
Reference in New Issue
Block a user