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

Clean code after update postgresjson

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-10-09 22:54:34 +02:00
parent a6f25bcbb2
commit 7e52808ccf
9 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/kotlin/fr/dcproject/entity/Article.kt
View File

@@ -2,7 +2,6 @@ package fr.dcproject.entity
import fr.postgresjson.entity.*
import java.util.*
class Article(
id: UUID = UUID.randomUUID(),
var title: String?,

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

@@ -8,9 +8,7 @@ import net.pearx.kasechange.toSnakeCase
import java.util.*
import fr.dcproject.entity.Article as ArticleEntity
class Article(override var requester: Requester) : RepositoryI<ArticleEntity> {
override val entityName = ArticleEntity::class
class Article(override var requester: Requester) : RepositoryI {
fun findById(id: UUID): ArticleEntity? {
val function = requester.getFunction("find_article_by_id")
return function.selectOne("id" to id)

4
src/main/kotlin/fr/dcproject/repository/Citizen.kt
View File

@@ -9,9 +9,7 @@ import java.util.*
import fr.dcproject.entity.Citizen as CitizenEntity
import fr.dcproject.entity.User as UserEntity
class Citizen(override var requester: Requester) : RepositoryI<CitizenEntity> {
override val entityName = CitizenEntity::class
class Citizen(override var requester: Requester) : RepositoryI {
fun findById(id: UUID, withUser: Boolean = false): CitizenEntity? {
return requester
.getFunction(if (withUser) "find_citizen_by_id_with_user" else "find_citizen_by_id")

5
src/main/kotlin/fr/dcproject/repository/Comment.kt
View File

@@ -5,15 +5,12 @@ import fr.postgresjson.connexion.Requester
import fr.postgresjson.entity.UuidEntity
import fr.postgresjson.repository.RepositoryI
import java.util.*
import kotlin.reflect.KClass
import fr.dcproject.entity.Article as ArticleEntity
import fr.dcproject.entity.Citizen as CitizenEntity
import fr.dcproject.entity.Comment as CommentEntity
import fr.dcproject.entity.Constitution as ConstitutionEntity
abstract class Comment <T: UuidEntity>(override var requester: Requester): RepositoryI<CommentEntity<T>> {
override val entityName = CommentEntity::class as KClass<CommentEntity<T>>
abstract class Comment <T: UuidEntity>(override var requester: Requester): RepositoryI {
abstract fun findById(id: UUID): CommentEntity<T>?
abstract fun findByCitizen(

4
src/main/kotlin/fr/dcproject/repository/Constitution.kt
View File

@@ -8,9 +8,7 @@ import net.pearx.kasechange.toSnakeCase
import java.util.*
import fr.dcproject.entity.Constitution as ConstitutionEntity
class Constitution(override var requester: Requester) : RepositoryI<ConstitutionEntity> {
override val entityName = ConstitutionEntity::class
class Constitution(override var requester: Requester) : RepositoryI {
fun findById(id: UUID): ConstitutionEntity? {
val function = requester.getFunction("find_constitution_by_id")
return function.selectOne("id" to id)

4
src/main/kotlin/fr/dcproject/repository/Follow.kt
View File

@@ -5,14 +5,12 @@ import fr.postgresjson.connexion.Requester
import fr.postgresjson.entity.UuidEntity
import fr.postgresjson.repository.RepositoryI
import java.util.*
import kotlin.reflect.KClass
import fr.dcproject.entity.Article as ArticleEntity
import fr.dcproject.entity.Citizen as CitizenEntity
import fr.dcproject.entity.Constitution as ConstitutionEntity
import fr.dcproject.entity.Follow as FollowEntity
open class Follow <T: UuidEntity>(override var requester: Requester): RepositoryI<FollowEntity<T>> {
override val entityName = FollowEntity::class as KClass<FollowEntity<T>>
open class Follow <T: UuidEntity>(override var requester: Requester): RepositoryI {
open fun findByCitizen(
citizen: CitizenEntity,
page: Int = 1,

4
src/main/kotlin/fr/dcproject/repository/User.kt
View File

@@ -6,9 +6,7 @@ import io.ktor.auth.UserPasswordCredential
import java.util.*
import fr.dcproject.entity.User as UserEntity
class User(override var requester: Requester) : RepositoryI<UserEntity> {
override val entityName = UserEntity::class
class User(override var requester: Requester) : RepositoryI {
fun findByCredentials(credentials: UserPasswordCredential): UserEntity? {
return requester
.getFunction("check_user")

5
src/main/kotlin/fr/dcproject/repository/Vote.kt
View File

@@ -10,13 +10,10 @@ import fr.postgresjson.connexion.Requester
import fr.postgresjson.entity.UuidEntity
import fr.postgresjson.repository.RepositoryI
import java.util.*
import kotlin.reflect.KClass
import fr.dcproject.entity.Citizen as CitizenEntity
import fr.dcproject.entity.Vote as VoteEntity
open class Vote <T: UuidEntity>(override var requester: Requester): RepositoryI<VoteEntity<T>> {
override val entityName = VoteEntity::class as KClass<VoteEntity<T>>
open class Vote <T: UuidEntity>(override var requester: Requester): RepositoryI {
fun vote(vote: VoteEntity<T>): VoteAggregation {
val target = vote.target
val reference = if (target is Comment<*>) {

5
src/test/kotlin/RepositoryTest.kt
View File

@@ -1,11 +1,8 @@
import fr.dcproject.Env
import fr.dcproject.entity.Article
import fr.dcproject.entity.Constitution
import fr.dcproject.module
import io.ktor.locations.KtorExperimentalLocationsAPI
import io.ktor.server.testing.withTestApplication
import io.ktor.util.KtorExperimentalAPI
import org.amshove.kluent.`should equal`
import org.amshove.kluent.shouldBe
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
@@ -25,11 +22,9 @@ class RepositoryTest: KoinTest, AutoCloseKoinTest() {
withTestApplication({ module(Env.TEST) }) {
val repoArticle = get<RepositoryArticle>()
(repoArticle is RepositoryArticle) shouldBe true
repoArticle.entityName `should equal` Article::class
val repoConstitution = get<RepositoryConstitution>()
(repoConstitution is RepositoryConstitution) shouldBe true
repoConstitution.entityName `should equal` Constitution::class
}
}
}