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

#72 Move Entity and repository on the same package

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-03-03 02:46:51 +01:00
parent 79feed54dd
commit d9deb4836e
126 changed files with 426 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/fr/dcproject/component/opinion/KoinModule.kt
View File

@@ -1,5 +1,7 @@
package fr.dcproject.component.opinion
import fr.dcproject.component.opinion.database.OpinionChoiceRepository
import fr.dcproject.component.opinion.database.OpinionRepositoryArticle
import org.koin.dsl.module
val opinionKoinModule = module {

4
src/main/kotlin/fr/dcproject/component/opinion/OpinionAccessControl.kt
View File

@@ -5,8 +5,8 @@ import fr.dcproject.common.entity.DeletedAt
import fr.dcproject.common.entity.HasTarget
import fr.dcproject.common.security.AccessControl
import fr.dcproject.common.security.AccessResponse
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.component.opinion.entity.OpinionI
import fr.dcproject.component.citizen.database.CitizenI
import fr.dcproject.component.opinion.database.OpinionI
class OpinionAccessControl : AccessControl() {

4
src/main/kotlin/fr/dcproject/component/opinion/OpinionChoiceAccessControl.kt
View File

@@ -2,8 +2,8 @@ package fr.dcproject.component.opinion
import fr.dcproject.common.security.AccessControl
import fr.dcproject.common.security.AccessResponse
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.component.opinion.entity.OpinionChoiceI
import fr.dcproject.component.citizen.database.CitizenI
import fr.dcproject.component.opinion.database.OpinionChoiceI
class OpinionChoiceAccessControl : AccessControl() {
fun canView(subjects: List<OpinionChoiceI>, citizen: CitizenI?): AccessResponse =

10
src/main/kotlin/fr/dcproject/component/opinion/entity/Opinion.kt → src/main/kotlin/fr/dcproject/component/opinion/database/Opinion.kt
View File

@@ -1,4 +1,4 @@
package fr.dcproject.component.opinion.entity
package fr.dcproject.component.opinion.database
import fr.dcproject.common.entity.CreatedAt
import fr.dcproject.common.entity.CreatedBy
@@ -7,10 +7,10 @@ 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.dcproject.component.citizen.CitizenCreator
import fr.dcproject.component.citizen.CitizenCreatorI
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.component.citizen.CitizenRef
import fr.dcproject.component.citizen.database.CitizenCreator
import fr.dcproject.component.citizen.database.CitizenCreatorI
import fr.dcproject.component.citizen.database.CitizenI
import fr.dcproject.component.citizen.database.CitizenRef
import java.util.UUID
open class Opinion<T : TargetI>(

2
src/main/kotlin/fr/dcproject/component/opinion/entity/OpinionChoice.kt → src/main/kotlin/fr/dcproject/component/opinion/database/OpinionChoice.kt
View File

@@ -1,4 +1,4 @@
package fr.dcproject.component.opinion.entity
package fr.dcproject.component.opinion.database
import fr.dcproject.common.entity.CreatedAt
import fr.dcproject.common.entity.DeletedAt

13
src/main/kotlin/fr/dcproject/component/opinion/OpinionRepository.kt → src/main/kotlin/fr/dcproject/component/opinion/database/OpinionRepository.kt
View File

@@ -1,18 +1,17 @@
package fr.dcproject.component.opinion
package fr.dcproject.component.opinion.database
import com.fasterxml.jackson.core.type.TypeReference
import fr.dcproject.common.entity.TargetRef
import fr.dcproject.component.article.ArticleRef
import fr.dcproject.component.citizen.CitizenI
import fr.dcproject.component.opinion.entity.OpinionForUpdate
import fr.dcproject.component.article.database.ArticleRef
import fr.dcproject.component.citizen.database.CitizenI
import fr.postgresjson.connexion.Paginated
import fr.postgresjson.connexion.Requester
import fr.postgresjson.repository.RepositoryI
import net.pearx.kasechange.toSnakeCase
import java.util.UUID
import fr.dcproject.component.citizen.Citizen as CitizenEntity
import fr.dcproject.component.opinion.entity.Opinion as OpinionEntity
import fr.dcproject.component.opinion.entity.OpinionChoice as OpinionChoiceEntity
import fr.dcproject.component.citizen.database.Citizen as CitizenEntity
import fr.dcproject.component.opinion.database.Opinion as OpinionEntity
import fr.dcproject.component.opinion.database.OpinionChoice as OpinionChoiceEntity
open class OpinionChoiceRepository(override val requester: Requester) : RepositoryI {
/**

8
src/main/kotlin/fr/dcproject/component/opinion/routes/GetCitizenOpinions.kt
View File

@@ -2,11 +2,11 @@ package fr.dcproject.component.opinion.routes
import fr.dcproject.common.security.assert
import fr.dcproject.common.utils.toUUID
import fr.dcproject.component.article.ArticleRef
import fr.dcproject.component.article.database.ArticleRef
import fr.dcproject.component.auth.citizenOrNull
import fr.dcproject.component.citizen.CitizenRef
import fr.dcproject.component.citizen.database.CitizenRef
import fr.dcproject.component.opinion.OpinionAccessControl
import fr.dcproject.component.opinion.entity.Opinion
import fr.dcproject.component.opinion.database.Opinion
import io.ktor.application.call
import io.ktor.locations.KtorExperimentalLocationsAPI
import io.ktor.locations.Location
@@ -14,7 +14,7 @@ import io.ktor.locations.get
import io.ktor.response.respond
import io.ktor.routing.Route
import java.util.UUID
import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository
import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository
@KtorExperimentalLocationsAPI
object GetCitizenOpinions {

6
src/main/kotlin/fr/dcproject/component/opinion/routes/GetMyOpinionsArticle.kt
View File

@@ -4,9 +4,9 @@ import fr.dcproject.common.entity.TargetRef
import fr.dcproject.common.security.assert
import fr.dcproject.component.auth.citizen
import fr.dcproject.component.auth.citizenOrNull
import fr.dcproject.component.citizen.CitizenRef
import fr.dcproject.component.citizen.database.CitizenRef
import fr.dcproject.component.opinion.OpinionAccessControl
import fr.dcproject.component.opinion.entity.Opinion
import fr.dcproject.component.opinion.database.Opinion
import fr.dcproject.routes.PaginatedRequest
import fr.dcproject.routes.PaginatedRequestI
import fr.postgresjson.connexion.Paginated
@@ -17,7 +17,7 @@ import io.ktor.locations.get
import io.ktor.response.respond
import io.ktor.routing.Route
import java.util.UUID
import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository
import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository
@KtorExperimentalLocationsAPI
object GetMyOpinionsArticle {

4
src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoice.kt
View File

@@ -3,8 +3,8 @@ package fr.dcproject.component.opinion.routes
import fr.dcproject.common.security.assert
import fr.dcproject.component.auth.citizenOrNull
import fr.dcproject.component.opinion.OpinionChoiceAccessControl
import fr.dcproject.component.opinion.OpinionChoiceRepository
import fr.dcproject.component.opinion.entity.OpinionChoiceRef
import fr.dcproject.component.opinion.database.OpinionChoiceRef
import fr.dcproject.component.opinion.database.OpinionChoiceRepository
import io.ktor.application.call
import io.ktor.features.NotFoundException
import io.ktor.locations.KtorExperimentalLocationsAPI

2
src/main/kotlin/fr/dcproject/component/opinion/routes/GetOpinionChoices.kt
View File

@@ -3,7 +3,7 @@ package fr.dcproject.component.opinion.routes
import fr.dcproject.common.security.assert
import fr.dcproject.component.auth.citizenOrNull
import fr.dcproject.component.opinion.OpinionChoiceAccessControl
import fr.dcproject.component.opinion.OpinionChoiceRepository
import fr.dcproject.component.opinion.database.OpinionChoiceRepository
import io.ktor.application.call
import io.ktor.locations.KtorExperimentalLocationsAPI
import io.ktor.locations.Location

8
src/main/kotlin/fr/dcproject/component/opinion/routes/OpinionArticle.kt
View File

@@ -3,12 +3,12 @@ package fr.dcproject.component.opinion.routes
import fr.dcproject.common.security.assert
import fr.dcproject.common.utils.receiveOrBadRequest
import fr.dcproject.common.utils.toUUID
import fr.dcproject.component.article.ArticleRef
import fr.dcproject.component.article.database.ArticleRef
import fr.dcproject.component.auth.citizen
import fr.dcproject.component.auth.citizenOrNull
import fr.dcproject.component.opinion.OpinionAccessControl
import fr.dcproject.component.opinion.entity.OpinionChoiceRef
import fr.dcproject.component.opinion.entity.OpinionForUpdate
import fr.dcproject.component.opinion.database.OpinionChoiceRef
import fr.dcproject.component.opinion.database.OpinionForUpdate
import io.ktor.application.call
import io.ktor.http.HttpStatusCode
import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -17,7 +17,7 @@ import io.ktor.locations.put
import io.ktor.response.respond
import io.ktor.routing.Route
import java.util.UUID
import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository
import fr.dcproject.component.opinion.database.OpinionRepositoryArticle as OpinionArticleRepository
@KtorExperimentalLocationsAPI
object OpinionArticle {