Move opinions to component
This commit is contained in:
@@ -18,6 +18,7 @@ import fr.dcproject.component.comment.article.routes.installCommentArticleRoutes
|
||||
import fr.dcproject.component.comment.generic.routes.installCommentRoutes
|
||||
import fr.dcproject.component.follow.routes.article.installFollowArticleRoutes
|
||||
import fr.dcproject.component.follow.routes.constitution.installFollowConstitutionRoutes
|
||||
import fr.dcproject.component.opinion.routes.installOpinionRoutes
|
||||
import fr.dcproject.component.views.ConfigViews
|
||||
import fr.dcproject.component.workgroup.routes.installWorkgroupRoutes
|
||||
import fr.dcproject.event.EventNotification
|
||||
@@ -26,8 +27,6 @@ import fr.dcproject.routes.commentConstitution
|
||||
import fr.dcproject.routes.constitution
|
||||
import fr.dcproject.routes.definition
|
||||
import fr.dcproject.routes.notificationArticle
|
||||
import fr.dcproject.routes.opinionArticle
|
||||
import fr.dcproject.routes.opinionChoice
|
||||
import fr.dcproject.routes.voteArticle
|
||||
import fr.dcproject.routes.voteConstitution
|
||||
import fr.dcproject.voter.VoterDeniedException
|
||||
@@ -140,6 +139,7 @@ fun Application.module(env: Env = PROD) {
|
||||
installFollowArticleRoutes()
|
||||
installFollowConstitutionRoutes()
|
||||
installWorkgroupRoutes()
|
||||
installOpinionRoutes()
|
||||
|
||||
authenticate(optional = true) {
|
||||
/* TODO */
|
||||
@@ -147,8 +147,6 @@ fun Application.module(env: Env = PROD) {
|
||||
commentConstitution(get(), get())
|
||||
voteArticle(get(), get(), get(), get())
|
||||
voteConstitution(get(), get())
|
||||
opinionArticle(get(), get())
|
||||
opinionChoice(get(), get())
|
||||
definition()
|
||||
}
|
||||
|
||||
|
||||
@@ -8,12 +8,13 @@ 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.opinion.entity.OpinionChoice
|
||||
import fr.dcproject.component.workgroup.Workgroup
|
||||
import fr.dcproject.component.workgroup.WorkgroupRef
|
||||
import fr.dcproject.component.workgroup.WorkgroupRepository
|
||||
import fr.dcproject.entity.Constitution
|
||||
import fr.dcproject.entity.ConstitutionRef
|
||||
import fr.dcproject.repository.OpinionChoice
|
||||
import fr.dcproject.repository.OpinionChoiceRepository
|
||||
import io.ktor.features.DataConversion
|
||||
import io.ktor.features.NotFoundException
|
||||
import io.ktor.util.KtorExperimentalAPI
|
||||
@@ -99,11 +100,11 @@ val converters: ConverterDeclaration = {
|
||||
}
|
||||
}
|
||||
|
||||
convert<fr.dcproject.entity.OpinionChoice> {
|
||||
convert<OpinionChoice> {
|
||||
decode { values, _ ->
|
||||
val id = values.singleOrNull()?.let { UUID.fromString(it) }
|
||||
?: throw InternalError("Cannot convert $values to UUID")
|
||||
get<OpinionChoice>().findOpinionChoiceById(id)
|
||||
get<OpinionChoiceRepository>().findOpinionChoiceById(id)
|
||||
?: throw NotFoundException("OpinionChoice $values not found")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,8 @@ import fr.dcproject.component.citizen.CitizenVoter
|
||||
import fr.dcproject.component.comment.article.CommentArticleRepository
|
||||
import fr.dcproject.component.comment.generic.CommentVoter
|
||||
import fr.dcproject.component.follow.FollowVoter
|
||||
import fr.dcproject.component.opinion.OpinionChoiceVoter
|
||||
import fr.dcproject.component.opinion.OpinionVoter
|
||||
import fr.dcproject.component.workgroup.WorkgroupRepository
|
||||
import fr.dcproject.component.workgroup.WorkgroupVoter
|
||||
import fr.dcproject.event.publisher.Publisher
|
||||
@@ -25,8 +27,6 @@ import fr.dcproject.messages.Mailer
|
||||
import fr.dcproject.messages.NotificationEmailSender
|
||||
import fr.dcproject.repository.CommentConstitutionRepository
|
||||
import fr.dcproject.security.voter.ConstitutionVoter
|
||||
import fr.dcproject.security.voter.OpinionChoiceVoter
|
||||
import fr.dcproject.security.voter.OpinionVoter
|
||||
import fr.dcproject.security.voter.VoteVoter
|
||||
import fr.postgresjson.connexion.Connection
|
||||
import fr.postgresjson.connexion.Requester
|
||||
@@ -44,8 +44,8 @@ import fr.dcproject.component.comment.generic.CommentRepository as CommentGeneri
|
||||
import fr.dcproject.component.follow.FollowArticleRepository as FollowArticleRepository
|
||||
import fr.dcproject.component.follow.FollowConstitutionRepository as FollowConstitutionRepository
|
||||
import fr.dcproject.repository.Constitution as ConstitutionRepository
|
||||
import fr.dcproject.repository.OpinionArticle as OpinionArticleRepository
|
||||
import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
|
||||
import fr.dcproject.repository.OpinionChoiceRepository as OpinionChoiceRepository
|
||||
import fr.dcproject.repository.OpinionRepositoryArticle as OpinionArticleRepository
|
||||
import fr.dcproject.repository.VoteArticle as VoteArticleRepository
|
||||
import fr.dcproject.repository.VoteComment as VoteCommentRepository
|
||||
import fr.dcproject.repository.VoteConstitution as VoteConstitutionRepository
|
||||
|
||||
Reference in New Issue
Block a user