Refactoring of OpinionChoiceVoter

src/main/kotlin/application/Application.kt

@@ -41,9 +41,7 @@ import fr.dcproject.component.workgroup.routes.members.UpdateMemberOfWorkgroup.u
 import fr.dcproject.event.EventNotification
 import fr.dcproject.event.EventSubscriber
 import fr.dcproject.routes.*
-import fr.dcproject.security.voter.OpinionChoiceVoter
-import fr.ktorVoter.AuthorizationVoter
-import fr.ktorVoter.VoterException
+import fr.dcproject.voter.VoterDeniedException
 import fr.postgresjson.migration.Migrations
 import io.ktor.application.*
 import io.ktor.auth.*
@@ -89,12 +87,6 @@ fun Application.module(env: Env = PROD) {
 
     install(Locations)
 
-    install(AuthorizationVoter) {
-        voters = listOf(
-            OpinionChoiceVoter()
-        )
-    }
-
     HttpClient(Jetty) {
         engine {
         }
@@ -176,7 +168,7 @@ fun Application.module(env: Env = PROD) {
             voteArticle(get(), get(), get(), get())
             voteConstitution(get(), get())
             opinionArticle(get(), get())
-            opinionChoice(get())
+            opinionChoice(get(), get())
             definition()
         }
 
@@ -198,7 +190,7 @@ fun Application.module(env: Env = PROD) {
         exception<NotFoundException> { e ->
             call.respond(HttpStatusCode.NotFound, e.message!!)
         }
-        exception<VoterException> {
+        exception<VoterDeniedException> {
             if (call.user == null) call.respond(HttpStatusCode.Unauthorized)
             else call.respond(HttpStatusCode.Forbidden)
         }

src/main/kotlin/application/KoinModule.kt

@@ -23,10 +23,7 @@ import fr.dcproject.event.publisher.Publisher
 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.FollowVoter
-import fr.dcproject.security.voter.OpinionVoter
-import fr.dcproject.security.voter.VoteVoter
+import fr.dcproject.security.voter.*
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.migration.Migrations
@@ -131,6 +128,7 @@ val KoinModule = module {
     single { VoteVoter() }
     single { FollowVoter() }
     single { OpinionVoter() }
+    single { OpinionChoiceVoter() }
 
     // Elasticsearch Client
     single<RestClient> {