From d9deb4836e4d99feebf42f06b106f920f12effcd Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Wed, 3 Mar 2021 02:46:51 +0100 Subject: [PATCH] #72 Move Entity and repository on the same package --- .../fr/dcproject/common/entity/Action.kt | 4 ++-- .../fr/dcproject/common/entity/ActionBy.kt | 2 +- .../fr/dcproject/common/entity/Extra.kt | 10 ++++----- .../component/article/ArticleAccessControl.kt | 5 ++++- .../component/article/ArticleViewManager.kt | 3 ++- .../dcproject/component/article/KoinModule.kt | 1 + .../article/{ => database}/Article.kt | 16 +++++++------- .../{ => database}/ArticleRepository.kt | 2 +- .../article/routes/FindArticleVersions.kt | 4 ++-- .../component/article/routes/FindArticles.kt | 4 ++-- .../component/article/routes/GetOneArticle.kt | 6 ++--- .../component/article/routes/UpsertArticle.kt | 8 +++---- .../component/auth/CitizenContext.kt | 6 +++-- .../fr/dcproject/component/auth/KoinModule.kt | 1 + .../component/auth/PasswordlessAuth.kt | 6 ++--- .../component/auth/{ => database}/User.kt | 4 ++-- .../auth/{ => database}/UserRepository.kt | 2 +- .../dcproject/component/auth/jwt/JWTMaker.kt | 2 +- .../component/auth/jwt/JwtInstallation.kt | 4 ++-- .../dcproject/component/auth/routes/Login.kt | 2 +- .../component/auth/routes/Register.kt | 11 +++++----- .../component/citizen/CitizenAccessControl.kt | 1 + .../dcproject/component/citizen/KoinModule.kt | 1 + .../citizen/{ => database}/Citizen.kt | 18 +++++++-------- .../{ => database}/CitizenRepository.kt | 6 ++--- .../citizen/routes/ChangeMyPassword.kt | 6 ++--- .../component/citizen/routes/FindCitizens.kt | 2 +- .../component/citizen/routes/GetOneCitizen.kt | 4 ++-- .../dcproject/component/comment/KoinModule.kt | 6 ++--- .../CommentArticleRepository.kt | 14 ++++++------ .../article/routes/CreateCommentArticle.kt | 6 ++--- .../article/routes/GetArticleComments.kt | 4 ++-- .../routes/GetCitizenArticleComments.kt | 4 ++-- .../CommentConstitutionRepository.kt | 14 ++++++------ .../routes/CreateConstitutionComment.kt | 6 ++--- .../routes/GetCitizenCommentConstitution.kt | 4 ++-- .../routes/GetConstitutionComment.kt | 4 ++-- .../comment/generic/CommentAccessControl.kt | 4 +++- .../comment/generic/{ => database}/Comment.kt | 4 ++-- .../{ => database}/CommentRepository.kt | 8 +++---- .../generic/routes/CreateCommentChildren.kt | 6 ++--- .../comment/generic/routes/EditComment.kt | 4 ++-- .../generic/routes/GetCommentChildren.kt | 2 +- .../comment/generic/routes/GetOneComment.kt | 4 ++-- .../constitution/ConstitutionAccessControl.kt | 5 ++++- .../component/constitution/KoinModule.kt | 1 + .../{ => database}/Constitution.kt | 12 +++++----- .../{ => database}/ConstitutionRepository.kt | 10 ++++----- .../constitution/routes/CreateConstitution.kt | 12 +++++----- .../constitution/routes/FindConstitutions.kt | 2 +- .../constitution/routes/GetConstitution.kt | 4 ++-- .../component/follow/FollowAccessControl.kt | 4 +++- .../dcproject/component/follow/KoinModule.kt | 2 ++ .../component/follow/{ => database}/Follow.kt | 8 +++---- .../follow/{ => database}/FollowRepository.kt | 12 +++++----- .../follow/routes/article/FollowArticle.kt | 6 ++--- .../follow/routes/article/GetFollowArticle.kt | 4 ++-- .../routes/article/GetMyFollowsArticle.kt | 4 ++-- .../follow/routes/article/UnfollowArticle.kt | 6 ++--- .../routes/constitution/FollowConstitution.kt | 6 ++--- .../constitution/GetFollowConstitution.kt | 4 ++-- .../constitution/GetMyFollowsConstitution.kt | 4 ++-- .../constitution/UnfollowConstitution.kt | 6 ++--- .../component/notification/Notification.kt | 2 +- .../notification/NotificationConsumer.kt | 6 ++--- .../notification/NotificationEmailSender.kt | 10 ++++----- .../notification/NotificationsPush.kt | 2 +- .../dcproject/component/opinion/KoinModule.kt | 2 ++ .../component/opinion/OpinionAccessControl.kt | 4 ++-- .../opinion/OpinionChoiceAccessControl.kt | 4 ++-- .../opinion/{entity => database}/Opinion.kt | 10 ++++----- .../{entity => database}/OpinionChoice.kt | 2 +- .../{ => database}/OpinionRepository.kt | 13 +++++------ .../opinion/routes/GetCitizenOpinions.kt | 8 +++---- .../opinion/routes/GetMyOpinionsArticle.kt | 6 ++--- .../opinion/routes/GetOpinionChoice.kt | 4 ++-- .../opinion/routes/GetOpinionChoices.kt | 2 +- .../opinion/routes/OpinionArticle.kt | 8 +++---- .../dcproject/component/views/KoinModule.kt | 2 +- .../dcproject/component/views/ViewManager.kt | 2 +- .../fr/dcproject/component/vote/KoinModule.kt | 4 ++++ .../component/vote/VoteAccessControl.kt | 6 ++--- .../VoteForView.kt => database/Vote.kt} | 8 +++---- .../vote/{ => database}/VoteRepositoryAbs.kt | 17 +++++++------- .../component/vote/routes/GetCitizenVotes.kt | 4 ++-- .../vote/routes/GetCitizenVotesOnArticle.kt | 4 ++-- .../component/vote/routes/PutVoteOnArticle.kt | 8 +++---- .../component/vote/routes/PutVoteOnComment.kt | 6 ++--- .../component/vote/routes/VoteConstitution.kt | 8 +++---- .../component/workgroup/KoinModule.kt | 1 + .../workgroup/WorkgroupAccessControl.kt | 6 +++-- .../Workgroup.kt} | 14 ++++++------ .../{ => database}/WorkgroupRepository.kt | 12 +++++----- .../workgroup/routes/CreateWorkgroup.kt | 4 ++-- .../workgroup/routes/DeleteWorkgroup.kt | 2 +- .../workgroup/routes/EditWorkgroup.kt | 4 ++-- .../workgroup/routes/GetWorkgroup.kt | 4 ++-- .../workgroup/routes/GetWorkgroups.kt | 2 +- .../routes/members/AddMemberToWorkgroup.kt | 6 ++--- .../members/DeleteMembersOfWorkgroup.kt | 6 ++--- .../routes/members/UpdateMemberOfWorkgroup.kt | 6 ++--- .../functional/NotificationConsumerTest.kt | 16 +++++++------- .../functional/NotificationsPushTest.kt | 4 ++-- src/test/kotlin/functional/ViewTest.kt | 4 ++-- .../integration/Comment articles routes.kt | 2 +- .../Comment constitutions routes.kt | 2 +- src/test/kotlin/integration/Opinion routes.kt | 2 +- src/test/kotlin/integration/Vote routes.kt | 2 +- .../kotlin/integration/Workgroup routes.kt | 2 +- .../kotlin/integration/steps/given/Article.kt | 10 ++++----- .../kotlin/integration/steps/given/Auth.kt | 4 ++-- .../kotlin/integration/steps/given/Citizen.kt | 10 ++++----- .../kotlin/integration/steps/given/Comment.kt | 14 ++++++------ .../integration/steps/given/Constitution.kt | 14 ++++++------ .../kotlin/integration/steps/given/Follow.kt | 16 +++++++------- .../kotlin/integration/steps/given/Opinion.kt | 14 ++++++------ .../kotlin/integration/steps/given/Vote.kt | 10 ++++----- .../integration/steps/given/Workgroup.kt | 22 +++++++++---------- .../unit/security/Article Access Control.kt | 12 +++++----- .../unit/security/Citizen Access Control.kt | 8 +++---- .../unit/security/Comment Access Control.kt | 18 +++++++-------- .../unit/security/Follow Access Control.kt | 18 +++++++-------- .../unit/security/Opinion Access Control.kt | 20 ++++++++--------- .../security/OpinionChoice Access Control.kt | 4 ++-- .../unit/security/Vote Access Control.kt | 20 ++++++++--------- .../unit/security/Workgroup Access Control.kt | 15 +++++-------- 126 files changed, 426 insertions(+), 403 deletions(-) rename src/main/kotlin/fr/dcproject/component/article/{ => database}/Article.kt (86%) rename src/main/kotlin/fr/dcproject/component/article/{ => database}/ArticleRepository.kt (97%) rename src/main/kotlin/fr/dcproject/component/auth/{ => database}/User.kt (93%) rename src/main/kotlin/fr/dcproject/component/auth/{ => database}/UserRepository.kt (96%) rename src/main/kotlin/fr/dcproject/component/citizen/{ => database}/Citizen.kt (86%) rename src/main/kotlin/fr/dcproject/component/citizen/{ => database}/CitizenRepository.kt (91%) rename src/main/kotlin/fr/dcproject/component/comment/article/{ => database}/CommentArticleRepository.kt (78%) rename src/main/kotlin/fr/dcproject/component/comment/constitution/{ => database}/CommentConstitutionRepository.kt (75%) rename src/main/kotlin/fr/dcproject/component/comment/generic/{ => database}/Comment.kt (95%) rename src/main/kotlin/fr/dcproject/component/comment/generic/{ => database}/CommentRepository.kt (93%) rename src/main/kotlin/fr/dcproject/component/constitution/{ => database}/Constitution.kt (85%) rename src/main/kotlin/fr/dcproject/component/constitution/{ => database}/ConstitutionRepository.kt (78%) rename src/main/kotlin/fr/dcproject/component/follow/{ => database}/Follow.kt (78%) rename src/main/kotlin/fr/dcproject/component/follow/{ => database}/FollowRepository.kt (91%) rename src/main/kotlin/fr/dcproject/component/opinion/{entity => database}/Opinion.kt (78%) rename src/main/kotlin/fr/dcproject/component/opinion/{entity => database}/OpinionChoice.kt (91%) rename src/main/kotlin/fr/dcproject/component/opinion/{ => database}/OpinionRepository.kt (92%) rename src/main/kotlin/fr/dcproject/component/vote/{entity/VoteForView.kt => database/Vote.kt} (85%) rename src/main/kotlin/fr/dcproject/component/vote/{ => database}/VoteRepositoryAbs.kt (89%) rename src/main/kotlin/fr/dcproject/component/workgroup/{WorkgroupForView.kt => database/Workgroup.kt} (89%) rename src/main/kotlin/fr/dcproject/component/workgroup/{ => database}/WorkgroupRepository.kt (88%) diff --git a/src/main/kotlin/fr/dcproject/common/entity/Action.kt b/src/main/kotlin/fr/dcproject/common/entity/Action.kt index cb78e2e..6b36054 100644 --- a/src/main/kotlin/fr/dcproject/common/entity/Action.kt +++ b/src/main/kotlin/fr/dcproject/common/entity/Action.kt @@ -1,6 +1,6 @@ package fr.dcproject.common.entity -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.citizen.database.CitizenI interface Created : CreatedAt, CreatedBy { class Imp(createdBy: C) : @@ -25,4 +25,4 @@ interface Deleted : DeletedAt, DeletedBy { DeletedAt by DeletedAt.Imp() { override fun isDeleted(): Boolean = (this as Deleted).isDeleted() } -} \ No newline at end of file +} diff --git a/src/main/kotlin/fr/dcproject/common/entity/ActionBy.kt b/src/main/kotlin/fr/dcproject/common/entity/ActionBy.kt index 521cca3..d8f82c7 100644 --- a/src/main/kotlin/fr/dcproject/common/entity/ActionBy.kt +++ b/src/main/kotlin/fr/dcproject/common/entity/ActionBy.kt @@ -1,6 +1,6 @@ package fr.dcproject.common.entity -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.citizen.database.CitizenI interface CreatedBy { val createdBy: T diff --git a/src/main/kotlin/fr/dcproject/common/entity/Extra.kt b/src/main/kotlin/fr/dcproject/common/entity/Extra.kt index 28796dd..228235f 100644 --- a/src/main/kotlin/fr/dcproject/common/entity/Extra.kt +++ b/src/main/kotlin/fr/dcproject/common/entity/Extra.kt @@ -1,10 +1,10 @@ package fr.dcproject.common.entity -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.comment.generic.CommentRef -import fr.dcproject.component.constitution.ConstitutionRef -import fr.dcproject.component.opinion.entity.OpinionRef +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.comment.generic.database.CommentRef +import fr.dcproject.component.constitution.database.ConstitutionRef +import fr.dcproject.component.opinion.database.OpinionRef import java.util.UUID import kotlin.reflect.KClass import kotlin.reflect.full.isSubclassOf diff --git a/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt b/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt index d29b922..90604a0 100644 --- a/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt @@ -4,7 +4,10 @@ import fr.dcproject.common.entity.CreatedBy import fr.dcproject.common.entity.VersionableId import fr.dcproject.common.security.AccessControl import fr.dcproject.common.security.AccessResponse -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.article.database.ArticleAuthI +import fr.dcproject.component.article.database.ArticleI +import fr.dcproject.component.article.database.ArticleRepository +import fr.dcproject.component.citizen.database.CitizenI class ArticleAccessControl(private val articleRepo: ArticleRepository) : AccessControl() { fun > canView(subjects: List, citizen: CitizenI?): AccessResponse = diff --git a/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt b/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt index 9b1bda0..7150216 100644 --- a/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt +++ b/src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt @@ -4,7 +4,8 @@ import fr.dcproject.common.entity.VersionableId 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.article.database.ArticleI +import fr.dcproject.component.citizen.database.CitizenI import fr.dcproject.component.views.ViewManager import fr.dcproject.component.views.entity.ViewAggregation import org.elasticsearch.client.Request diff --git a/src/main/kotlin/fr/dcproject/component/article/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/article/KoinModule.kt index 2434328..3f56332 100644 --- a/src/main/kotlin/fr/dcproject/component/article/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/article/KoinModule.kt @@ -1,5 +1,6 @@ package fr.dcproject.component.article +import fr.dcproject.component.article.database.ArticleRepository import org.koin.dsl.module val articleKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/article/Article.kt b/src/main/kotlin/fr/dcproject/component/article/database/Article.kt similarity index 86% rename from src/main/kotlin/fr/dcproject/component/article/Article.kt rename to src/main/kotlin/fr/dcproject/component/article/database/Article.kt index 61c201b..8e63808 100644 --- a/src/main/kotlin/fr/dcproject/component/article/Article.kt +++ b/src/main/kotlin/fr/dcproject/component/article/database/Article.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.article +package fr.dcproject.component.article.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.CreatedBy @@ -8,17 +8,17 @@ import fr.dcproject.common.entity.TargetI import fr.dcproject.common.entity.TargetRef import fr.dcproject.common.entity.Versionable import fr.dcproject.common.entity.VersionableId -import fr.dcproject.component.citizen.CitizenCart -import fr.dcproject.component.citizen.CitizenCartI -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.citizen.database.CitizenCart +import fr.dcproject.component.citizen.database.CitizenCartI +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.opinion.entity.Opinionable import fr.dcproject.component.opinion.entity.Opinions import fr.dcproject.component.vote.entity.Votable import fr.dcproject.component.vote.entity.VotableImp -import fr.dcproject.component.workgroup.WorkgroupCart -import fr.dcproject.component.workgroup.WorkgroupCartI -import fr.dcproject.component.workgroup.WorkgroupRef +import fr.dcproject.component.workgroup.database.WorkgroupCart +import fr.dcproject.component.workgroup.database.WorkgroupCartI +import fr.dcproject.component.workgroup.database.WorkgroupRef import org.joda.time.DateTime import java.util.UUID diff --git a/src/main/kotlin/fr/dcproject/component/article/ArticleRepository.kt b/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt similarity index 97% rename from src/main/kotlin/fr/dcproject/component/article/ArticleRepository.kt rename to src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt index 8110158..316897c 100644 --- a/src/main/kotlin/fr/dcproject/component/article/ArticleRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.article +package fr.dcproject.component.article.database import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt index 2454aa6..611f612 100644 --- a/src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt +++ b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticleVersions.kt @@ -2,8 +2,8 @@ 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.article.database.ArticleRef +import fr.dcproject.component.article.database.ArticleRepository import fr.dcproject.component.auth.citizenOrNull import fr.postgresjson.repository.RepositoryI import io.ktor.application.call diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt index 8a5358c..87b60ce 100644 --- a/src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt +++ b/src/main/kotlin/fr/dcproject/component/article/routes/FindArticles.kt @@ -2,8 +2,8 @@ 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.article.database.ArticleForListing +import fr.dcproject.component.article.database.ArticleRepository import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt b/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt index 90ef2c4..78f8d3d 100644 --- a/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt @@ -4,10 +4,10 @@ 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 -import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.article.ArticleViewManager +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.article.database.ArticleRepository import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.opinion.dto.Opinionable import fr.dcproject.component.views.dto.Viewable diff --git a/src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt b/src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt index e37a5a8..c8afc74 100644 --- a/src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/article/routes/UpsertArticle.kt @@ -3,15 +3,15 @@ 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 -import fr.dcproject.component.article.ArticleRepository +import fr.dcproject.component.article.database.ArticleForUpdate +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleRepository import fr.dcproject.component.article.routes.UpsertArticle.UpsertArticleRequest.Input import fr.dcproject.component.auth.citizen 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.component.workgroup.database.WorkgroupRef import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt b/src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt index ee05e6a..466998a 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/CitizenContext.kt @@ -1,12 +1,14 @@ package fr.dcproject.component.auth -import fr.dcproject.component.citizen.CitizenRepository +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.CitizenRepository import io.ktor.application.ApplicationCall import io.ktor.auth.authentication import io.ktor.util.AttributeKey import io.ktor.util.pipeline.PipelineContext import org.koin.core.context.GlobalContext -import fr.dcproject.component.citizen.Citizen as CitizenEntity +import fr.dcproject.component.citizen.database.Citizen as CitizenEntity class ForbiddenException(message: String) : Exception(message) diff --git a/src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt index 682d611..ca05e85 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/KoinModule.kt @@ -2,6 +2,7 @@ package fr.dcproject.component.auth import fr.dcproject.application.Configuration import fr.dcproject.common.email.Mailer +import fr.dcproject.component.auth.database.UserRepository import org.koin.dsl.module val authKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt b/src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt index 9b9dad7..f75b594 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/PasswordlessAuth.kt @@ -5,9 +5,9 @@ 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.component.citizen.database.CitizenRepository +import fr.dcproject.component.citizen.database.CitizenWithEmail +import fr.dcproject.component.citizen.database.CitizenWithUserI import io.ktor.http.URLBuilder /** diff --git a/src/main/kotlin/fr/dcproject/component/auth/User.kt b/src/main/kotlin/fr/dcproject/component/auth/database/User.kt similarity index 93% rename from src/main/kotlin/fr/dcproject/component/auth/User.kt rename to src/main/kotlin/fr/dcproject/component/auth/database/User.kt index 22ef6c8..fe43d14 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/User.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/database/User.kt @@ -1,10 +1,10 @@ -package fr.dcproject.component.auth +package fr.dcproject.component.auth.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.Entity import fr.dcproject.common.entity.EntityI import fr.dcproject.common.entity.UpdatedAt -import fr.dcproject.component.auth.UserI.Roles +import fr.dcproject.component.auth.database.UserI.Roles import io.ktor.auth.Principal import org.joda.time.DateTime import java.util.UUID diff --git a/src/main/kotlin/fr/dcproject/component/auth/UserRepository.kt b/src/main/kotlin/fr/dcproject/component/auth/database/UserRepository.kt similarity index 96% rename from src/main/kotlin/fr/dcproject/component/auth/UserRepository.kt rename to src/main/kotlin/fr/dcproject/component/auth/database/UserRepository.kt index ed6902b..c09959b 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/UserRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/database/UserRepository.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.auth +package fr.dcproject.component.auth.database import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI diff --git a/src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt b/src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt index 1e55e19..349e621 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/jwt/JWTMaker.kt @@ -1,7 +1,7 @@ package fr.dcproject.component.auth.jwt import com.auth0.jwt.JWT -import fr.dcproject.component.auth.UserI +import fr.dcproject.component.auth.database.UserI /** * Produce a token for this combination of User and Account diff --git a/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt b/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt index e08fcf9..608138b 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/jwt/JwtInstallation.kt @@ -1,7 +1,7 @@ package fr.dcproject.component.auth.jwt -import fr.dcproject.component.auth.User -import fr.dcproject.component.auth.UserRepository +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserRepository import io.ktor.application.ApplicationCall import io.ktor.auth.Authentication import io.ktor.auth.jwt.jwt diff --git a/src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt b/src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt index e8a9e67..f4d29c0 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/routes/Login.kt @@ -2,7 +2,7 @@ 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.database.UserRepository import fr.dcproject.component.auth.jwt.makeToken import fr.dcproject.component.auth.routes.Login.LoginRequest.Input import io.ktor.application.call diff --git a/src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt b/src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt index a2b8843..b9bba46 100644 --- a/src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt +++ b/src/main/kotlin/fr/dcproject/component/auth/routes/Register.kt @@ -2,14 +2,13 @@ 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.UserForCreate -import fr.dcproject.component.auth.UserI +import fr.dcproject.component.auth.database.UserForCreate +import fr.dcproject.component.auth.database.UserI import fr.dcproject.component.auth.jwt.makeToken import fr.dcproject.component.auth.routes.Register.RegisterRequest.Input -import fr.dcproject.component.citizen.CitizenForCreate -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRepository +import fr.dcproject.component.citizen.database.CitizenForCreate +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRepository import io.ktor.application.call import io.ktor.features.BadRequestException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/citizen/CitizenAccessControl.kt b/src/main/kotlin/fr/dcproject/component/citizen/CitizenAccessControl.kt index bbaf2ba..a6c4f62 100644 --- a/src/main/kotlin/fr/dcproject/component/citizen/CitizenAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/citizen/CitizenAccessControl.kt @@ -3,6 +3,7 @@ package fr.dcproject.component.citizen import fr.dcproject.common.entity.DeletedAt import fr.dcproject.common.security.AccessControl import fr.dcproject.common.security.AccessResponse +import fr.dcproject.component.citizen.database.CitizenI class CitizenAccessControl : AccessControl() { fun canView(subjects: List, connectedCitizen: CitizenI?): AccessResponse where S : CitizenI, S : DeletedAt = diff --git a/src/main/kotlin/fr/dcproject/component/citizen/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/citizen/KoinModule.kt index 16e7a12..1443ef2 100644 --- a/src/main/kotlin/fr/dcproject/component/citizen/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/citizen/KoinModule.kt @@ -1,5 +1,6 @@ package fr.dcproject.component.citizen +import fr.dcproject.component.citizen.database.CitizenRepository import org.koin.dsl.module val citizenKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/citizen/Citizen.kt b/src/main/kotlin/fr/dcproject/component/citizen/database/Citizen.kt similarity index 86% rename from src/main/kotlin/fr/dcproject/component/citizen/Citizen.kt rename to src/main/kotlin/fr/dcproject/component/citizen/database/Citizen.kt index 93fd901..2b1d251 100644 --- a/src/main/kotlin/fr/dcproject/component/citizen/Citizen.kt +++ b/src/main/kotlin/fr/dcproject/component/citizen/database/Citizen.kt @@ -1,17 +1,17 @@ -package fr.dcproject.component.citizen +package fr.dcproject.component.citizen.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.DeletedAt import fr.dcproject.common.entity.Entity import fr.dcproject.common.entity.EntityI -import fr.dcproject.component.auth.User -import fr.dcproject.component.auth.UserCreator -import fr.dcproject.component.auth.UserForCreate -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.auth.UserRef -import fr.dcproject.component.auth.UserWithUsername -import fr.dcproject.component.citizen.CitizenI.Name -import fr.dcproject.component.workgroup.WorkgroupRef +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserCreator +import fr.dcproject.component.auth.database.UserForCreate +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.auth.database.UserRef +import fr.dcproject.component.auth.database.UserWithUsername +import fr.dcproject.component.citizen.database.CitizenI.Name +import fr.dcproject.component.workgroup.database.WorkgroupRef import fr.postgresjson.entity.Serializable import org.joda.time.DateTime import java.util.UUID diff --git a/src/main/kotlin/fr/dcproject/component/citizen/CitizenRepository.kt b/src/main/kotlin/fr/dcproject/component/citizen/database/CitizenRepository.kt similarity index 91% rename from src/main/kotlin/fr/dcproject/component/citizen/CitizenRepository.kt rename to src/main/kotlin/fr/dcproject/component/citizen/database/CitizenRepository.kt index 6c1a402..aed738f 100644 --- a/src/main/kotlin/fr/dcproject/component/citizen/CitizenRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/citizen/database/CitizenRepository.kt @@ -1,7 +1,7 @@ -package fr.dcproject.component.citizen +package fr.dcproject.component.citizen.database -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.citizen.CitizenI.Name +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.CitizenI.Name import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt index 8522c0f..1c3e302 100644 --- a/src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt +++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/ChangeMyPassword.kt @@ -2,12 +2,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.UserWithPassword import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull +import fr.dcproject.component.auth.database.UserRepository +import fr.dcproject.component.auth.database.UserWithPassword import fr.dcproject.component.citizen.CitizenAccessControl -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.citizen.database.CitizenRef import io.ktor.application.call import io.ktor.auth.UserPasswordCredential import io.ktor.features.BadRequestException diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt index d25311d..8908c6c 100644 --- a/src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt +++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/FindCitizens.kt @@ -3,7 +3,7 @@ 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.component.citizen.database.CitizenRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI import fr.postgresjson.repository.RepositoryI diff --git a/src/main/kotlin/fr/dcproject/component/citizen/routes/GetOneCitizen.kt b/src/main/kotlin/fr/dcproject/component/citizen/routes/GetOneCitizen.kt index 2d56d84..6b108ed 100644 --- a/src/main/kotlin/fr/dcproject/component/citizen/routes/GetOneCitizen.kt +++ b/src/main/kotlin/fr/dcproject/component/citizen/routes/GetOneCitizen.kt @@ -3,8 +3,8 @@ 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.component.citizen.database.CitizenRef +import fr.dcproject.component.citizen.database.CitizenRepository import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/comment/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/comment/KoinModule.kt index ef17eb1..e5d2a4e 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/KoinModule.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.comment -import fr.dcproject.component.comment.article.CommentArticleRepository -import fr.dcproject.component.comment.constitution.CommentConstitutionRepository +import fr.dcproject.component.comment.article.database.CommentArticleRepository +import fr.dcproject.component.comment.constitution.database.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl -import fr.dcproject.component.comment.generic.CommentRepository +import fr.dcproject.component.comment.generic.database.CommentRepository import org.koin.dsl.module val commentKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/CommentArticleRepository.kt b/src/main/kotlin/fr/dcproject/component/comment/article/database/CommentArticleRepository.kt similarity index 78% rename from src/main/kotlin/fr/dcproject/component/comment/article/CommentArticleRepository.kt rename to src/main/kotlin/fr/dcproject/component/comment/article/database/CommentArticleRepository.kt index 44a4e7e..22d5dec 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/article/CommentArticleRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/article/database/CommentArticleRepository.kt @@ -1,13 +1,13 @@ -package fr.dcproject.component.comment.article +package fr.dcproject.component.comment.article.database import fr.dcproject.common.entity.EntityI import fr.dcproject.common.entity.TargetI -import fr.dcproject.component.article.ArticleForView -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.comment.generic.CommentForView -import fr.dcproject.component.comment.generic.CommentRepositoryAbs +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef +import fr.dcproject.component.comment.generic.database.CommentForView +import fr.dcproject.component.comment.generic.database.CommentRepositoryAbs import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import java.util.UUID diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt b/src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt index b9c1428..a0649c2 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/article/routes/CreateCommentArticle.kt @@ -2,13 +2,13 @@ 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.article.database.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.comment.article.CommentArticleRepository +import fr.dcproject.component.comment.article.database.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.component.comment.generic.database.CommentForUpdate import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt index 69fea1e..e7415f3 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetArticleComments.kt @@ -1,9 +1,9 @@ package fr.dcproject.component.comment.article.routes import fr.dcproject.common.security.assert -import fr.dcproject.component.article.ArticleRef +import fr.dcproject.component.article.database.ArticleRef import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.comment.article.CommentArticleRepository +import fr.dcproject.component.comment.article.database.CommentArticleRepository import fr.dcproject.component.comment.generic.CommentAccessControl import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI diff --git a/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetCitizenArticleComments.kt b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetCitizenArticleComments.kt index f900a7f..eb33539 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetCitizenArticleComments.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/article/routes/GetCitizenArticleComments.kt @@ -2,8 +2,8 @@ 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.citizen.database.CitizenRef +import fr.dcproject.component.comment.article.database.CommentArticleRepository import fr.dcproject.component.comment.generic.CommentAccessControl import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/CommentConstitutionRepository.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/database/CommentConstitutionRepository.kt similarity index 75% rename from src/main/kotlin/fr/dcproject/component/comment/constitution/CommentConstitutionRepository.kt rename to src/main/kotlin/fr/dcproject/component/comment/constitution/database/CommentConstitutionRepository.kt index 36fb618..64cd70b 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/constitution/CommentConstitutionRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/database/CommentConstitutionRepository.kt @@ -1,13 +1,13 @@ -package fr.dcproject.component.comment.constitution +package fr.dcproject.component.comment.constitution.database import fr.dcproject.common.entity.EntityI import fr.dcproject.common.entity.TargetI -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.comment.article.CommentArticleRepository -import fr.dcproject.component.comment.generic.CommentForView -import fr.dcproject.component.comment.generic.CommentRepositoryAbs -import fr.dcproject.component.constitution.ConstitutionRef +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef +import fr.dcproject.component.comment.article.database.CommentArticleRepository +import fr.dcproject.component.comment.generic.database.CommentForView +import fr.dcproject.component.comment.generic.database.CommentRepositoryAbs +import fr.dcproject.component.constitution.database.ConstitutionRef import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import java.util.UUID diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt index a85353f..17e7cec 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/CreateConstitutionComment.kt @@ -3,10 +3,10 @@ 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.constitution.database.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl -import fr.dcproject.component.comment.generic.CommentForUpdate -import fr.dcproject.component.constitution.ConstitutionRef +import fr.dcproject.component.comment.generic.database.CommentForUpdate +import fr.dcproject.component.constitution.database.ConstitutionRef import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetCitizenCommentConstitution.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetCitizenCommentConstitution.kt index 92e92d5..e81047f 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetCitizenCommentConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetCitizenCommentConstitution.kt @@ -2,8 +2,8 @@ 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.citizen.database.CitizenRef +import fr.dcproject.component.comment.constitution.database.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt index eafa855..460fcd9 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/routes/GetConstitutionComment.kt @@ -2,9 +2,9 @@ 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.constitution.database.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl -import fr.dcproject.component.constitution.ConstitutionRef +import fr.dcproject.component.constitution.database.ConstitutionRef import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt index c5b6ff2..da5b2ca 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt @@ -5,7 +5,9 @@ import fr.dcproject.common.entity.DeletedAt 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.citizen.database.CitizenI +import fr.dcproject.component.comment.generic.database.CommentI +import fr.dcproject.component.comment.generic.database.CommentWithParentI class CommentAccessControl : AccessControl() { fun canView(subjects: List, citizen: CitizenI?): AccessResponse diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/Comment.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/database/Comment.kt similarity index 95% rename from src/main/kotlin/fr/dcproject/component/comment/generic/Comment.kt rename to src/main/kotlin/fr/dcproject/component/comment/generic/database/Comment.kt index 4aa9d76..3b2586c 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/generic/Comment.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/generic/database/Comment.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.comment.generic +package fr.dcproject.component.comment.generic.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.CreatedBy @@ -9,7 +9,7 @@ import fr.dcproject.common.entity.HasTarget import fr.dcproject.common.entity.TargetI import fr.dcproject.common.entity.TargetRef import fr.dcproject.common.entity.UpdatedAt -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.vote.entity.Votable import fr.dcproject.component.vote.entity.VotableImp import org.joda.time.DateTime diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/CommentRepository.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/database/CommentRepository.kt similarity index 93% rename from src/main/kotlin/fr/dcproject/component/comment/generic/CommentRepository.kt rename to src/main/kotlin/fr/dcproject/component/comment/generic/database/CommentRepository.kt index 3cc4232..13d0384 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/generic/CommentRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/generic/database/CommentRepository.kt @@ -1,11 +1,11 @@ -package fr.dcproject.component.comment.generic +package fr.dcproject.component.comment.generic.database import fr.dcproject.common.entity.EntityI import fr.dcproject.common.entity.TargetI import fr.dcproject.common.entity.TargetRef -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.comment.article.CommentArticleRepository +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef +import fr.dcproject.component.comment.article.database.CommentArticleRepository import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt index 9cfb06e..ad54bbb 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/CreateCommentChildren.kt @@ -5,9 +5,9 @@ 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.component.comment.generic.database.CommentForUpdate +import fr.dcproject.component.comment.generic.database.CommentRef +import fr.dcproject.component.comment.generic.database.CommentRepository import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt index 50a5c6c..a33778d 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/EditComment.kt @@ -3,8 +3,8 @@ 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.component.comment.generic.database.CommentRef +import fr.dcproject.component.comment.generic.database.CommentRepository import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetCommentChildren.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetCommentChildren.kt index a452e8c..cb65ad0 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetCommentChildren.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetCommentChildren.kt @@ -3,7 +3,7 @@ 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.component.comment.generic.database.CommentRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI import io.ktor.application.call diff --git a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetOneComment.kt b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetOneComment.kt index 743dc6b..0ee00bc 100644 --- a/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetOneComment.kt +++ b/src/main/kotlin/fr/dcproject/component/comment/generic/routes/GetOneComment.kt @@ -3,8 +3,8 @@ 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.component.comment.generic.database.CommentRef +import fr.dcproject.component.comment.generic.database.CommentRepository import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionAccessControl.kt b/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionAccessControl.kt index 769395f..38d8ce3 100644 --- a/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionAccessControl.kt @@ -4,7 +4,10 @@ import fr.dcproject.common.entity.CreatedBy import fr.dcproject.common.entity.DeletedAt import fr.dcproject.common.security.AccessControl import fr.dcproject.common.security.AccessResponse -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.constitution.database.ConstitutionRef +import fr.dcproject.component.constitution.database.ConstitutionS +import fr.dcproject.component.constitution.database.ConstitutionSimple class ConstitutionAccessControl : AccessControl() { fun canCreate(subject: ConstitutionS, citizen: CitizenI?): AccessResponse = when { diff --git a/src/main/kotlin/fr/dcproject/component/constitution/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/constitution/KoinModule.kt index 3fac4bb..56e0cad 100644 --- a/src/main/kotlin/fr/dcproject/component/constitution/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/constitution/KoinModule.kt @@ -1,5 +1,6 @@ package fr.dcproject.component.constitution +import fr.dcproject.component.constitution.database.ConstitutionRepository import org.koin.dsl.module val constitutionKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/constitution/Constitution.kt b/src/main/kotlin/fr/dcproject/component/constitution/database/Constitution.kt similarity index 85% rename from src/main/kotlin/fr/dcproject/component/constitution/Constitution.kt rename to src/main/kotlin/fr/dcproject/component/constitution/database/Constitution.kt index 41f16f4..e0037b1 100644 --- a/src/main/kotlin/fr/dcproject/component/constitution/Constitution.kt +++ b/src/main/kotlin/fr/dcproject/component/constitution/database/Constitution.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.constitution +package fr.dcproject.component.constitution.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.CreatedBy @@ -7,11 +7,11 @@ import fr.dcproject.common.entity.Entity import fr.dcproject.common.entity.TargetI import fr.dcproject.common.entity.TargetRef import fr.dcproject.common.entity.VersionableId -import fr.dcproject.component.article.ArticleForListing -import fr.dcproject.component.article.ArticleI -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenWithUserI -import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple +import fr.dcproject.component.article.database.ArticleForListing +import fr.dcproject.component.article.database.ArticleI +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenWithUserI +import fr.dcproject.component.constitution.database.ConstitutionSimple.TitleSimple import java.util.UUID class Constitution( diff --git a/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionRepository.kt b/src/main/kotlin/fr/dcproject/component/constitution/database/ConstitutionRepository.kt similarity index 78% rename from src/main/kotlin/fr/dcproject/component/constitution/ConstitutionRepository.kt rename to src/main/kotlin/fr/dcproject/component/constitution/database/ConstitutionRepository.kt index df2db85..eb230f1 100644 --- a/src/main/kotlin/fr/dcproject/component/constitution/ConstitutionRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/constitution/database/ConstitutionRepository.kt @@ -1,15 +1,15 @@ -package fr.dcproject.component.constitution +package fr.dcproject.component.constitution.database -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.CitizenWithUserI -import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.CitizenWithUserI +import fr.dcproject.component.constitution.database.ConstitutionSimple.TitleSimple import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI import fr.postgresjson.repository.RepositoryI.Direction import net.pearx.kasechange.toSnakeCase import java.util.UUID -import fr.dcproject.component.constitution.Constitution as ConstitutionEntity +import fr.dcproject.component.constitution.database.Constitution as ConstitutionEntity class ConstitutionRepository(override var requester: Requester) : RepositoryI { fun findById(id: UUID): ConstitutionEntity? { diff --git a/src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt b/src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt index 9aaedaa..7d67339 100644 --- a/src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/constitution/routes/CreateConstitution.kt @@ -3,15 +3,15 @@ package fr.dcproject.component.constitution.routes import fr.dcproject.common.entity.Entity import fr.dcproject.common.security.assert import fr.dcproject.common.utils.receiveOrBadRequest -import fr.dcproject.component.article.ArticleRef +import fr.dcproject.component.article.database.ArticleRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenWithUserI +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenWithUserI import fr.dcproject.component.constitution.ConstitutionAccessControl -import fr.dcproject.component.constitution.ConstitutionRepository -import fr.dcproject.component.constitution.ConstitutionSimple -import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple +import fr.dcproject.component.constitution.database.ConstitutionRepository +import fr.dcproject.component.constitution.database.ConstitutionSimple +import fr.dcproject.component.constitution.database.ConstitutionSimple.TitleSimple import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input import fr.dcproject.component.constitution.routes.CreateConstitution.PostConstitutionRequest.Input.Title import io.ktor.application.call diff --git a/src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt b/src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt index e804d91..a2bbc44 100644 --- a/src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt +++ b/src/main/kotlin/fr/dcproject/component/constitution/routes/FindConstitutions.kt @@ -3,7 +3,7 @@ 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.component.constitution.database.ConstitutionRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI import fr.postgresjson.repository.RepositoryI diff --git a/src/main/kotlin/fr/dcproject/component/constitution/routes/GetConstitution.kt b/src/main/kotlin/fr/dcproject/component/constitution/routes/GetConstitution.kt index 366b8da..39ea032 100644 --- a/src/main/kotlin/fr/dcproject/component/constitution/routes/GetConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/constitution/routes/GetConstitution.kt @@ -3,8 +3,8 @@ 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.component.constitution.database.ConstitutionRef +import fr.dcproject.component.constitution.database.ConstitutionRepository import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/follow/FollowAccessControl.kt b/src/main/kotlin/fr/dcproject/component/follow/FollowAccessControl.kt index 9e624cf..90dd34b 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/FollowAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/FollowAccessControl.kt @@ -2,7 +2,9 @@ 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.component.citizen.database.CitizenI +import fr.dcproject.component.follow.database.FollowForView +import fr.dcproject.component.follow.database.FollowI class FollowAccessControl : AccessControl() { fun canCreate(subject: FollowI, citizen: CitizenI?): AccessResponse { diff --git a/src/main/kotlin/fr/dcproject/component/follow/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/follow/KoinModule.kt index 00416c5..e57738c 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/KoinModule.kt @@ -1,5 +1,7 @@ package fr.dcproject.component.follow +import fr.dcproject.component.follow.database.FollowArticleRepository +import fr.dcproject.component.follow.database.FollowConstitutionRepository import org.koin.dsl.module val followKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/follow/Follow.kt b/src/main/kotlin/fr/dcproject/component/follow/database/Follow.kt similarity index 78% rename from src/main/kotlin/fr/dcproject/component/follow/Follow.kt rename to src/main/kotlin/fr/dcproject/component/follow/database/Follow.kt index 2e398d6..aeafd6c 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/Follow.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/database/Follow.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.follow +package fr.dcproject.component.follow.database import fr.dcproject.common.entity.Created import fr.dcproject.common.entity.CreatedBy @@ -6,9 +6,9 @@ import fr.dcproject.common.entity.EntityI import fr.dcproject.common.entity.ExtraI import fr.dcproject.common.entity.HasTarget import fr.dcproject.common.entity.TargetI -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef import java.util.UUID open class FollowForView( diff --git a/src/main/kotlin/fr/dcproject/component/follow/FollowRepository.kt b/src/main/kotlin/fr/dcproject/component/follow/database/FollowRepository.kt similarity index 91% rename from src/main/kotlin/fr/dcproject/component/follow/FollowRepository.kt rename to src/main/kotlin/fr/dcproject/component/follow/database/FollowRepository.kt index eff0017..c8e2839 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/FollowRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/database/FollowRepository.kt @@ -1,18 +1,18 @@ -package fr.dcproject.component.follow +package fr.dcproject.component.follow.database import fr.dcproject.common.entity.Entity import fr.dcproject.common.entity.TargetRef -import fr.dcproject.component.article.ArticleForView -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.constitution.ConstitutionRef +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.constitution.database.ConstitutionRef import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import java.util.UUID -import fr.dcproject.component.constitution.Constitution as ConstitutionEntity +import fr.dcproject.component.constitution.database.Constitution as ConstitutionEntity sealed class FollowRepository(override var requester: Requester) : RepositoryI { open fun findByCitizen( diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/FollowArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/FollowArticle.kt index 42c73df..e9fbfc6 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/article/FollowArticle.kt +++ b/src/main/kotlin/fr/dcproject/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.article.database.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.component.follow.database.FollowArticleRepository +import fr.dcproject.component.follow.database.FollowForUpdate import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetFollowArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetFollowArticle.kt index c4d3ec5..56852ec 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetFollowArticle.kt +++ b/src/main/kotlin/fr/dcproject/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.article.database.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.database.FollowArticleRepository import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetMyFollowsArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetMyFollowsArticle.kt index 46d190a..b97516d 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetMyFollowsArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/routes/article/GetMyFollowsArticle.kt @@ -2,9 +2,9 @@ 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.citizen.database.CitizenRef import fr.dcproject.component.follow.FollowAccessControl -import fr.dcproject.component.follow.FollowArticleRepository +import fr.dcproject.component.follow.database.FollowArticleRepository import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/article/UnfollowArticle.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/article/UnfollowArticle.kt index e2b7015..bf33cec 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/article/UnfollowArticle.kt +++ b/src/main/kotlin/fr/dcproject/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.article.database.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.component.follow.database.FollowArticleRepository +import fr.dcproject.component.follow.database.FollowForUpdate import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/FollowConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/FollowConstitution.kt index 0648636..debfbab 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/FollowConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/FollowConstitution.kt @@ -3,10 +3,10 @@ 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.constitution.database.ConstitutionRef import fr.dcproject.component.follow.FollowAccessControl -import fr.dcproject.component.follow.FollowConstitutionRepository -import fr.dcproject.component.follow.FollowForUpdate +import fr.dcproject.component.follow.database.FollowConstitutionRepository +import fr.dcproject.component.follow.database.FollowForUpdate import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetFollowConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetFollowConstitution.kt index 1f96dc1..560dec4 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetFollowConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetFollowConstitution.kt @@ -3,9 +3,9 @@ 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.constitution.database.ConstitutionRef import fr.dcproject.component.follow.FollowAccessControl -import fr.dcproject.component.follow.FollowConstitutionRepository +import fr.dcproject.component.follow.database.FollowConstitutionRepository import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetMyFollowsConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetMyFollowsConstitution.kt index 644154b..3eb3f9f 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetMyFollowsConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/GetMyFollowsConstitution.kt @@ -2,9 +2,9 @@ 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.citizen.database.CitizenRef import fr.dcproject.component.follow.FollowAccessControl -import fr.dcproject.component.follow.FollowConstitutionRepository +import fr.dcproject.component.follow.database.FollowConstitutionRepository import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/UnfollowConstitution.kt b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/UnfollowConstitution.kt index d86f31e..7f2f6fe 100644 --- a/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/UnfollowConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/follow/routes/constitution/UnfollowConstitution.kt @@ -3,10 +3,10 @@ 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.constitution.database.ConstitutionRef import fr.dcproject.component.follow.FollowAccessControl -import fr.dcproject.component.follow.FollowConstitutionRepository -import fr.dcproject.component.follow.FollowForUpdate +import fr.dcproject.component.follow.database.FollowConstitutionRepository +import fr.dcproject.component.follow.database.FollowForUpdate import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/notification/Notification.kt b/src/main/kotlin/fr/dcproject/component/notification/Notification.kt index 798ff52..ff8871c 100644 --- a/src/main/kotlin/fr/dcproject/component/notification/Notification.kt +++ b/src/main/kotlin/fr/dcproject/component/notification/Notification.kt @@ -8,7 +8,7 @@ import com.fasterxml.jackson.datatype.joda.JodaModule import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import fr.dcproject.common.entity.Entity -import fr.dcproject.component.article.ArticleForView +import fr.dcproject.component.article.database.ArticleForView import org.joda.time.DateTime import java.util.concurrent.atomic.AtomicInteger diff --git a/src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt b/src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt index e96ffed..09caa49 100644 --- a/src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt +++ b/src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt @@ -7,9 +7,9 @@ import com.rabbitmq.client.Consumer import com.rabbitmq.client.DefaultConsumer import com.rabbitmq.client.Envelope import fr.dcproject.common.entity.TargetRef -import fr.dcproject.component.follow.FollowArticleRepository -import fr.dcproject.component.follow.FollowConstitutionRepository -import fr.dcproject.component.follow.FollowForView +import fr.dcproject.component.follow.database.FollowArticleRepository +import fr.dcproject.component.follow.database.FollowConstitutionRepository +import fr.dcproject.component.follow.database.FollowForView import io.ktor.utils.io.errors.IOException import io.lettuce.core.RedisClient import io.lettuce.core.api.async.RedisAsyncCommands diff --git a/src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt b/src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt index 71511d0..f693636 100644 --- a/src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt +++ b/src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt @@ -6,11 +6,11 @@ import com.sendgrid.helpers.mail.objects.Email import fr.dcproject.common.email.Mailer import fr.dcproject.common.entity.EntityI import fr.dcproject.common.entity.TargetRef -import fr.dcproject.component.article.ArticleRepository -import fr.dcproject.component.article.ArticleWithTitleI -import fr.dcproject.component.citizen.CitizenCreatorI -import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.component.follow.FollowForView +import fr.dcproject.component.article.database.ArticleRepository +import fr.dcproject.component.article.database.ArticleWithTitleI +import fr.dcproject.component.citizen.database.CitizenCreatorI +import fr.dcproject.component.citizen.database.CitizenRepository +import fr.dcproject.component.follow.database.FollowForView import java.util.UUID class NotificationEmailSender( diff --git a/src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt b/src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt index 7ae0892..08e6e29 100644 --- a/src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt +++ b/src/main/kotlin/fr/dcproject/component/notification/NotificationsPush.kt @@ -2,7 +2,7 @@ package fr.dcproject.component.notification import com.fasterxml.jackson.core.JsonProcessingException import fr.dcproject.component.auth.citizen -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.citizen.database.CitizenI import io.ktor.http.cio.websocket.Frame import io.ktor.http.cio.websocket.Frame.Text import io.ktor.http.cio.websocket.readText diff --git a/src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt index fcb8091..95cc15a 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt @@ -1,5 +1,7 @@ package fr.dcproject.component.opinion +import fr.dcproject.component.opinion.database.OpinionChoiceRepository +import fr.dcproject.component.opinion.database.OpinionRepositoryArticle import org.koin.dsl.module val opinionKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt b/src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt index 68068fc..5f023a8 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt @@ -5,8 +5,8 @@ import fr.dcproject.common.entity.DeletedAt 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.component.citizen.database.CitizenI +import fr.dcproject.component.opinion.database.OpinionI class OpinionAccessControl : AccessControl() { diff --git a/src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt b/src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt index 157b3fb..0509aca 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt @@ -2,8 +2,8 @@ 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.component.citizen.database.CitizenI +import fr.dcproject.component.opinion.database.OpinionChoiceI class OpinionChoiceAccessControl : AccessControl() { fun canView(subjects: List, citizen: CitizenI?): AccessResponse = diff --git a/src/main/kotlin/fr/dcproject/component/opinion/entity/Opinion.kt b/src/main/kotlin/fr/dcproject/component/opinion/database/Opinion.kt similarity index 78% rename from src/main/kotlin/fr/dcproject/component/opinion/entity/Opinion.kt rename to src/main/kotlin/fr/dcproject/component/opinion/database/Opinion.kt index a5f5455..56864a7 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/entity/Opinion.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/database/Opinion.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.opinion.entity +package fr.dcproject.component.opinion.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.CreatedBy @@ -7,10 +7,10 @@ import fr.dcproject.common.entity.ExtraI import fr.dcproject.common.entity.HasTarget import fr.dcproject.common.entity.TargetI import fr.dcproject.common.entity.TargetRef -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenCreatorI -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenCreatorI +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef import java.util.UUID open class Opinion( diff --git a/src/main/kotlin/fr/dcproject/component/opinion/entity/OpinionChoice.kt b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionChoice.kt similarity index 91% rename from src/main/kotlin/fr/dcproject/component/opinion/entity/OpinionChoice.kt rename to src/main/kotlin/fr/dcproject/component/opinion/database/OpinionChoice.kt index ef22582..8a29995 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/entity/OpinionChoice.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionChoice.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.opinion.entity +package fr.dcproject.component.opinion.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.DeletedAt diff --git a/src/main/kotlin/fr/dcproject/component/opinion/OpinionRepository.kt b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionRepository.kt similarity index 92% rename from src/main/kotlin/fr/dcproject/component/opinion/OpinionRepository.kt rename to src/main/kotlin/fr/dcproject/component/opinion/database/OpinionRepository.kt index 5f9d8b7..132a284 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/OpinionRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/database/OpinionRepository.kt @@ -1,18 +1,17 @@ -package fr.dcproject.component.opinion +package fr.dcproject.component.opinion.database import com.fasterxml.jackson.core.type.TypeReference import fr.dcproject.common.entity.TargetRef -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.opinion.entity.OpinionForUpdate +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.CitizenI import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI import net.pearx.kasechange.toSnakeCase import java.util.UUID -import fr.dcproject.component.citizen.Citizen as CitizenEntity -import fr.dcproject.component.opinion.entity.Opinion as OpinionEntity -import fr.dcproject.component.opinion.entity.OpinionChoice as OpinionChoiceEntity +import fr.dcproject.component.citizen.database.Citizen as CitizenEntity +import fr.dcproject.component.opinion.database.Opinion as OpinionEntity +import fr.dcproject.component.opinion.database.OpinionChoice as OpinionChoiceEntity open class OpinionChoiceRepository(override val requester: Requester) : RepositoryI { /** diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt index 7aaf46f..9f7f6b7 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt @@ -2,11 +2,11 @@ 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.article.database.ArticleRef import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.opinion.OpinionAccessControl -import fr.dcproject.component.opinion.entity.Opinion +import fr.dcproject.component.opinion.database.Opinion import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location @@ -14,7 +14,7 @@ import io.ktor.locations.get import io.ktor.response.respond import io.ktor.routing.Route import java.util.UUID -import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository +import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository @KtorExperimentalLocationsAPI object GetCitizenOpinions { diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt index 91c3bfd..e63cca0 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt @@ -4,9 +4,9 @@ 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 +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.opinion.OpinionAccessControl -import fr.dcproject.component.opinion.entity.Opinion +import fr.dcproject.component.opinion.database.Opinion import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI import fr.postgresjson.connexion.Paginated @@ -17,7 +17,7 @@ import io.ktor.locations.get import io.ktor.response.respond import io.ktor.routing.Route import java.util.UUID -import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository +import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository @KtorExperimentalLocationsAPI object GetMyOpinionsArticle { diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt index f5d9205..f7f495c 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt @@ -3,8 +3,8 @@ 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.component.opinion.database.OpinionChoiceRef +import fr.dcproject.component.opinion.database.OpinionChoiceRepository import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt index 42e7212..6e8f698 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt @@ -3,7 +3,7 @@ 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.database.OpinionChoiceRepository import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt b/src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt index 1c1259d..cce198a 100644 --- a/src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt @@ -3,12 +3,12 @@ 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.article.database.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.component.opinion.database.OpinionChoiceRef +import fr.dcproject.component.opinion.database.OpinionForUpdate import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI @@ -17,7 +17,7 @@ import io.ktor.locations.put import io.ktor.response.respond import io.ktor.routing.Route import java.util.UUID -import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository +import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository @KtorExperimentalLocationsAPI object OpinionArticle { diff --git a/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt index d32b352..dfc83fa 100644 --- a/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt @@ -1,8 +1,8 @@ package fr.dcproject.component.views import fr.dcproject.application.Configuration -import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.article.ArticleViewManager +import fr.dcproject.component.article.database.ArticleForView import org.apache.http.HttpHost import org.elasticsearch.client.RestClient import org.koin.dsl.module diff --git a/src/main/kotlin/fr/dcproject/component/views/ViewManager.kt b/src/main/kotlin/fr/dcproject/component/views/ViewManager.kt index 7bfd817..dd89700 100644 --- a/src/main/kotlin/fr/dcproject/component/views/ViewManager.kt +++ b/src/main/kotlin/fr/dcproject/component/views/ViewManager.kt @@ -1,6 +1,6 @@ package fr.dcproject.component.views -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.citizen.database.CitizenI import fr.dcproject.component.views.entity.ViewAggregation import org.elasticsearch.client.Response import org.joda.time.DateTime diff --git a/src/main/kotlin/fr/dcproject/component/vote/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/vote/KoinModule.kt index 94a7050..d205327 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/KoinModule.kt @@ -1,5 +1,9 @@ package fr.dcproject.component.vote +import fr.dcproject.component.vote.database.VoteArticleRepository +import fr.dcproject.component.vote.database.VoteCommentRepository +import fr.dcproject.component.vote.database.VoteConstitutionRepository +import fr.dcproject.component.vote.database.VoteRepository import org.koin.dsl.module val voteKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/vote/VoteAccessControl.kt b/src/main/kotlin/fr/dcproject/component/vote/VoteAccessControl.kt index 4dc271e..214c2ca 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/VoteAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/VoteAccessControl.kt @@ -4,9 +4,9 @@ import fr.dcproject.common.entity.DeletedAt 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.component.vote.entity.VoteForView as VoteEntity +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.vote.database.VoteForUpdateI +import fr.dcproject.component.vote.database.VoteForView as VoteEntity class VoteAccessControl : AccessControl() { fun canCreate(subject: VoteForUpdateI, citizen: CitizenI?): AccessResponse where S : DeletedAt, S : TargetI = when { diff --git a/src/main/kotlin/fr/dcproject/component/vote/entity/VoteForView.kt b/src/main/kotlin/fr/dcproject/component/vote/database/Vote.kt similarity index 85% rename from src/main/kotlin/fr/dcproject/component/vote/entity/VoteForView.kt rename to src/main/kotlin/fr/dcproject/component/vote/database/Vote.kt index 6835d0e..c27e1e4 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/entity/VoteForView.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/database/Vote.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.vote.entity +package fr.dcproject.component.vote.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.CreatedBy @@ -7,9 +7,9 @@ import fr.dcproject.common.entity.ExtraI import fr.dcproject.common.entity.HasTarget import fr.dcproject.common.entity.TargetI import fr.dcproject.common.entity.UpdatedAt -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenCreatorI -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenCreatorI +import fr.dcproject.component.citizen.database.CitizenI import java.util.UUID class VoteForView( diff --git a/src/main/kotlin/fr/dcproject/component/vote/VoteRepositoryAbs.kt b/src/main/kotlin/fr/dcproject/component/vote/database/VoteRepositoryAbs.kt similarity index 89% rename from src/main/kotlin/fr/dcproject/component/vote/VoteRepositoryAbs.kt rename to src/main/kotlin/fr/dcproject/component/vote/database/VoteRepositoryAbs.kt index 674c7a0..df31d9c 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/VoteRepositoryAbs.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/database/VoteRepositoryAbs.kt @@ -1,21 +1,20 @@ -package fr.dcproject.component.vote +package fr.dcproject.component.vote.database import com.fasterxml.jackson.core.type.TypeReference import fr.dcproject.common.entity.TargetI import fr.dcproject.common.entity.TargetRef -import fr.dcproject.component.article.ArticleForView -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.comment.generic.CommentForView -import fr.dcproject.component.constitution.Constitution +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef +import fr.dcproject.component.comment.generic.database.CommentForView +import fr.dcproject.component.constitution.database.Constitution import fr.dcproject.component.vote.entity.VoteAggregation -import fr.dcproject.component.vote.entity.VoteForUpdateI import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI import java.util.UUID -import fr.dcproject.component.citizen.Citizen as CitizenEntity -import fr.dcproject.component.vote.entity.VoteForView as VoteEntity +import fr.dcproject.component.citizen.database.Citizen as CitizenEntity +import fr.dcproject.component.vote.database.VoteForView as VoteEntity abstract class VoteRepositoryAbs(override var requester: Requester) : RepositoryI { fun vote(vote: VoteForUpdateI, anonymous: Boolean? = null): VoteAggregation { diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotes.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotes.kt index 1a4bd30..ae62fca 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotes.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotes.kt @@ -3,9 +3,9 @@ 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.citizen.database.CitizenRef import fr.dcproject.component.vote.VoteAccessControl -import fr.dcproject.component.vote.VoteRepository +import fr.dcproject.component.vote.database.VoteRepository import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotesOnArticle.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotesOnArticle.kt index b7c5500..302e1b5 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotesOnArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/routes/GetCitizenVotesOnArticle.kt @@ -2,9 +2,9 @@ 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.citizen.database.CitizenRef import fr.dcproject.component.vote.VoteAccessControl -import fr.dcproject.component.vote.VoteArticleRepository +import fr.dcproject.component.vote.database.VoteArticleRepository import fr.dcproject.routes.PaginatedRequest import fr.dcproject.routes.PaginatedRequestI import io.ktor.application.call diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnArticle.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnArticle.kt index d06b62d..c490eba 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnArticle.kt @@ -2,13 +2,13 @@ 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.article.database.ArticleRef +import fr.dcproject.component.article.database.ArticleRepository import fr.dcproject.component.auth.citizen 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.component.vote.database.VoteArticleRepository +import fr.dcproject.component.vote.database.VoteForUpdate import io.ktor.application.call import io.ktor.features.NotFoundException import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnComment.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnComment.kt index f8c85f5..70e2240 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnComment.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/routes/PutVoteOnComment.kt @@ -4,10 +4,10 @@ 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.comment.generic.database.CommentRepository import fr.dcproject.component.vote.VoteAccessControl -import fr.dcproject.component.vote.VoteCommentRepository -import fr.dcproject.component.vote.entity.VoteForUpdate +import fr.dcproject.component.vote.database.VoteCommentRepository +import fr.dcproject.component.vote.database.VoteForUpdate import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/vote/routes/VoteConstitution.kt b/src/main/kotlin/fr/dcproject/component/vote/routes/VoteConstitution.kt index d2cd8a9..3b58bf8 100644 --- a/src/main/kotlin/fr/dcproject/component/vote/routes/VoteConstitution.kt +++ b/src/main/kotlin/fr/dcproject/component/vote/routes/VoteConstitution.kt @@ -4,11 +4,11 @@ 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 -import fr.dcproject.component.constitution.ConstitutionRepository +import fr.dcproject.component.constitution.database.ConstitutionRef +import fr.dcproject.component.constitution.database.ConstitutionRepository import fr.dcproject.component.vote.VoteAccessControl -import fr.dcproject.component.vote.VoteConstitutionRepository -import fr.dcproject.component.vote.entity.VoteForUpdate +import fr.dcproject.component.vote.database.VoteConstitutionRepository +import fr.dcproject.component.vote.database.VoteForUpdate import fr.dcproject.component.vote.routes.VoteConstitution.ConstitutionVoteRequest.Input import io.ktor.application.call import io.ktor.features.NotFoundException diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/workgroup/KoinModule.kt index d905ac9..bf43c9d 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/KoinModule.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/KoinModule.kt @@ -1,5 +1,6 @@ package fr.dcproject.component.workgroup +import fr.dcproject.component.workgroup.database.WorkgroupRepository import org.koin.dsl.module val workgroupKoinModule = module { diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupAccessControl.kt b/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupAccessControl.kt index 15b2732..f2705c0 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupAccessControl.kt @@ -2,8 +2,10 @@ 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.component.citizen.database.CitizenI +import fr.dcproject.component.workgroup.database.WorkgroupI +import fr.dcproject.component.workgroup.database.WorkgroupWithAuthI +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member.Role class WorkgroupAccessControl : AccessControl() { fun canCreate(subject: WorkgroupI, citizen: CitizenI?): AccessResponse { diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupForView.kt b/src/main/kotlin/fr/dcproject/component/workgroup/database/Workgroup.kt similarity index 89% rename from src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupForView.kt rename to src/main/kotlin/fr/dcproject/component/workgroup/database/Workgroup.kt index 641b678..9e3a4ed 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupForView.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/database/Workgroup.kt @@ -1,4 +1,4 @@ -package fr.dcproject.component.workgroup +package fr.dcproject.component.workgroup.database import fr.dcproject.common.entity.CreatedAt import fr.dcproject.common.entity.CreatedBy @@ -6,12 +6,12 @@ import fr.dcproject.common.entity.DeletedAt import fr.dcproject.common.entity.Entity import fr.dcproject.common.entity.EntityI import fr.dcproject.common.entity.UpdatedAt -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.citizen.CitizenCreatorI -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenWithUserI -import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member -import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member.Role +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.CitizenCreatorI +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenWithUserI +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member.Role import org.joda.time.DateTime import java.util.UUID diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupRepository.kt b/src/main/kotlin/fr/dcproject/component/workgroup/database/WorkgroupRepository.kt similarity index 88% rename from src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupRepository.kt rename to src/main/kotlin/fr/dcproject/component/workgroup/database/WorkgroupRepository.kt index 7d6294a..1caba1a 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/WorkgroupRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/database/WorkgroupRepository.kt @@ -1,9 +1,9 @@ -package fr.dcproject.component.workgroup +package fr.dcproject.component.workgroup.database -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.entity.Parameter @@ -12,7 +12,7 @@ import fr.postgresjson.repository.RepositoryI.Direction import fr.postgresjson.serializer.serialize import net.pearx.kasechange.toSnakeCase import java.util.UUID -import fr.dcproject.component.workgroup.WorkgroupForView as WorkgroupEntity +import fr.dcproject.component.workgroup.database.WorkgroupForView as WorkgroupEntity class WorkgroupRepository(override var requester: Requester) : RepositoryI { fun findById(id: UUID): WorkgroupEntity? { diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/CreateWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/CreateWorkgroup.kt index fe5465e..1b413b6 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/CreateWorkgroup.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/CreateWorkgroup.kt @@ -5,8 +5,8 @@ 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.WorkgroupForUpdate -import fr.dcproject.component.workgroup.WorkgroupRepository +import fr.dcproject.component.workgroup.database.WorkgroupForUpdate +import fr.dcproject.component.workgroup.database.WorkgroupRepository import fr.dcproject.component.workgroup.routes.CreateWorkgroup.PostWorkgroupRequest.Input import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/DeleteWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/DeleteWorkgroup.kt index 296b108..17fbdcd 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/DeleteWorkgroup.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/DeleteWorkgroup.kt @@ -3,7 +3,7 @@ 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.component.workgroup.database.WorkgroupRepository import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/EditWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/EditWorkgroup.kt index 67901b0..80154e4 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/EditWorkgroup.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/EditWorkgroup.kt @@ -4,8 +4,8 @@ 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.WorkgroupForUpdate -import fr.dcproject.component.workgroup.WorkgroupRepository +import fr.dcproject.component.workgroup.database.WorkgroupForUpdate +import fr.dcproject.component.workgroup.database.WorkgroupRepository import fr.dcproject.component.workgroup.routes.EditWorkgroup.PutWorkgroupRequest.Input import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroup.kt index 8063be9..b229e78 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroup.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroup.kt @@ -3,8 +3,8 @@ 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.component.workgroup.database.WorkgroupRef +import fr.dcproject.component.workgroup.database.WorkgroupRepository import io.ktor.application.call import io.ktor.http.HttpStatusCode import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroups.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroups.kt index 49cd22b..fe7ebe1 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroups.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/GetWorkgroups.kt @@ -4,7 +4,7 @@ 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.component.workgroup.database.WorkgroupRepository import fr.postgresjson.repository.RepositoryI import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/AddMemberToWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/AddMemberToWorkgroup.kt index 80227c4..546491f 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/AddMemberToWorkgroup.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/AddMemberToWorkgroup.kt @@ -3,10 +3,10 @@ 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.citizen.database.CitizenRef import fr.dcproject.component.workgroup.WorkgroupAccessControl -import fr.dcproject.component.workgroup.WorkgroupRepository -import fr.dcproject.component.workgroup.WorkgroupWithMembersI +import fr.dcproject.component.workgroup.database.WorkgroupRepository +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt index 0fb6a16..48883e8 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt @@ -3,10 +3,10 @@ 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.citizen.database.CitizenRef import fr.dcproject.component.workgroup.WorkgroupAccessControl -import fr.dcproject.component.workgroup.WorkgroupRepository -import fr.dcproject.component.workgroup.WorkgroupWithMembersI +import fr.dcproject.component.workgroup.database.WorkgroupRepository +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt index 9787ddc..02c0994 100644 --- a/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt +++ b/src/main/kotlin/fr/dcproject/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt @@ -3,10 +3,10 @@ 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.citizen.database.CitizenRef import fr.dcproject.component.workgroup.WorkgroupAccessControl -import fr.dcproject.component.workgroup.WorkgroupRepository -import fr.dcproject.component.workgroup.WorkgroupWithMembersI +import fr.dcproject.component.workgroup.database.WorkgroupRepository +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI import io.ktor.application.ApplicationCall import io.ktor.application.call import io.ktor.http.HttpStatusCode diff --git a/src/test/kotlin/functional/NotificationConsumerTest.kt b/src/test/kotlin/functional/NotificationConsumerTest.kt index a56af1e..20824c1 100644 --- a/src/test/kotlin/functional/NotificationConsumerTest.kt +++ b/src/test/kotlin/functional/NotificationConsumerTest.kt @@ -3,14 +3,14 @@ package functional import com.rabbitmq.client.ConnectionFactory import com.rabbitmq.client.ShutdownSignalException import fr.dcproject.application.Configuration -import fr.dcproject.component.article.ArticleForView -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.auth.UserCreator -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.follow.FollowArticleRepository -import fr.dcproject.component.follow.FollowForView +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.auth.database.UserCreator +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef +import fr.dcproject.component.follow.database.FollowArticleRepository +import fr.dcproject.component.follow.database.FollowForView import fr.dcproject.component.notification.ArticleUpdateNotification import fr.dcproject.component.notification.NotificationConsumer import fr.dcproject.component.notification.NotificationEmailSender diff --git a/src/test/kotlin/functional/NotificationsPushTest.kt b/src/test/kotlin/functional/NotificationsPushTest.kt index 97a9c9f..8eb61af 100644 --- a/src/test/kotlin/functional/NotificationsPushTest.kt +++ b/src/test/kotlin/functional/NotificationsPushTest.kt @@ -2,8 +2,8 @@ package functional import com.rabbitmq.client.ConnectionFactory import fr.dcproject.application.Configuration -import fr.dcproject.component.article.ArticleForView -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.notification.ArticleUpdateNotification import fr.dcproject.component.notification.Notification import fr.dcproject.component.notification.NotificationsPush diff --git a/src/test/kotlin/functional/ViewTest.kt b/src/test/kotlin/functional/ViewTest.kt index 23d1e45..0d5018e 100644 --- a/src/test/kotlin/functional/ViewTest.kt +++ b/src/test/kotlin/functional/ViewTest.kt @@ -2,9 +2,9 @@ package functional import fr.dcproject.application.Env.TEST import fr.dcproject.application.module -import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.article.ArticleViewManager -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.citizen.database.CitizenRef import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.server.testing.withTestApplication import io.ktor.util.KtorExperimentalAPI diff --git a/src/test/kotlin/integration/Comment articles routes.kt b/src/test/kotlin/integration/Comment articles routes.kt index 31686bf..182c0e6 100644 --- a/src/test/kotlin/integration/Comment articles routes.kt +++ b/src/test/kotlin/integration/Comment articles routes.kt @@ -1,6 +1,6 @@ package integration -import fr.dcproject.component.citizen.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenI.Name import integration.steps.`And the response should contain` import integration.steps.`And the response should not be null` import integration.steps.`Then the response should be` diff --git a/src/test/kotlin/integration/Comment constitutions routes.kt b/src/test/kotlin/integration/Comment constitutions routes.kt index 5cdd1dc..8416dfa 100644 --- a/src/test/kotlin/integration/Comment constitutions routes.kt +++ b/src/test/kotlin/integration/Comment constitutions routes.kt @@ -1,6 +1,6 @@ package integration -import fr.dcproject.component.citizen.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenI.Name import integration.steps.`And the response should contain list` import integration.steps.`And the response should contain` import integration.steps.`And the response should not be null` diff --git a/src/test/kotlin/integration/Opinion routes.kt b/src/test/kotlin/integration/Opinion routes.kt index 959c2cc..423db3c 100644 --- a/src/test/kotlin/integration/Opinion routes.kt +++ b/src/test/kotlin/integration/Opinion routes.kt @@ -1,6 +1,6 @@ package integration -import fr.dcproject.component.citizen.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenI.Name import integration.steps.`And the response should contain list` import integration.steps.`And the response should contain` import integration.steps.`Then the response should be` diff --git a/src/test/kotlin/integration/Vote routes.kt b/src/test/kotlin/integration/Vote routes.kt index a0d9197..c163f60 100644 --- a/src/test/kotlin/integration/Vote routes.kt +++ b/src/test/kotlin/integration/Vote routes.kt @@ -1,6 +1,6 @@ package integration -import fr.dcproject.component.citizen.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenI.Name import integration.steps.`And the response should contain` import integration.steps.`Then the response should be` import integration.steps.`when`.`When I send a GET request` diff --git a/src/test/kotlin/integration/Workgroup routes.kt b/src/test/kotlin/integration/Workgroup routes.kt index aa1101c..4e80932 100644 --- a/src/test/kotlin/integration/Workgroup routes.kt +++ b/src/test/kotlin/integration/Workgroup routes.kt @@ -1,6 +1,6 @@ package integration -import fr.dcproject.component.citizen.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenI.Name import integration.steps.`And the response should be null` import integration.steps.`And the response should contain list` import integration.steps.`And the response should contain` diff --git a/src/test/kotlin/integration/steps/given/Article.kt b/src/test/kotlin/integration/steps/given/Article.kt index a151590..a9d978d 100644 --- a/src/test/kotlin/integration/steps/given/Article.kt +++ b/src/test/kotlin/integration/steps/given/Article.kt @@ -2,11 +2,11 @@ package integration.steps.given import com.thedeanda.lorem.LoremIpsum import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.article.ArticleForUpdate -import fr.dcproject.component.article.ArticleForView -import fr.dcproject.component.article.ArticleRepository -import fr.dcproject.component.citizen.CitizenI.Name -import fr.dcproject.component.workgroup.WorkgroupRef +import fr.dcproject.component.article.database.ArticleForUpdate +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleRepository +import fr.dcproject.component.citizen.database.CitizenI.Name +import fr.dcproject.component.workgroup.database.WorkgroupRef import io.ktor.server.testing.TestApplicationEngine import org.koin.core.context.GlobalContext import java.util.UUID diff --git a/src/test/kotlin/integration/steps/given/Auth.kt b/src/test/kotlin/integration/steps/given/Auth.kt index e873ad0..d639f81 100644 --- a/src/test/kotlin/integration/steps/given/Auth.kt +++ b/src/test/kotlin/integration/steps/given/Auth.kt @@ -2,8 +2,8 @@ package integration.steps.given import com.auth0.jwt.JWT import fr.dcproject.component.auth.jwt.JwtConfig -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenRepository +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenRepository import io.ktor.http.HttpHeaders import io.ktor.server.testing.TestApplicationRequest import org.koin.core.context.GlobalContext diff --git a/src/test/kotlin/integration/steps/given/Citizen.kt b/src/test/kotlin/integration/steps/given/Citizen.kt index ca6d74a..9d81861 100644 --- a/src/test/kotlin/integration/steps/given/Citizen.kt +++ b/src/test/kotlin/integration/steps/given/Citizen.kt @@ -1,11 +1,11 @@ package integration.steps.given import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.auth.UserForCreate -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenForCreate -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRepository +import fr.dcproject.component.auth.database.UserForCreate +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenForCreate +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRepository import io.ktor.server.testing.TestApplicationEngine import org.joda.time.DateTime import org.koin.core.context.GlobalContext diff --git a/src/test/kotlin/integration/steps/given/Comment.kt b/src/test/kotlin/integration/steps/given/Comment.kt index 60ba7a2..7305422 100644 --- a/src/test/kotlin/integration/steps/given/Comment.kt +++ b/src/test/kotlin/integration/steps/given/Comment.kt @@ -3,13 +3,13 @@ package integration.steps.given import com.thedeanda.lorem.LoremIpsum import fr.dcproject.common.entity.TargetI import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.article.ArticleRepository -import fr.dcproject.component.citizen.CitizenI.Name -import fr.dcproject.component.comment.generic.CommentForUpdate -import fr.dcproject.component.comment.generic.CommentRepository -import fr.dcproject.component.constitution.ConstitutionRef -import fr.dcproject.component.constitution.ConstitutionRepository +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.article.database.ArticleRepository +import fr.dcproject.component.citizen.database.CitizenI.Name +import fr.dcproject.component.comment.generic.database.CommentForUpdate +import fr.dcproject.component.comment.generic.database.CommentRepository +import fr.dcproject.component.constitution.database.ConstitutionRef +import fr.dcproject.component.constitution.database.ConstitutionRepository import io.ktor.server.testing.TestApplicationEngine import org.koin.core.context.GlobalContext import java.util.UUID diff --git a/src/test/kotlin/integration/steps/given/Constitution.kt b/src/test/kotlin/integration/steps/given/Constitution.kt index 4280894..b46ff4d 100644 --- a/src/test/kotlin/integration/steps/given/Constitution.kt +++ b/src/test/kotlin/integration/steps/given/Constitution.kt @@ -2,13 +2,13 @@ package integration.steps.given import com.thedeanda.lorem.LoremIpsum import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.CitizenI.Name -import fr.dcproject.component.citizen.CitizenWithUserI -import fr.dcproject.component.constitution.Constitution -import fr.dcproject.component.constitution.ConstitutionRepository -import fr.dcproject.component.constitution.ConstitutionSimple -import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenWithUserI +import fr.dcproject.component.constitution.database.Constitution +import fr.dcproject.component.constitution.database.ConstitutionRepository +import fr.dcproject.component.constitution.database.ConstitutionSimple +import fr.dcproject.component.constitution.database.ConstitutionSimple.TitleSimple import io.ktor.server.testing.TestApplicationEngine import org.koin.core.context.GlobalContext import java.util.UUID diff --git a/src/test/kotlin/integration/steps/given/Follow.kt b/src/test/kotlin/integration/steps/given/Follow.kt index 46b7c3a..084f09d 100644 --- a/src/test/kotlin/integration/steps/given/Follow.kt +++ b/src/test/kotlin/integration/steps/given/Follow.kt @@ -1,14 +1,14 @@ package integration.steps.given import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.component.constitution.ConstitutionRef -import fr.dcproject.component.follow.FollowArticleRepository -import fr.dcproject.component.follow.FollowConstitutionRepository -import fr.dcproject.component.follow.FollowForUpdate +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenRef +import fr.dcproject.component.citizen.database.CitizenRepository +import fr.dcproject.component.constitution.database.ConstitutionRef +import fr.dcproject.component.follow.database.FollowArticleRepository +import fr.dcproject.component.follow.database.FollowConstitutionRepository +import fr.dcproject.component.follow.database.FollowForUpdate import io.ktor.server.testing.TestApplicationEngine import org.koin.core.context.GlobalContext diff --git a/src/test/kotlin/integration/steps/given/Opinion.kt b/src/test/kotlin/integration/steps/given/Opinion.kt index e55f6cb..20338ba 100644 --- a/src/test/kotlin/integration/steps/given/Opinion.kt +++ b/src/test/kotlin/integration/steps/given/Opinion.kt @@ -1,13 +1,13 @@ package integration.steps.given import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.article.ArticleRef -import fr.dcproject.component.citizen.CitizenI.Name -import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.component.opinion.OpinionChoiceRepository -import fr.dcproject.component.opinion.OpinionRepositoryArticle -import fr.dcproject.component.opinion.entity.OpinionChoice -import fr.dcproject.component.opinion.entity.OpinionForUpdate +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.citizen.database.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenRepository +import fr.dcproject.component.opinion.database.OpinionChoice +import fr.dcproject.component.opinion.database.OpinionChoiceRepository +import fr.dcproject.component.opinion.database.OpinionForUpdate +import fr.dcproject.component.opinion.database.OpinionRepositoryArticle import io.ktor.server.testing.TestApplicationEngine import org.koin.core.context.GlobalContext import java.util.UUID diff --git a/src/test/kotlin/integration/steps/given/Vote.kt b/src/test/kotlin/integration/steps/given/Vote.kt index 8a52963..c3f65a1 100644 --- a/src/test/kotlin/integration/steps/given/Vote.kt +++ b/src/test/kotlin/integration/steps/given/Vote.kt @@ -1,12 +1,12 @@ package integration.steps.given import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.article.ArticleRepository -import fr.dcproject.component.citizen.CitizenI.Name -import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.component.vote.VoteArticleRepository +import fr.dcproject.component.article.database.ArticleRepository +import fr.dcproject.component.citizen.database.CitizenI.Name +import fr.dcproject.component.citizen.database.CitizenRepository +import fr.dcproject.component.vote.database.VoteArticleRepository +import fr.dcproject.component.vote.database.VoteForUpdate import fr.dcproject.component.vote.entity.VoteAggregation -import fr.dcproject.component.vote.entity.VoteForUpdate import io.ktor.server.testing.TestApplicationEngine import org.koin.core.context.GlobalContext import java.util.UUID diff --git a/src/test/kotlin/integration/steps/given/Workgroup.kt b/src/test/kotlin/integration/steps/given/Workgroup.kt index 3018552..33548c7 100644 --- a/src/test/kotlin/integration/steps/given/Workgroup.kt +++ b/src/test/kotlin/integration/steps/given/Workgroup.kt @@ -1,17 +1,17 @@ package integration.steps.given import fr.dcproject.common.utils.toUUID -import fr.dcproject.component.auth.UserForCreate -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenForCreate -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.component.workgroup.WorkgroupForUpdate -import fr.dcproject.component.workgroup.WorkgroupForView -import fr.dcproject.component.workgroup.WorkgroupRepository -import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member -import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member.Role.MASTER +import fr.dcproject.component.auth.database.UserForCreate +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenForCreate +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRepository +import fr.dcproject.component.workgroup.database.WorkgroupForUpdate +import fr.dcproject.component.workgroup.database.WorkgroupForView +import fr.dcproject.component.workgroup.database.WorkgroupRepository +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI.Member.Role.MASTER import io.ktor.server.testing.TestApplicationEngine import org.joda.time.DateTime import org.koin.core.context.GlobalContext diff --git a/src/test/kotlin/unit/security/Article Access Control.kt b/src/test/kotlin/unit/security/Article Access Control.kt index 6a65b0d..799422f 100644 --- a/src/test/kotlin/unit/security/Article Access Control.kt +++ b/src/test/kotlin/unit/security/Article Access Control.kt @@ -3,11 +3,11 @@ 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.component.article.database.ArticleForView +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.CitizenCart +import fr.dcproject.component.citizen.database.CitizenI import fr.postgresjson.connexion.Paginated import io.mockk.every import io.mockk.mockk @@ -20,7 +20,7 @@ import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.parallel.Execution import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT import java.util.UUID -import fr.dcproject.component.article.ArticleRepository as ArticleRepo +import fr.dcproject.component.article.database.ArticleRepository as ArticleRepo @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) diff --git a/src/test/kotlin/unit/security/Citizen Access Control.kt b/src/test/kotlin/unit/security/Citizen Access Control.kt index 871400b..f735b6f 100644 --- a/src/test/kotlin/unit/security/Citizen Access Control.kt +++ b/src/test/kotlin/unit/security/Citizen Access Control.kt @@ -2,11 +2,11 @@ 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.auth.database.User +import fr.dcproject.component.auth.database.UserI import fr.dcproject.component.citizen.CitizenAccessControl -import fr.dcproject.component.citizen.CitizenCart -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.citizen.database.CitizenCart +import fr.dcproject.component.citizen.database.CitizenI import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/unit/security/Comment Access Control.kt b/src/test/kotlin/unit/security/Comment Access Control.kt index a633c16..6df3760 100644 --- a/src/test/kotlin/unit/security/Comment Access Control.kt +++ b/src/test/kotlin/unit/security/Comment Access Control.kt @@ -2,16 +2,16 @@ 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 -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenCart -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleRef +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenCart +import fr.dcproject.component.citizen.database.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.component.comment.generic.database.CommentForUpdate +import fr.dcproject.component.comment.generic.database.CommentForView import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/unit/security/Follow Access Control.kt b/src/test/kotlin/unit/security/Follow Access Control.kt index 8d0aa36..d6f5dfb 100644 --- a/src/test/kotlin/unit/security/Follow Access Control.kt +++ b/src/test/kotlin/unit/security/Follow Access Control.kt @@ -2,16 +2,16 @@ 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.UserCreator -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenCart -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserCreator +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenCart +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenI import fr.dcproject.component.follow.FollowAccessControl -import fr.dcproject.component.follow.FollowForView +import fr.dcproject.component.follow.database.FollowForView import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/unit/security/Opinion Access Control.kt b/src/test/kotlin/unit/security/Opinion Access Control.kt index 03b90bd..bee6fde 100644 --- a/src/test/kotlin/unit/security/Opinion Access Control.kt +++ b/src/test/kotlin/unit/security/Opinion Access Control.kt @@ -2,17 +2,17 @@ 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.UserCreator -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.citizen.CitizenCart -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserCreator +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.CitizenCart +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.opinion.OpinionAccessControl -import fr.dcproject.component.opinion.entity.Opinion -import fr.dcproject.component.opinion.entity.OpinionChoice +import fr.dcproject.component.opinion.database.Opinion +import fr.dcproject.component.opinion.database.OpinionChoice import org.amshove.kluent.`should be` import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tags diff --git a/src/test/kotlin/unit/security/OpinionChoice Access Control.kt b/src/test/kotlin/unit/security/OpinionChoice Access Control.kt index c193996..5c1b78a 100644 --- a/src/test/kotlin/unit/security/OpinionChoice Access Control.kt +++ b/src/test/kotlin/unit/security/OpinionChoice Access Control.kt @@ -1,9 +1,9 @@ package unit.security import fr.dcproject.common.security.AccessDecision.GRANTED -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.opinion.OpinionChoiceAccessControl -import fr.dcproject.component.opinion.entity.OpinionChoice +import fr.dcproject.component.opinion.database.OpinionChoice import org.amshove.kluent.`should be` import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tags diff --git a/src/test/kotlin/unit/security/Vote Access Control.kt b/src/test/kotlin/unit/security/Vote Access Control.kt index 925e446..d451e9c 100644 --- a/src/test/kotlin/unit/security/Vote Access Control.kt +++ b/src/test/kotlin/unit/security/Vote Access Control.kt @@ -2,16 +2,16 @@ 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.UserCreator -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.citizen.Citizen -import fr.dcproject.component.citizen.CitizenCart -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenI +import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.auth.database.User +import fr.dcproject.component.auth.database.UserCreator +import fr.dcproject.component.auth.database.UserI +import fr.dcproject.component.citizen.database.Citizen +import fr.dcproject.component.citizen.database.CitizenCart +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenI import fr.dcproject.component.vote.VoteAccessControl -import fr.dcproject.component.vote.entity.VoteForUpdate +import fr.dcproject.component.vote.database.VoteForUpdate import org.amshove.kluent.`should be` import org.joda.time.DateTime import org.junit.jupiter.api.Tag @@ -21,7 +21,7 @@ import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.parallel.Execution import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT import java.util.UUID -import fr.dcproject.component.vote.entity.VoteForView +import fr.dcproject.component.vote.database.VoteForView @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT) diff --git a/src/test/kotlin/unit/security/Workgroup Access Control.kt b/src/test/kotlin/unit/security/Workgroup Access Control.kt index 6634b2d..aedc0ae 100644 --- a/src/test/kotlin/unit/security/Workgroup Access Control.kt +++ b/src/test/kotlin/unit/security/Workgroup Access Control.kt @@ -2,15 +2,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.UserCreator -import fr.dcproject.component.auth.UserI -import fr.dcproject.component.citizen.CitizenCart -import fr.dcproject.component.citizen.CitizenCreator -import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.citizen.CitizenRef +import fr.dcproject.component.auth.database.UserCreator +import fr.dcproject.component.citizen.database.CitizenCreator +import fr.dcproject.component.citizen.database.CitizenI +import fr.dcproject.component.citizen.database.CitizenRef import fr.dcproject.component.workgroup.WorkgroupAccessControl -import fr.dcproject.component.workgroup.WorkgroupWithMembersI +import fr.dcproject.component.workgroup.database.WorkgroupWithMembersI import org.amshove.kluent.`should be` import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tags @@ -19,7 +16,7 @@ import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.parallel.Execution import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT import java.util.UUID -import fr.dcproject.component.workgroup.WorkgroupForView as WorkgroupEntity +import fr.dcproject.component.workgroup.database.WorkgroupForView as WorkgroupEntity @TestInstance(TestInstance.Lifecycle.PER_CLASS) @Execution(CONCURRENT)