#68 Clean Entities

2021-02-25 18:32:17 +01:00
parent c1af949204
commit c25cf64f4b
39 changed files with 265 additions and 264 deletions
--- a/src/main/kotlin/fr/dcproject/component/comment/article/CommentArticleRepository.kt
+++ b/src/main/kotlin/fr/dcproject/component/comment/article/CommentArticleRepository.kt
@@ -1,5 +1,6 @@
 package fr.dcproject.component.comment.article

+import fr.dcproject.common.entity.EntityI
 import fr.dcproject.common.entity.TargetI
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRef
@@ -9,7 +10,6 @@ import fr.dcproject.component.comment.generic.CommentForView
 import fr.dcproject.component.comment.generic.CommentRepositoryAbs
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.UuidEntityI
 import java.util.UUID

 class CommentArticleRepository(requester: Requester) : CommentRepositoryAbs<ArticleForView>(requester) {
@@ -36,7 +36,7 @@ class CommentArticleRepository(requester: Requester) : CommentRepositoryAbs<Arti
    }

    override fun findByTarget(
-        target: UuidEntityI,
+        target: EntityI,
        page: Int,
        limit: Int,
        sort: Sort
--- a/src/main/kotlin/fr/dcproject/component/comment/constitution/CommentConstitutionRepository.kt
+++ b/src/main/kotlin/fr/dcproject/component/comment/constitution/CommentConstitutionRepository.kt
@@ -1,5 +1,6 @@
 package fr.dcproject.component.comment.constitution

+import fr.dcproject.common.entity.EntityI
 import fr.dcproject.common.entity.TargetI
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRef
@@ -9,7 +10,6 @@ import fr.dcproject.component.comment.generic.CommentRepositoryAbs
 import fr.dcproject.component.constitution.ConstitutionRef
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.UuidEntityI
 import java.util.UUID

 class CommentConstitutionRepository(requester: Requester) : CommentRepositoryAbs<ConstitutionRef>(requester) {
@@ -36,7 +36,7 @@ class CommentConstitutionRepository(requester: Requester) : CommentRepositoryAbs
    }

    override fun findByTarget(
-        target: UuidEntityI,
+        target: EntityI,
        page: Int,
        limit: Int,
        sort: CommentArticleRepository.Sort
--- a/src/main/kotlin/fr/dcproject/component/comment/generic/Comment.kt
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/Comment.kt
@@ -1,21 +1,17 @@
 package fr.dcproject.component.comment.generic

+import fr.dcproject.common.entity.CreatedAt
+import fr.dcproject.common.entity.CreatedBy
+import fr.dcproject.common.entity.DeletedAt
 import fr.dcproject.common.entity.EntityI
 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.common.entity.UpdatedAt
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.vote.entity.Votable
 import fr.dcproject.component.vote.entity.VotableImp
-import fr.postgresjson.entity.EntityCreatedAt
-import fr.postgresjson.entity.EntityCreatedAtImp
-import fr.postgresjson.entity.EntityCreatedBy
-import fr.postgresjson.entity.EntityCreatedByImp
-import fr.postgresjson.entity.EntityDeletedAt
-import fr.postgresjson.entity.EntityDeletedAtImp
-import fr.postgresjson.entity.EntityUpdatedAt
-import fr.postgresjson.entity.EntityUpdatedAtImp
 import org.joda.time.DateTime
 import java.util.UUID

@@ -31,9 +27,9 @@ class CommentForView<T : TargetI, C : CitizenRef>(
    CommentWithParentI<T>,
    CommentForUpdate<T, C>(id, createdBy, target, content, parent, deletedAt),
    CommentWithTargetI<T>,
-    EntityCreatedBy<C> by EntityCreatedByImp(createdBy),
-    EntityUpdatedAt by EntityUpdatedAtImp(),
-    EntityDeletedAt by EntityDeletedAtImp(),
+    CreatedBy<C> by CreatedBy.Imp(createdBy),
+    UpdatedAt by UpdatedAt.Imp(),
+    DeletedAt by DeletedAt.Imp(),
    Votable by VotableImp(),
    TargetI {
    constructor(
@@ -59,9 +55,9 @@ open class CommentForUpdate<T : TargetI, C : CitizenRef>(
    CommentWithParentI<T>,
    ExtraI<T, C>,
    CommentWithTargetI<T>,
-    EntityCreatedAt by EntityCreatedAtImp(),
-    EntityCreatedBy<C>,
-    EntityDeletedAt,
+    CreatedAt by CreatedAt.Imp(),
+    CreatedBy<C>,
+    DeletedAt,
    TargetI {
    constructor(
        createdBy: C,
@@ -82,7 +78,7 @@ open class CommentParent<T : TargetI>(
 ) : CommentRef(id),
    CommentParentI<T>

-interface CommentParentI<T : TargetI> : CommentI, EntityDeletedAt, CommentWithTargetI<T>
+interface CommentParentI<T : TargetI> : CommentI, DeletedAt, CommentWithTargetI<T>

 interface CommentWithTargetI<T : TargetI> : CommentI, TargetI, HasTarget<T>

--- a/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/CommentAccessControl.kt
@@ -1,39 +1,39 @@
 package fr.dcproject.component.comment.generic

+import fr.dcproject.common.entity.CreatedBy
+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.postgresjson.entity.EntityCreatedBy
-import fr.postgresjson.entity.EntityDeletedAt

 class CommentAccessControl : AccessControl() {
    fun <S> canView(subjects: List<S>, citizen: CitizenI?): AccessResponse
    where S : CommentI,
-          S : EntityDeletedAt = canAll(subjects) { canView(it, citizen) }
+          S : DeletedAt = canAll(subjects) { canView(it, citizen) }

    fun <S> canView(subject: S, citizen: CitizenI?): AccessResponse
    where S : CommentI,
-          S : EntityDeletedAt = when {
+          S : DeletedAt = when {
        subject.isDeleted() -> denied("Your cannot view a deleted comment", "comment.view.deleted")
        else -> granted()
    }

    fun <S, CR : CitizenI> canCreate(subject: S, citizen: CitizenI?): AccessResponse
    where S : CommentI,
-          S : EntityCreatedBy<CR>,
+          S : CreatedBy<CR>,
          S : CommentWithParentI<*>,
          S : HasTarget<*> = when {
        citizen == null -> denied("You must be connected to create user", "comment.create.notConnected")
        subject.createdBy.id != citizen.id -> denied("You cannot create a comment with other user than yours", "comment.create.wrongUser")
        subject.parent?.isDeleted() ?: false -> denied("You cannot create a comment on deleted parent", "comment.create.deletedParent")
-        subject.target.let { it is EntityDeletedAt && it.isDeleted() } -> denied("You cannot create a comment on deleted target", "comment.create.deletedTarget")
+        subject.target.let { it is DeletedAt && it.isDeleted() } -> denied("You cannot create a comment on deleted target", "comment.create.deletedTarget")
        else -> granted()
    }

    fun <S, CR : CitizenI> canUpdate(subject: S, citizen: CitizenI?): AccessResponse
    where S : CommentI,
-          S : EntityCreatedBy<CR> = when {
+          S : CreatedBy<CR> = when {
        citizen == null -> denied("You must be connected to update comment", "comment.update.notConnected")
        citizen.id != subject.createdBy.id -> denied("You cannot update another user of yours", "comment.update.notYours")
        else -> granted()
--- a/src/main/kotlin/fr/dcproject/component/comment/generic/CommentRepository.kt
+++ b/src/main/kotlin/fr/dcproject/component/comment/generic/CommentRepository.kt
@@ -1,5 +1,6 @@
 package fr.dcproject.component.comment.generic

+import fr.dcproject.common.entity.EntityI
 import fr.dcproject.common.entity.TargetI
 import fr.dcproject.common.entity.TargetRef
 import fr.dcproject.component.citizen.CitizenI
@@ -7,7 +8,6 @@ import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.UuidEntityI
 import fr.postgresjson.repository.RepositoryI
 import java.util.UUID

@@ -44,7 +44,7 @@ abstract class CommentRepositoryAbs<T : TargetI>(override var requester: Request
    }

    open fun findByTarget(
-        target: UuidEntityI,
+        target: EntityI,
        page: Int = 1,
        limit: Int = 50,
        sort: CommentArticleRepository.Sort = CommentArticleRepository.Sort.CREATED_AT