src/main/kotlin/application/Application.kt

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.joda.JodaModule
 import com.github.jasync.sql.db.postgresql.exceptions.GenericDatabaseException
 import fr.dcproject.application.Env.PROD
+import fr.dcproject.common.security.AccessDeniedException
 import fr.dcproject.component.article.articleKoinModule
 import fr.dcproject.component.article.routes.installArticleRoutes
 import fr.dcproject.component.auth.ForbiddenException
@@ -36,7 +37,6 @@ import fr.dcproject.component.vote.routes.installVoteRoutes
 import fr.dcproject.component.vote.voteKoinModule
 import fr.dcproject.component.workgroup.routes.installWorkgroupRoutes
 import fr.dcproject.component.workgroup.workgroupKoinModule
-import fr.dcproject.security.AccessDeniedException
 import fr.postgresjson.migration.Migrations
 import io.ktor.application.Application
 import io.ktor.application.ApplicationStopped

src/main/kotlin/application/KoinModule.kt

@@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.datatype.joda.JodaModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.rabbitmq.client.ConnectionFactory
+import fr.dcproject.common.email.Mailer
 import fr.dcproject.component.notification.NotificationConsumer
+import fr.dcproject.component.notification.NotificationEmailSender
 import fr.dcproject.component.notification.NotificationsPush
 import fr.dcproject.component.notification.Publisher
-import fr.dcproject.messages.Mailer
-import fr.dcproject.messages.NotificationEmailSender
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.migration.Migrations

src/main/kotlin/common/email/Mailer.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.messages
+package fr.dcproject.common.email
 
 import com.sendgrid.Method
 import com.sendgrid.Request

