From 81e14f1a843aafc99c8a5f5febfa4bb8143dd3bd Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Sat, 23 Jan 2021 22:28:48 +0100 Subject: [PATCH] Move some interface to common package --- src/main/kotlin/{ => common}/dto/CreatedAt.kt | 2 +- .../kotlin/{ => common}/dto/Versionable.kt | 2 +- .../kotlin/{ => common}/entity/CreatedBy.kt | 2 +- .../kotlin/{ => common}/entity/EntityI.kt | 2 +- src/main/kotlin/{ => common}/entity/Extra.kt | 2 +- .../kotlin/{ => common}/entity/Versionable.kt | 2 +- .../request}/PaginatedRequest.kt | 0 src/main/kotlin/component/article/Article.kt | 8 ++-- .../component/article/ArticleAccessControl.kt | 4 +- .../component/article/ArticleViewManager.kt | 2 +- .../component/article/routes/GetOneArticle.kt | 43 +++++++++---------- .../article/CommentArticleRepository.kt | 2 +- .../component/comment/generic/Comment.kt | 10 ++--- .../comment/generic/CommentAccessControl.kt | 2 +- .../comment/generic/CommentRepository.kt | 4 +- .../component/constitution/Constitution.kt | 4 +- src/main/kotlin/component/follow/Follow.kt | 6 +-- .../component/follow/FollowRepository.kt | 2 +- .../component/opinion/OpinionAccessControl.kt | 2 +- .../component/opinion/OpinionRepository.kt | 2 +- .../component/opinion/entity/Opinion.kt | 8 ++-- .../component/vote/VoteAccessControl.kt | 2 +- .../component/vote/VoteRepositoryAbs.kt | 4 +- src/main/kotlin/component/vote/entity/Vote.kt | 6 +-- src/main/kotlin/event/EventNotification.kt | 2 +- .../messages/NotificationEmailSender.kt | 2 +- .../CommentConstitutionRepository.kt | 2 +- 27 files changed, 64 insertions(+), 65 deletions(-) rename src/main/kotlin/{ => common}/dto/CreatedAt.kt (88%) rename src/main/kotlin/{ => common}/dto/Versionable.kt (91%) rename src/main/kotlin/{ => common}/entity/CreatedBy.kt (90%) rename src/main/kotlin/{ => common}/entity/EntityI.kt (76%) rename src/main/kotlin/{ => common}/entity/Extra.kt (98%) rename src/main/kotlin/{ => common}/entity/Versionable.kt (90%) rename src/main/kotlin/{routes => common/request}/PaginatedRequest.kt (100%) diff --git a/src/main/kotlin/dto/CreatedAt.kt b/src/main/kotlin/common/dto/CreatedAt.kt similarity index 88% rename from src/main/kotlin/dto/CreatedAt.kt rename to src/main/kotlin/common/dto/CreatedAt.kt index 2e5c328..a48589d 100644 --- a/src/main/kotlin/dto/CreatedAt.kt +++ b/src/main/kotlin/common/dto/CreatedAt.kt @@ -1,4 +1,4 @@ -package fr.dcproject.dto +package fr.dcproject.common.dto import fr.postgresjson.entity.EntityCreatedAt import org.joda.time.DateTime diff --git a/src/main/kotlin/dto/Versionable.kt b/src/main/kotlin/common/dto/Versionable.kt similarity index 91% rename from src/main/kotlin/dto/Versionable.kt rename to src/main/kotlin/common/dto/Versionable.kt index 12376b5..9dd777b 100644 --- a/src/main/kotlin/dto/Versionable.kt +++ b/src/main/kotlin/common/dto/Versionable.kt @@ -1,4 +1,4 @@ -package fr.dcproject.dto +package fr.dcproject.common.dto import fr.postgresjson.entity.EntityVersioning import java.util.UUID diff --git a/src/main/kotlin/entity/CreatedBy.kt b/src/main/kotlin/common/entity/CreatedBy.kt similarity index 90% rename from src/main/kotlin/entity/CreatedBy.kt rename to src/main/kotlin/common/entity/CreatedBy.kt index 075b5ef..5d464d7 100644 --- a/src/main/kotlin/entity/CreatedBy.kt +++ b/src/main/kotlin/common/entity/CreatedBy.kt @@ -1,4 +1,4 @@ -package fr.dcproject.entity +package fr.dcproject.common.entity import fr.dcproject.component.citizen.CitizenI import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/entity/EntityI.kt b/src/main/kotlin/common/entity/EntityI.kt similarity index 76% rename from src/main/kotlin/entity/EntityI.kt rename to src/main/kotlin/common/entity/EntityI.kt index 3f660fa..8d36019 100644 --- a/src/main/kotlin/entity/EntityI.kt +++ b/src/main/kotlin/common/entity/EntityI.kt @@ -1,4 +1,4 @@ -package fr.dcproject.entity +package fr.dcproject.common.entity import fr.postgresjson.entity.EntityI import java.util.UUID diff --git a/src/main/kotlin/entity/Extra.kt b/src/main/kotlin/common/entity/Extra.kt similarity index 98% rename from src/main/kotlin/entity/Extra.kt rename to src/main/kotlin/common/entity/Extra.kt index 90bc50c..743f898 100644 --- a/src/main/kotlin/entity/Extra.kt +++ b/src/main/kotlin/common/entity/Extra.kt @@ -1,4 +1,4 @@ -package fr.dcproject.entity +package fr.dcproject.common.entity import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.citizen.CitizenI diff --git a/src/main/kotlin/entity/Versionable.kt b/src/main/kotlin/common/entity/Versionable.kt similarity index 90% rename from src/main/kotlin/entity/Versionable.kt rename to src/main/kotlin/common/entity/Versionable.kt index 5b30d7b..8a04389 100644 --- a/src/main/kotlin/entity/Versionable.kt +++ b/src/main/kotlin/common/entity/Versionable.kt @@ -1,4 +1,4 @@ -package fr.dcproject.entity +package fr.dcproject.common.entity import fr.postgresjson.entity.EntityVersioning import java.util.UUID diff --git a/src/main/kotlin/routes/PaginatedRequest.kt b/src/main/kotlin/common/request/PaginatedRequest.kt similarity index 100% rename from src/main/kotlin/routes/PaginatedRequest.kt rename to src/main/kotlin/common/request/PaginatedRequest.kt diff --git a/src/main/kotlin/component/article/Article.kt b/src/main/kotlin/component/article/Article.kt index 1a27967..627fdcb 100644 --- a/src/main/kotlin/component/article/Article.kt +++ b/src/main/kotlin/component/article/Article.kt @@ -12,10 +12,10 @@ import fr.dcproject.component.workgroup.WorkgroupCart import fr.dcproject.component.workgroup.WorkgroupCartI import fr.dcproject.component.workgroup.WorkgroupRef import fr.dcproject.component.workgroup.WorkgroupSimple -import fr.dcproject.entity.CreatedBy -import fr.dcproject.entity.TargetI -import fr.dcproject.entity.TargetRef -import fr.dcproject.entity.VersionableRef +import fr.dcproject.common.entity.CreatedBy +import fr.dcproject.common.entity.TargetI +import fr.dcproject.common.entity.TargetRef +import fr.dcproject.common.entity.VersionableRef import fr.postgresjson.entity.EntityCreatedAt import fr.postgresjson.entity.EntityCreatedAtImp import fr.postgresjson.entity.EntityDeletedAt diff --git a/src/main/kotlin/component/article/ArticleAccessControl.kt b/src/main/kotlin/component/article/ArticleAccessControl.kt index 28873ce..b11be2b 100644 --- a/src/main/kotlin/component/article/ArticleAccessControl.kt +++ b/src/main/kotlin/component/article/ArticleAccessControl.kt @@ -1,8 +1,8 @@ package fr.dcproject.component.article import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.entity.CreatedBy -import fr.dcproject.entity.VersionableRef +import fr.dcproject.common.entity.CreatedBy +import fr.dcproject.common.entity.VersionableRef import fr.dcproject.security.AccessControl import fr.dcproject.security.AccessResponse diff --git a/src/main/kotlin/component/article/ArticleViewManager.kt b/src/main/kotlin/component/article/ArticleViewManager.kt index 9a2e952..e8591f1 100644 --- a/src/main/kotlin/component/article/ArticleViewManager.kt +++ b/src/main/kotlin/component/article/ArticleViewManager.kt @@ -3,7 +3,7 @@ package fr.dcproject.component.article import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.views.ViewManager import fr.dcproject.component.views.entity.ViewAggregation -import fr.dcproject.entity.VersionableRef +import fr.dcproject.common.entity.VersionableRef import fr.dcproject.utils.contentToString import fr.dcproject.utils.getJsonField import fr.dcproject.utils.toIso diff --git a/src/main/kotlin/component/article/routes/GetOneArticle.kt b/src/main/kotlin/component/article/routes/GetOneArticle.kt index bc4860f..7e77ba1 100644 --- a/src/main/kotlin/component/article/routes/GetOneArticle.kt +++ b/src/main/kotlin/component/article/routes/GetOneArticle.kt @@ -1,17 +1,16 @@ package fr.dcproject.component.article.routes +import fr.dcproject.common.dto.CreatedAt +import fr.dcproject.common.dto.Versionable import fr.dcproject.component.article.ArticleAccessControl import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.article.ArticleRepository import fr.dcproject.component.article.ArticleViewManager -import fr.dcproject.component.article.routes.GetOneArticle.ArticleRequest.Output import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.opinion.dto.Opinionable import fr.dcproject.component.views.dto.Viewable import fr.dcproject.component.views.entity.ViewAggregation import fr.dcproject.component.vote.dto.Votable -import fr.dcproject.dto.CreatedAt -import fr.dcproject.dto.Versionable import fr.dcproject.security.assert import io.ktor.application.call import io.ktor.features.NotFoundException @@ -32,26 +31,26 @@ object GetOneArticle { val repo: ArticleRepository by inject() val article: ArticleForView = repo.findById(articleId) ?: throw NotFoundException("Article $articleId not found") + } - class Output( - article: ArticleForView, - views: ViewAggregation = ViewAggregation() - ) : CreatedAt by CreatedAt.Imp(article), - Opinionable by Opinionable.Imp(article), - Votable by Votable.Imp(article), - Versionable by Versionable.Imp(article), - Viewable by Viewable.Imp(views) { - val id = article.id - val title = article.title - val anonymous = article.anonymous - val content = article.content - val description = article.description - val tags = article.tags - val draft = article.draft - val lastVersion = article.lastVersion - val createdBy = article.createdBy - val workgroup = article.workgroup // TODO change to workgroup DTO - } + class Output( + article: ArticleForView, + views: ViewAggregation = ViewAggregation() + ) : CreatedAt by CreatedAt.Imp(article), + Opinionable by Opinionable.Imp(article), + Votable by Votable.Imp(article), + Versionable by Versionable.Imp(article), + Viewable by Viewable.Imp(views) { + val id = article.id + val title = article.title + val anonymous = article.anonymous + val content = article.content + val description = article.description + val tags = article.tags + val draft = article.draft + val lastVersion = article.lastVersion + val createdBy = article.createdBy + val workgroup = article.workgroup // TODO change to workgroup DTO } fun Route.getOneArticle(viewManager: ArticleViewManager, ac: ArticleAccessControl) { diff --git a/src/main/kotlin/component/comment/article/CommentArticleRepository.kt b/src/main/kotlin/component/comment/article/CommentArticleRepository.kt index 52f1372..df2e39b 100644 --- a/src/main/kotlin/component/comment/article/CommentArticleRepository.kt +++ b/src/main/kotlin/component/comment/article/CommentArticleRepository.kt @@ -6,7 +6,7 @@ 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.entity.TargetI +import fr.dcproject.common.entity.TargetI import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.entity.UuidEntityI diff --git a/src/main/kotlin/component/comment/generic/Comment.kt b/src/main/kotlin/component/comment/generic/Comment.kt index 87bf671..158735a 100644 --- a/src/main/kotlin/component/comment/generic/Comment.kt +++ b/src/main/kotlin/component/comment/generic/Comment.kt @@ -3,11 +3,11 @@ package fr.dcproject.component.comment.generic import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.vote.entity.Votable import fr.dcproject.component.vote.entity.VotableImp -import fr.dcproject.entity.EntityI -import fr.dcproject.entity.ExtraI -import fr.dcproject.entity.HasTarget -import fr.dcproject.entity.TargetI -import fr.dcproject.entity.TargetRef +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.common.entity.TargetRef import fr.postgresjson.entity.EntityCreatedAt import fr.postgresjson.entity.EntityCreatedAtImp import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/component/comment/generic/CommentAccessControl.kt b/src/main/kotlin/component/comment/generic/CommentAccessControl.kt index 2fa3994..30c6cd0 100644 --- a/src/main/kotlin/component/comment/generic/CommentAccessControl.kt +++ b/src/main/kotlin/component/comment/generic/CommentAccessControl.kt @@ -1,7 +1,7 @@ package fr.dcproject.component.comment.generic import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.entity.HasTarget +import fr.dcproject.common.entity.HasTarget import fr.dcproject.security.AccessControl import fr.dcproject.security.AccessResponse import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/component/comment/generic/CommentRepository.kt b/src/main/kotlin/component/comment/generic/CommentRepository.kt index 00680a6..5e424ac 100644 --- a/src/main/kotlin/component/comment/generic/CommentRepository.kt +++ b/src/main/kotlin/component/comment/generic/CommentRepository.kt @@ -3,8 +3,8 @@ package fr.dcproject.component.comment.generic import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.comment.article.CommentArticleRepository -import fr.dcproject.entity.TargetI -import fr.dcproject.entity.TargetRef +import fr.dcproject.common.entity.TargetI +import fr.dcproject.common.entity.TargetRef import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.entity.UuidEntityI diff --git a/src/main/kotlin/component/constitution/Constitution.kt b/src/main/kotlin/component/constitution/Constitution.kt index 59f3b86..a29351f 100644 --- a/src/main/kotlin/component/constitution/Constitution.kt +++ b/src/main/kotlin/component/constitution/Constitution.kt @@ -5,8 +5,8 @@ import fr.dcproject.component.article.ArticleI import fr.dcproject.component.citizen.CitizenSimple import fr.dcproject.component.citizen.CitizenWithUserI import fr.dcproject.component.constitution.ConstitutionSimple.TitleSimple -import fr.dcproject.entity.TargetI -import fr.dcproject.entity.TargetRef +import fr.dcproject.common.entity.TargetI +import fr.dcproject.common.entity.TargetRef import fr.postgresjson.entity.EntityCreatedAt import fr.postgresjson.entity.EntityCreatedAtImp import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/component/follow/Follow.kt b/src/main/kotlin/component/follow/Follow.kt index 7ac4ca3..085dcae 100644 --- a/src/main/kotlin/component/follow/Follow.kt +++ b/src/main/kotlin/component/follow/Follow.kt @@ -3,9 +3,9 @@ package fr.dcproject.component.follow import fr.dcproject.component.citizen.CitizenBasic import fr.dcproject.component.citizen.CitizenBasicI import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.entity.ExtraI -import fr.dcproject.entity.HasTarget -import fr.dcproject.entity.TargetI +import fr.dcproject.common.entity.ExtraI +import fr.dcproject.common.entity.HasTarget +import fr.dcproject.common.entity.TargetI import fr.postgresjson.entity.EntityCreatedAt import fr.postgresjson.entity.EntityCreatedAtImp import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/component/follow/FollowRepository.kt b/src/main/kotlin/component/follow/FollowRepository.kt index b9a3b9f..aef6448 100644 --- a/src/main/kotlin/component/follow/FollowRepository.kt +++ b/src/main/kotlin/component/follow/FollowRepository.kt @@ -5,7 +5,7 @@ import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.constitution.ConstitutionRef -import fr.dcproject.entity.TargetRef +import fr.dcproject.common.entity.TargetRef import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.entity.UuidEntity diff --git a/src/main/kotlin/component/opinion/OpinionAccessControl.kt b/src/main/kotlin/component/opinion/OpinionAccessControl.kt index 3294d36..cea067d 100644 --- a/src/main/kotlin/component/opinion/OpinionAccessControl.kt +++ b/src/main/kotlin/component/opinion/OpinionAccessControl.kt @@ -2,7 +2,7 @@ package fr.dcproject.component.opinion import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.opinion.entity.OpinionI -import fr.dcproject.entity.HasTarget +import fr.dcproject.common.entity.HasTarget import fr.dcproject.security.AccessControl import fr.dcproject.security.AccessResponse import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/component/opinion/OpinionRepository.kt b/src/main/kotlin/component/opinion/OpinionRepository.kt index a34f0da..d39d96e 100644 --- a/src/main/kotlin/component/opinion/OpinionRepository.kt +++ b/src/main/kotlin/component/opinion/OpinionRepository.kt @@ -3,7 +3,7 @@ package fr.dcproject.component.opinion import com.fasterxml.jackson.core.type.TypeReference import fr.dcproject.component.article.ArticleRef import fr.dcproject.component.opinion.entity.OpinionForUpdate -import fr.dcproject.entity.TargetRef +import fr.dcproject.common.entity.TargetRef import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI diff --git a/src/main/kotlin/component/opinion/entity/Opinion.kt b/src/main/kotlin/component/opinion/entity/Opinion.kt index b3eba62..38d3ffb 100644 --- a/src/main/kotlin/component/opinion/entity/Opinion.kt +++ b/src/main/kotlin/component/opinion/entity/Opinion.kt @@ -5,10 +5,10 @@ import fr.dcproject.component.citizen.CitizenBasic import fr.dcproject.component.citizen.CitizenBasicI import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.entity.ExtraI -import fr.dcproject.entity.HasTarget -import fr.dcproject.entity.TargetI -import fr.dcproject.entity.TargetRef +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.postgresjson.entity.EntityCreatedAt import fr.postgresjson.entity.EntityCreatedAtImp import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/component/vote/VoteAccessControl.kt b/src/main/kotlin/component/vote/VoteAccessControl.kt index 7b0a246..ee26995 100644 --- a/src/main/kotlin/component/vote/VoteAccessControl.kt +++ b/src/main/kotlin/component/vote/VoteAccessControl.kt @@ -2,7 +2,7 @@ package fr.dcproject.component.vote import fr.dcproject.component.citizen.CitizenI import fr.dcproject.component.vote.entity.VoteForUpdateI -import fr.dcproject.entity.TargetI +import fr.dcproject.common.entity.TargetI import fr.dcproject.security.AccessControl import fr.dcproject.security.AccessResponse import fr.postgresjson.entity.EntityDeletedAt diff --git a/src/main/kotlin/component/vote/VoteRepositoryAbs.kt b/src/main/kotlin/component/vote/VoteRepositoryAbs.kt index e63be2b..e49a366 100644 --- a/src/main/kotlin/component/vote/VoteRepositoryAbs.kt +++ b/src/main/kotlin/component/vote/VoteRepositoryAbs.kt @@ -7,8 +7,8 @@ import fr.dcproject.component.comment.generic.CommentForView import fr.dcproject.component.constitution.Constitution import fr.dcproject.component.vote.entity.VoteAggregation import fr.dcproject.component.vote.entity.VoteForUpdateI -import fr.dcproject.entity.TargetI -import fr.dcproject.entity.TargetRef +import fr.dcproject.common.entity.TargetI +import fr.dcproject.common.entity.TargetRef import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.repository.RepositoryI diff --git a/src/main/kotlin/component/vote/entity/Vote.kt b/src/main/kotlin/component/vote/entity/Vote.kt index a1a6587..d9c09cd 100644 --- a/src/main/kotlin/component/vote/entity/Vote.kt +++ b/src/main/kotlin/component/vote/entity/Vote.kt @@ -3,9 +3,9 @@ package fr.dcproject.component.vote.entity import fr.dcproject.component.citizen.CitizenBasic import fr.dcproject.component.citizen.CitizenBasicI import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.entity.ExtraI -import fr.dcproject.entity.HasTarget -import fr.dcproject.entity.TargetI +import fr.dcproject.common.entity.ExtraI +import fr.dcproject.common.entity.HasTarget +import fr.dcproject.common.entity.TargetI import fr.postgresjson.entity.EntityCreatedAt import fr.postgresjson.entity.EntityCreatedAtImp import fr.postgresjson.entity.EntityCreatedBy diff --git a/src/main/kotlin/event/EventNotification.kt b/src/main/kotlin/event/EventNotification.kt index 5993854..d7852eb 100644 --- a/src/main/kotlin/event/EventNotification.kt +++ b/src/main/kotlin/event/EventNotification.kt @@ -11,7 +11,7 @@ import fr.dcproject.component.article.ArticleForView import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.follow.FollowRepository import fr.dcproject.component.follow.FollowSimple -import fr.dcproject.entity.TargetRef +import fr.dcproject.common.entity.TargetRef import fr.dcproject.event.publisher.Publisher import fr.dcproject.messages.NotificationEmailSender import fr.postgresjson.serializer.deserialize diff --git a/src/main/kotlin/messages/NotificationEmailSender.kt b/src/main/kotlin/messages/NotificationEmailSender.kt index 2b23d04..6c09a34 100644 --- a/src/main/kotlin/messages/NotificationEmailSender.kt +++ b/src/main/kotlin/messages/NotificationEmailSender.kt @@ -9,7 +9,7 @@ import fr.dcproject.component.citizen.CitizenBasicI import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.citizen.CitizenRepository import fr.dcproject.component.follow.FollowSimple -import fr.dcproject.entity.TargetRef +import fr.dcproject.common.entity.TargetRef import fr.postgresjson.entity.UuidEntityI import java.util.UUID diff --git a/src/main/kotlin/repository/CommentConstitutionRepository.kt b/src/main/kotlin/repository/CommentConstitutionRepository.kt index 1f03aa7..d3d79bf 100644 --- a/src/main/kotlin/repository/CommentConstitutionRepository.kt +++ b/src/main/kotlin/repository/CommentConstitutionRepository.kt @@ -6,7 +6,7 @@ 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.entity.TargetI +import fr.dcproject.common.entity.TargetI import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.entity.UuidEntityI