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

Can filter article by author

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-10-22 11:00:27 +02:00
parent 846b23b550
commit 5b4d878f8a
4 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/fr/dcproject/repository/Article.kt
View File

@@ -2,6 +2,7 @@ package fr.dcproject.repository
import fr.postgresjson.connexion.Paginated
import fr.postgresjson.connexion.Requester
import fr.postgresjson.entity.Parameter
import fr.postgresjson.repository.RepositoryI
import fr.postgresjson.repository.RepositoryI.Direction
import net.pearx.kasechange.toSnakeCase
@@ -25,7 +26,8 @@ class Article(override var requester: Requester) : RepositoryI {
limit: Int = 50,
sort: String? = null,
direction: Direction? = null,
search: String? = null
search: String? = null,
filter: Filter = Filter()
): Paginated<ArticleEntity> {
return requester
.getFunction("find_articles")
@@ -33,7 +35,8 @@ class Article(override var requester: Requester) : RepositoryI {
page, limit,
"sort" to sort?.toSnakeCase(),
"direction" to direction,
"search" to search
"search" to search,
"filter" to filter
)
}
@@ -42,4 +45,8 @@ class Article(override var requester: Requester) : RepositoryI {
.getFunction("upsert_article")
.selectOne("resource" to article)
}
class Filter(
val createdById: String? = null
) : Parameter
}

5
src/main/kotlin/fr/dcproject/routes/Article.kt
View File

@@ -1,6 +1,7 @@
package fr.dcproject.routes
import fr.dcproject.citizen
import fr.dcproject.repository.Article.Filter
import fr.dcproject.security.voter.ArticleVoter.Action.CREATE
import fr.dcproject.security.voter.ArticleVoter.Action.VIEW
import fr.dcproject.security.voter.assertCan
@@ -19,7 +20,7 @@ import fr.dcproject.repository.Article as ArticleRepository
@KtorExperimentalLocationsAPI
object ArticlesPaths {
@Location("/articles") class ArticlesRequest(page: Int = 1, limit: Int = 50, val sort: String? = null, val direction: RepositoryI.Direction? = null, val search: String? = null) {
@Location("/articles") class ArticlesRequest(page: Int = 1, limit: Int = 50, val sort: String? = null, val direction: RepositoryI.Direction? = null, val search: String? = null, val createdBy: String? = null) {
val page: Int = if (page < 1) 1 else page
val limit: Int = if (limit > 50) 50 else if (limit < 1) 1 else limit
}
@@ -34,7 +35,7 @@ object ArticlesPaths {
@KtorExperimentalLocationsAPI
fun Route.article(repo: ArticleRepository) {
get<ArticlesPaths.ArticlesRequest> {
val articles = repo.find(it.page, it.limit, it.sort, it.direction, it.search)
val articles = repo.find(it.page, it.limit, it.sort, it.direction, it.search, Filter(createdById = it.createdBy))
assertCan(VIEW, articles.result)
call.respond(articles)
}