From cb762a446a9c51a04114bbadb0304e092be24c7e Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Fri, 2 Apr 2021 12:29:50 +0200 Subject: [PATCH] Move ArticleViewRepository --- .../component/article/{ => database}/ArticleViewRepository.kt | 3 +-- .../fr/dcproject/component/article/routes/GetOneArticle.kt | 2 +- src/main/kotlin/fr/dcproject/component/views/KoinModule.kt | 2 +- src/test/kotlin/functional/ViewTest.kt | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) rename src/main/kotlin/fr/dcproject/component/article/{ => database}/ArticleViewRepository.kt (97%) diff --git a/src/main/kotlin/fr/dcproject/component/article/ArticleViewRepository.kt b/src/main/kotlin/fr/dcproject/component/article/database/ArticleViewRepository.kt similarity index 97% rename from src/main/kotlin/fr/dcproject/component/article/ArticleViewRepository.kt rename to src/main/kotlin/fr/dcproject/component/article/database/ArticleViewRepository.kt index 01bb105..23d1686 100644 --- a/src/main/kotlin/fr/dcproject/component/article/ArticleViewRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/article/database/ArticleViewRepository.kt @@ -1,10 +1,9 @@ -package fr.dcproject.component.article +package fr.dcproject.component.article.database 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.article.database.ArticleI import fr.dcproject.component.citizen.database.CitizenI import fr.dcproject.component.views.ViewRepository import fr.dcproject.component.views.entity.ViewAggregation 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 6f6ff7c..50e1e04 100644 --- a/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt +++ b/src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt @@ -2,10 +2,10 @@ package fr.dcproject.component.article.routes import fr.dcproject.common.security.assert import fr.dcproject.component.article.ArticleAccessControl -import fr.dcproject.component.article.ArticleViewRepository 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.article.database.ArticleViewRepository import fr.dcproject.component.auth.citizenOrNull import io.ktor.application.call import io.ktor.features.NotFoundException diff --git a/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt b/src/main/kotlin/fr/dcproject/component/views/KoinModule.kt index 91e5eb5..4f2e85f 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.ArticleViewRepository import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleViewRepository import org.apache.http.HttpHost import org.elasticsearch.client.RestClient import org.koin.dsl.module diff --git a/src/test/kotlin/functional/ViewTest.kt b/src/test/kotlin/functional/ViewTest.kt index e884901..2d0de49 100644 --- a/src/test/kotlin/functional/ViewTest.kt +++ b/src/test/kotlin/functional/ViewTest.kt @@ -2,8 +2,8 @@ package functional import fr.dcproject.application.Env.TEST import fr.dcproject.application.module -import fr.dcproject.component.article.ArticleViewRepository import fr.dcproject.component.article.database.ArticleForView +import fr.dcproject.component.article.database.ArticleViewRepository import fr.dcproject.component.auth.database.UserCreator import fr.dcproject.component.citizen.database.CitizenCreator import fr.dcproject.component.citizen.database.CitizenI