src/main/kotlin/common/security/AccessControlModule.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.security
+package fr.dcproject.common.security
 
 /** Responses of AccessControl */
 enum class AccessDecision {

src/main/kotlin/common/utils/DateTime.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import org.joda.time.DateTime
 import org.joda.time.format.ISODateTimeFormat

src/main/kotlin/common/utils/Elastic.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import com.jayway.jsonpath.JsonPath
 import com.jayway.jsonpath.PathNotFoundException

src/main/kotlin/common/utils/LoggerDelegate.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

src/main/kotlin/common/utils/Request.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
 import io.ktor.application.ApplicationCall

src/main/kotlin/common/utils/Resources.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 fun String.readResource(callback: (String) -> Unit = {}): String {
     val content = callback::class.java.getResource(this).readText()

src/main/kotlin/common/utils/Uuid.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import java.util.UUID
 

src/main/kotlin/common/utils/waitElastic.kt

@@ -1,4 +1,4 @@
-package fr.dcproject.utils
+package fr.dcproject.common.utils
 
 import org.elasticsearch.client.Request
 import org.elasticsearch.client.RestClient

src/main/kotlin/component/article/ArticleAccessControl.kt

@@ -2,9 +2,9 @@ package fr.dcproject.component.article
 
 import fr.dcproject.common.entity.CreatedBy
 import fr.dcproject.common.entity.VersionableRef
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 
 class ArticleAccessControl(private val articleRepo: ArticleRepository) : AccessControl() {
     fun <S : ArticleAuthI<*>> canView(subjects: List<S>, citizen: CitizenI?): AccessResponse =

src/main/kotlin/component/article/ArticleViewManager.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.article
 
 import fr.dcproject.common.entity.VersionableRef
+import fr.dcproject.common.utils.contentToString
+import fr.dcproject.common.utils.getJsonField
+import fr.dcproject.common.utils.toIso
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.views.ViewManager
 import fr.dcproject.component.views.entity.ViewAggregation
-import fr.dcproject.utils.contentToString
-import fr.dcproject.utils.getJsonField
-import fr.dcproject.utils.toIso
 import org.elasticsearch.client.Request
 import org.elasticsearch.client.Response
 import org.elasticsearch.client.RestClient

src/main/kotlin/component/article/routes/FindArticleVersions.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.article.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.ArticleAccessControl
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.auth.citizenOrNull
-import fr.dcproject.security.assert
 import fr.postgresjson.repository.RepositoryI
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/article/routes/FindArticles.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.article.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.ArticleAccessControl
 import fr.dcproject.component.article.ArticleForListing
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import fr.dcproject.security.assert
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.repository.RepositoryI
 import io.ktor.application.call

src/main/kotlin/component/article/routes/GetOneArticle.kt

@@ -2,6 +2,7 @@ package fr.dcproject.component.article.routes
 
 import fr.dcproject.common.dto.CreatedAt
 import fr.dcproject.common.dto.Versionable
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.ArticleAccessControl
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRef
@@ -12,7 +13,6 @@ import fr.dcproject.component.opinion.dto.Opinionable
 import fr.dcproject.component.views.dto.Viewable
 import fr.dcproject.component.views.entity.ViewAggregation
 import fr.dcproject.component.vote.dto.Votable
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/article/routes/UpsertArticle.kt

@@ -1,5 +1,7 @@
 package fr.dcproject.component.article.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.article.ArticleAccessControl
 import fr.dcproject.component.article.ArticleForUpdate
 import fr.dcproject.component.article.ArticleForView
@@ -10,8 +12,6 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.notification.ArticleUpdateNotification
 import fr.dcproject.component.notification.Publisher
 import fr.dcproject.component.workgroup.WorkgroupRef
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.ApplicationCall
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/auth/KoinModule.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.component.auth
 
 import fr.dcproject.application.Configuration
-import fr.dcproject.messages.Mailer
+import fr.dcproject.common.email.Mailer
 import org.koin.dsl.module
 
 val authKoinModule = module {

src/main/kotlin/component/auth/PasswordlessAuth.kt

@@ -3,11 +3,11 @@ package fr.dcproject.component.auth
 import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
+import fr.dcproject.common.email.Mailer
 import fr.dcproject.component.auth.jwt.makeToken
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.citizen.CitizenWithEmail
 import fr.dcproject.component.citizen.CitizenWithUserI
-import fr.dcproject.messages.Mailer
 import io.ktor.http.URLBuilder
 
 /**

src/main/kotlin/component/auth/routes/Login.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.auth.routes
 
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.component.auth.jwt.makeToken
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.auth.UserPasswordCredential
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/auth/routes/Register.kt

@@ -1,6 +1,7 @@
 package fr.dcproject.component.auth.routes
 
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.auth.jwt.makeToken
@@ -8,7 +9,6 @@ import fr.dcproject.component.auth.routes.Register.RegisterRequest.Input
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.features.BadRequestException
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/auth/routes/Sso.kt

@@ -1,8 +1,8 @@
 package fr.dcproject.component.auth.routes
 
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.PasswordlessAuth
 import fr.dcproject.component.auth.routes.Sso.PasswordlessRequest.Input
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/citizen/CitizenAccessControl.kt

@@ -1,7 +1,7 @@
 package fr.dcproject.component.citizen
 
-import fr.dcproject.security.AccessControl
+import fr.dcproject.common.security.AccessControl
-import fr.dcproject.security.AccessResponse
+import fr.dcproject.common.security.AccessResponse
 import fr.postgresjson.entity.EntityDeletedAt
 
 class CitizenAccessControl : AccessControl() {

src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.citizen.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenAccessControl
 import fr.dcproject.component.citizen.CitizenRef
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.auth.UserPasswordCredential
 import io.ktor.features.BadRequestException

src/main/kotlin/component/citizen/routes/FindCitizens.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.citizen.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenAccessControl
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import fr.dcproject.security.assert
 import fr.postgresjson.repository.RepositoryI
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.citizen.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenAccessControl
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/citizen/routes/GetOneCitizen.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.citizen.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenAccessControl
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.citizen.CitizenRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt

@@ -1,5 +1,7 @@
 package fr.dcproject.component.comment.article.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
@@ -7,8 +9,6 @@ import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.article.routes.CreateCommentArticle.PostArticleCommentRequest.Input
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.CommentForUpdate
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.ApplicationCall
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/comment/article/routes/GetArticleComments.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.comment.article.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.comment.article.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentAccessControl
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt

@@ -1,17 +1,16 @@
 package fr.dcproject.component.comment.constitution.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.constitution.CommentConstitutionRepository
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.constitution.ConstitutionRef
-import fr.dcproject.security.assert
 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
 import io.ktor.locations.post
 import io.ktor.request.receiveText
 import io.ktor.response.respond

src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.comment.constitution.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.comment.constitution.CommentConstitutionRepository
 import fr.dcproject.component.comment.generic.CommentAccessControl
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.comment.constitution.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.constitution.CommentConstitutionRepository
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.constitution.ConstitutionRef
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/comment/generic/CommentAccessControl.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.comment.generic
 
 import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 import fr.postgresjson.entity.EntityCreatedBy
 import fr.postgresjson.entity.EntityDeletedAt
 

src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt

@@ -1,13 +1,13 @@
 package fr.dcproject.component.comment.generic.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/comment/generic/routes/EditComment.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.comment.generic.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/comment/generic/routes/GetCommentChildren.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.comment.generic.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/comment/generic/routes/GetOneComment.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.comment.generic.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/constitution/ConstitutionAccessControl.kt

@@ -1,8 +1,8 @@
 package fr.dcproject.component.constitution
 
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 import fr.postgresjson.entity.EntityCreatedBy
 import fr.postgresjson.entity.EntityDeletedAt
 

src/main/kotlin/component/constitution/routes/CreateConstitution.kt

@@ -1,5 +1,7 @@
 package fr.dcproject.component.constitution.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
@@ -11,8 +13,6 @@ import fr.dcproject.component.constitution.ConstitutionSimple
 import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple
 import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input
 import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input.Title
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import fr.postgresjson.entity.UuidEntity
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/constitution/routes/FindConstitutions.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.constitution.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.constitution.ConstitutionAccessControl
 import fr.dcproject.component.constitution.ConstitutionRepository
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import fr.dcproject.security.assert
 import fr.postgresjson.repository.RepositoryI
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/constitution/routes/GetConstitution.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.constitution.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.constitution.ConstitutionAccessControl
 import fr.dcproject.component.constitution.ConstitutionRef
 import fr.dcproject.component.constitution.ConstitutionRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/doc/routes/OpenAPI.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.doc.routes
 
-import fr.dcproject.utils.readResource
+import fr.dcproject.common.utils.readResource
 import io.ktor.application.call
 import io.ktor.http.ContentType
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/follow/FollowAccessControl.kt

@@ -1,8 +1,8 @@
 package fr.dcproject.component.follow
 
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 import fr.dcproject.component.follow.Follow as FollowEntity
 
 class FollowAccessControl : AccessControl() {

src/main/kotlin/component/follow/routes/article/FollowArticle.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.follow.routes.article
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowArticleRepository
 import fr.dcproject.component.follow.FollowForUpdate
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/follow/routes/article/GetFollowArticle.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.follow.routes.article
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowArticleRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.follow.routes.article
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowArticleRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/follow/routes/article/UnfollowArticle.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.follow.routes.article
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowArticleRepository
 import fr.dcproject.component.follow.FollowForUpdate
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.follow.routes.constitution
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.constitution.ConstitutionRef
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowConstitutionRepository
 import fr.dcproject.component.follow.FollowForUpdate
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.follow.routes.constitution
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.constitution.ConstitutionRef
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowConstitutionRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/follow/routes/constitution/GetMyFollowsConstitution.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.follow.routes.constitution
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowConstitutionRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.follow.routes.constitution
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.constitution.ConstitutionRef
 import fr.dcproject.component.follow.FollowAccessControl
 import fr.dcproject.component.follow.FollowConstitutionRepository
 import fr.dcproject.component.follow.FollowForUpdate
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/notification/NotificationConsumer.kt

@@ -11,7 +11,6 @@ import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.follow.FollowArticleRepository
 import fr.dcproject.component.follow.FollowConstitutionRepository
 import fr.dcproject.component.follow.FollowSimple
-import fr.dcproject.messages.NotificationEmailSender
 import io.ktor.utils.io.errors.IOException
 import io.lettuce.core.RedisClient
 import io.lettuce.core.api.async.RedisAsyncCommands

src/main/kotlin/component/notification/NotificationEmailSender.kt

@@ -1,8 +1,9 @@
-package fr.dcproject.messages
+package fr.dcproject.component.notification
 
 import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
+import fr.dcproject.common.email.Mailer
 import fr.dcproject.common.entity.TargetRef
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.article.ArticleWithTitleI

src/main/kotlin/component/opinion/OpinionAccessControl.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.opinion
 
 import fr.dcproject.common.entity.HasTarget
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.opinion.entity.OpinionI
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 import fr.postgresjson.entity.EntityCreatedBy
 import fr.postgresjson.entity.EntityDeletedAt
 

src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.opinion
 
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.opinion.entity.OpinionChoiceI
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 
 class OpinionChoiceAccessControl : AccessControl() {
     fun canView(subjects: List<OpinionChoiceI>, citizen: CitizenI?): AccessResponse =

src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.opinion.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.opinion.OpinionAccessControl
 import fr.dcproject.component.opinion.entity.Opinion
-import fr.dcproject.security.assert
-import fr.dcproject.utils.toUUID
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt

@@ -1,6 +1,7 @@
 package fr.dcproject.component.opinion.routes
 
 import fr.dcproject.common.entity.TargetRef
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
@@ -8,7 +9,6 @@ import fr.dcproject.component.opinion.OpinionAccessControl
 import fr.dcproject.component.opinion.entity.Opinion
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import fr.dcproject.security.assert
 import fr.postgresjson.connexion.Paginated
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/opinion/routes/GetOpinionChoice.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.opinion.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.opinion.OpinionChoiceAccessControl
 import fr.dcproject.component.opinion.OpinionChoiceRepository
 import fr.dcproject.component.opinion.entity.OpinionChoiceRef
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.opinion.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.opinion.OpinionChoiceAccessControl
 import fr.dcproject.component.opinion.OpinionChoiceRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/opinion/routes/OpinionArticle.kt

@@ -1,14 +1,14 @@
 package fr.dcproject.component.opinion.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.opinion.OpinionAccessControl
 import fr.dcproject.component.opinion.entity.OpinionChoiceRef
 import fr.dcproject.component.opinion.entity.OpinionForUpdate
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
-import fr.dcproject.utils.toUUID
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/views/createEsIndexForViews.kt

@@ -1,6 +1,6 @@
 package fr.dcproject.component.views
 
-import fr.dcproject.utils.waitElasticsearchIsUp
+import fr.dcproject.common.utils.waitElasticsearchIsUp
 import org.elasticsearch.client.Request
 import org.elasticsearch.client.RestClient
 

src/main/kotlin/component/vote/VoteAccessControl.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.vote
 
 import fr.dcproject.common.entity.TargetI
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.vote.entity.VoteForUpdateI
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 import fr.postgresjson.entity.EntityDeletedAt
 import fr.dcproject.component.vote.entity.Vote as VoteEntity
 

src/main/kotlin/component/vote/routes/GetCitizenVotes.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.vote.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.vote.VoteAccessControl
 import fr.dcproject.component.vote.VoteRepository
-import fr.dcproject.security.assert
-import fr.dcproject.utils.toUUID
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.vote.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.vote.VoteAccessControl
 import fr.dcproject.component.vote.VoteArticleRepository
 import fr.dcproject.routes.PaginatedRequest
 import fr.dcproject.routes.PaginatedRequestI
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.locations.Location

src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt

@@ -1,5 +1,7 @@
 package fr.dcproject.component.vote.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.auth.citizen
@@ -7,8 +9,6 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.vote.VoteAccessControl
 import fr.dcproject.component.vote.VoteArticleRepository
 import fr.dcproject.component.vote.entity.VoteForUpdate
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/vote/routes/PutVoteOnComment.kt

@@ -1,13 +1,13 @@
 package fr.dcproject.component.vote.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.vote.VoteAccessControl
 import fr.dcproject.component.vote.VoteCommentRepository
 import fr.dcproject.component.vote.entity.VoteForUpdate
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/vote/routes/VoteConstitution.kt

@@ -1,5 +1,7 @@
 package fr.dcproject.component.vote.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.constitution.ConstitutionRef
@@ -8,8 +10,6 @@ import fr.dcproject.component.vote.VoteAccessControl
 import fr.dcproject.component.vote.VoteConstitutionRepository
 import fr.dcproject.component.vote.entity.VoteForUpdate
 import fr.dcproject.component.vote.routes.VoteConstitution.ConstitutionVoteRequest.Input
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.features.NotFoundException
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/workgroup/WorkgroupAccessControl.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.workgroup
 
+import fr.dcproject.common.security.AccessControl
+import fr.dcproject.common.security.AccessResponse
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member.Role
-import fr.dcproject.security.AccessControl
-import fr.dcproject.security.AccessResponse
 
 class WorkgroupAccessControl : AccessControl() {
     fun canCreate(subject: WorkgroupI, citizen: CitizenI?): AccessResponse {

src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt

@@ -1,13 +1,13 @@
 package fr.dcproject.component.workgroup.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupSimple
 import fr.dcproject.component.workgroup.routes.CreateWorkgroup.PostWorkgroupRequest.Input
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt

@@ -1,9 +1,9 @@
 package fr.dcproject.component.workgroup.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt

@@ -1,11 +1,11 @@
 package fr.dcproject.component.workgroup.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.routes.EditWorkgroup.PutWorkgroupRequest.Input
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.workgroup.routes
 
+import fr.dcproject.common.security.assert
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRef
 import fr.dcproject.component.workgroup.WorkgroupRepository
-import fr.dcproject.security.assert
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt

@@ -1,10 +1,10 @@
 package fr.dcproject.component.workgroup.routes
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRepository
-import fr.dcproject.security.assert
-import fr.dcproject.utils.toUUID
 import fr.postgresjson.repository.RepositoryI
 import io.ktor.application.call
 import io.ktor.locations.KtorExperimentalLocationsAPI

src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.workgroup.routes.members
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.ApplicationCall
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.workgroup.routes.members
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.ApplicationCall
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode

src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt

@@ -1,12 +1,12 @@
 package fr.dcproject.component.workgroup.routes.members
 
+import fr.dcproject.common.security.assert
+import fr.dcproject.common.utils.receiveOrBadRequest
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI
-import fr.dcproject.security.assert
-import fr.dcproject.utils.receiveOrBadRequest
 import io.ktor.application.ApplicationCall
 import io.ktor.application.call
 import io.ktor.http.HttpStatusCode

src/test/kotlin/CucumberTest.kt

@@ -3,7 +3,7 @@ import com.rabbitmq.client.ConnectionFactory
 import fr.dcproject.application.Configuration
 import fr.dcproject.application.Env.CUCUMBER
 import fr.dcproject.application.module
-import fr.dcproject.utils.LoggerDelegate
+import fr.dcproject.common.utils.LoggerDelegate
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.migration.Migrations

src/test/kotlin/functional/MailerTest.kt

@@ -5,7 +5,7 @@ import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
 import fr.dcproject.application.Env.TEST
 import fr.dcproject.application.module
-import fr.dcproject.messages.Mailer
+import fr.dcproject.common.email.Mailer
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.server.testing.withTestApplication
 import io.ktor.util.KtorExperimentalAPI

src/test/kotlin/functional/NotificationConsumerTest.kt

@@ -9,8 +9,8 @@ import fr.dcproject.component.follow.FollowArticleRepository
 import fr.dcproject.component.follow.FollowSimple
 import fr.dcproject.component.notification.ArticleUpdateNotification
 import fr.dcproject.component.notification.NotificationConsumer
+import fr.dcproject.component.notification.NotificationEmailSender
 import fr.dcproject.component.notification.Publisher
-import fr.dcproject.messages.NotificationEmailSender
 import io.ktor.locations.KtorExperimentalLocationsAPI
 import io.ktor.util.KtorExperimentalAPI
 import io.lettuce.core.RedisClient

src/test/kotlin/functional/ResourcesKtTest.kt

@@ -1,6 +1,6 @@
 package functional
 
-import fr.dcproject.utils.readResource
+import fr.dcproject.common.utils.readResource
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test

src/test/kotlin/steps/ArticleSteps.kt

@@ -1,5 +1,6 @@
 package steps
 
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleForUpdate
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRepository
@@ -9,7 +10,6 @@ import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.workgroup.WorkgroupRef
-import fr.dcproject.utils.toUUID
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
 import org.joda.time.DateTime

src/test/kotlin/steps/ConstitutionSteps.kt

@@ -1,5 +1,6 @@
 package steps
 
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
@@ -11,7 +12,6 @@ import fr.dcproject.component.constitution.ConstitutionRef
 import fr.dcproject.component.constitution.ConstitutionRepository
 import fr.dcproject.component.constitution.ConstitutionSimple
 import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple
-import fr.dcproject.utils.toUUID
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
 import org.joda.time.DateTime

src/test/kotlin/steps/FollowSteps.kt

@@ -1,10 +1,10 @@
 package steps
 
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.constitution.ConstitutionRef
 import fr.dcproject.component.follow.FollowForUpdate
-import fr.dcproject.utils.toUUID
 import io.cucumber.java8.En
 import org.koin.test.KoinTest
 import org.koin.test.get

src/test/kotlin/steps/OpinionSteps.kt

@@ -1,12 +1,12 @@
 package steps
 
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.opinion.OpinionChoiceRepository
 import fr.dcproject.component.opinion.entity.OpinionChoice
 import fr.dcproject.component.opinion.entity.OpinionForUpdate
-import fr.dcproject.utils.toUUID
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
 import org.koin.test.KoinTest

src/test/kotlin/steps/VoteSteps.kt

@@ -1,9 +1,9 @@
 package steps
 
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.vote.entity.VoteForUpdate
-import fr.dcproject.utils.toUUID
 import io.cucumber.java8.En
 import org.koin.test.KoinTest
 import org.koin.test.get

src/test/kotlin/steps/WorkgroupSteps.kt

@@ -1,5 +1,6 @@
 package steps
 
+import fr.dcproject.common.utils.toUUID
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
@@ -9,7 +10,6 @@ import fr.dcproject.component.workgroup.Workgroup
 import fr.dcproject.component.workgroup.WorkgroupRef
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member
-import fr.dcproject.utils.toUUID
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
 import org.joda.time.DateTime

src/test/kotlin/unit/security/ArticleAccessControlTest.kt

@@ -1,13 +1,13 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.article.ArticleAccessControl
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.security.AccessDecision.DENIED
-import fr.dcproject.security.AccessDecision.GRANTED
 import fr.postgresjson.connexion.Paginated
 import io.mockk.every
 import io.mockk.mockk
@@ -24,7 +24,7 @@ import fr.dcproject.component.article.ArticleRepository as ArticleRepo
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class ArticleAccessControlTest {
     private val tesla = CitizenCart(
         id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"),

src/test/kotlin/unit/security/CitizenAccessControlTest.kt

@@ -1,12 +1,12 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenAccessControl
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.security.AccessDecision.DENIED
-import fr.dcproject.security.AccessDecision.GRANTED
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Tag
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class CitizenAccessControlTest {
     private val tesla = CitizenBasic(
         user = User(

src/test/kotlin/unit/security/CommentAccessControlTest.kt

@@ -1,5 +1,7 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.User
@@ -10,8 +12,6 @@ import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.comment.generic.CommentAccessControl
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentForView
-import fr.dcproject.security.AccessDecision.DENIED
-import fr.dcproject.security.AccessDecision.GRANTED
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Tag
@@ -24,7 +24,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class CommentAccessControlTest {
     private val tesla = Citizen(
         user = User(

src/test/kotlin/unit/security/FollowAccessControlTest.kt

@@ -1,5 +1,7 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
@@ -9,8 +11,6 @@ import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.follow.Follow
 import fr.dcproject.component.follow.FollowAccessControl
-import fr.dcproject.security.AccessDecision.DENIED
-import fr.dcproject.security.AccessDecision.GRANTED
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Tag
@@ -23,7 +23,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class FollowAccessControlTest {
     private val tesla = CitizenBasic(
         user = User(

src/test/kotlin/unit/security/OpinionAccessControlTest.kt

@@ -1,5 +1,7 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
@@ -9,8 +11,6 @@ import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.opinion.OpinionAccessControl
 import fr.dcproject.component.opinion.entity.Opinion
 import fr.dcproject.component.opinion.entity.OpinionChoice
-import fr.dcproject.security.AccessDecision.DENIED
-import fr.dcproject.security.AccessDecision.GRANTED
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Tag
@@ -23,7 +23,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class OpinionAccessControlTest {
     private val tesla = CitizenBasic(
         user = User(

src/test/kotlin/unit/security/OpinionChoiceAccessControlTest.kt

@@ -1,5 +1,6 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
@@ -8,7 +9,6 @@ import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.opinion.OpinionChoiceAccessControl
 import fr.dcproject.component.opinion.entity.OpinionChoice
-import fr.dcproject.security.AccessDecision.GRANTED
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Tag
@@ -21,7 +21,7 @@ import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class OpinionChoiceAccessControlTest {
     private val tesla = CitizenBasic(
         id = UUID.fromString("e6efc288-4283-4729-a268-6debb18de1a0"),

src/test/kotlin/unit/security/VoteAccessControlTest.kt

@@ -1,5 +1,7 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
@@ -9,8 +11,6 @@ import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.vote.VoteAccessControl
 import fr.dcproject.component.vote.entity.VoteForUpdate
-import fr.dcproject.security.AccessDecision.DENIED
-import fr.dcproject.security.AccessDecision.GRANTED
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Tag
@@ -24,7 +24,7 @@ import fr.dcproject.component.vote.entity.Vote as VoteEntity
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class VoteAccessControlTest {
     private val tesla = Citizen(
         id = UUID.fromString("a1e35c99-9d33-4fb4-9201-58d7071243bb"),

src/test/kotlin/unit/security/WorkgroupAccessControlTest.kt

@@ -1,5 +1,7 @@
 package unit.security
 
+import fr.dcproject.common.security.AccessDecision.DENIED
+import fr.dcproject.common.security.AccessDecision.GRANTED
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenBasic
@@ -7,8 +9,6 @@ import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.workgroup.WorkgroupAccessControl
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI
-import fr.dcproject.security.AccessDecision.DENIED
-import fr.dcproject.security.AccessDecision.GRANTED
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
 import org.junit.jupiter.api.Tag
@@ -22,7 +22,7 @@ import fr.dcproject.component.workgroup.Workgroup as WorkgroupEntity
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
-@Tags(Tag("security"), Tag("unit"))
+@Tags(Tag("common/security"), Tag("unit"))
 internal class WorkgroupAccessControlTest {
     private val tesla = CitizenBasic(
         user = User(