DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Rename ArticleViewManager to ArticleViewRepository

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-04-02 12:25:54 +02:00
parent 01c5b78325
commit db810ab0c6
5 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/fr/dcproject/component/article/ArticleViewManager.kt → src/main/kotlin/fr/dcproject/component/article/ArticleViewRepository.kt
View File

@@ -6,10 +6,9 @@ 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.ViewManager
import fr.dcproject.component.views.ViewRepository
import fr.dcproject.component.views.entity.ViewAggregation
import org.elasticsearch.client.Request
import org.elasticsearch.client.Response
import org.elasticsearch.client.RestClient
import org.joda.time.DateTime
import java.util.UUID
@@ -17,11 +16,11 @@ import java.util.UUID
/**
* Wrapper for manage views with elasticsearch
*/
class ArticleViewManager <A> (private val restClient: RestClient) : ViewManager<A> where A : VersionableId, A : ArticleI {
class ArticleViewRepository <A> (private val restClient: RestClient) : ViewRepository<A> where A : VersionableId, A : ArticleI {
/**
* Add view on article to elasticsearch
*/
override fun addView(ip: String, entity: A, citizen: CitizenI?, dateTime: DateTime): Response? {
override fun addView(ip: String, entity: A, citizen: CitizenI?, dateTime: DateTime) {
val isLogged = (citizen != null).toString()
val ref = citizen?.id ?: UUID.nameUUIDFromBytes(ip.toByteArray())!!
val request = Request(
@@ -45,7 +44,7 @@ class ArticleViewManager <A> (private val restClient: RestClient) : ViewManager<
)
}
return restClient.performRequest(request)
restClient.performRequest(request)
}
/**

8
src/main/kotlin/fr/dcproject/component/article/routes/GetOneArticle.kt
View File

@@ -2,7 +2,7 @@ package fr.dcproject.component.article.routes
import fr.dcproject.common.security.assert
import fr.dcproject.component.article.ArticleAccessControl
import fr.dcproject.component.article.ArticleViewManager
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
@@ -24,7 +24,7 @@ object GetOneArticle {
val article = ArticleRef(article)
}
fun Route.getOneArticle(viewManager: ArticleViewManager<ArticleForView>, ac: ArticleAccessControl, repo: ArticleRepository) {
fun Route.getOneArticle(viewRepository: ArticleViewRepository<ArticleForView>, ac: ArticleAccessControl, repo: ArticleRepository) {
get<ArticleRequest> {
val article: ArticleForView = repo.findById(it.article.id) ?: throw NotFoundException("Article ${it.article.id} not found")
ac.assert { canView(article, citizenOrNull) }
@@ -64,7 +64,7 @@ object GetOneArticle {
val total: Int = a.votes.total
val score: Int = a.votes.score
}
val views: Any = viewManager.getViewsCount(article).let { v ->
val views: Any = viewRepository.getViewsCount(article).let { v ->
object {
val total = v.total
val unique = v.unique
@@ -76,7 +76,7 @@ object GetOneArticle {
)
launch {
viewManager.addView(call.request.local.remoteHost, article, citizenOrNull)
viewRepository.addView(call.request.local.remoteHost, article, citizenOrNull)
}
}
}

4
src/main/kotlin/fr/dcproject/component/views/KoinModule.kt
View File

@@ -1,7 +1,7 @@
package fr.dcproject.component.views
import fr.dcproject.application.Configuration
import fr.dcproject.component.article.ArticleViewManager
import fr.dcproject.component.article.ArticleViewRepository
import fr.dcproject.component.article.database.ArticleForView
import org.apache.http.HttpHost
import org.elasticsearch.client.RestClient
@@ -17,6 +17,6 @@ val viewKoinModule = module {
).build().apply {
createEsIndexForViews()
}
ArticleViewManager<ArticleForView>(esClient)
ArticleViewRepository<ArticleForView>(esClient)
}
}

5
src/main/kotlin/fr/dcproject/component/views/ViewManager.kt → src/main/kotlin/fr/dcproject/component/views/ViewRepository.kt
View File

@@ -2,14 +2,13 @@ package fr.dcproject.component.views
import fr.dcproject.component.citizen.database.CitizenI
import fr.dcproject.component.views.entity.ViewAggregation
import org.elasticsearch.client.Response
import org.joda.time.DateTime
interface ViewManager <T> {
interface ViewRepository <T> {
/**
* Add view to one entity
*/
fun addView(ip: String, entity: T, citizen: CitizenI? = null, dateTime: DateTime = DateTime.now()): Response?
fun addView(ip: String, entity: T, citizen: CitizenI? = null, dateTime: DateTime = DateTime.now())
/**
* Get Views aggregations