#42 Add tests to ArticleVoter

Refactor ArticleVoter

src/main/kotlin/fr/dcproject/entity/Article.kt

@@ -8,30 +8,19 @@ import fr.postgresjson.entity.mutable.UuidEntityVersioning
 import java.util.*
 
 class Article(
-    id: UUID = UUID.randomUUID(),
-    title: String,
-    anonymous: Boolean = true,
-    content: String,
-    description: String,
-    tags: List<String> = emptyList(),
-    override var draft: Boolean = false,
-    override var lastVersion: Boolean = false,
-    createdBy: CitizenBasic
-) : ArticleFull,
-    ArticleBasic(id, title, anonymous, content, description, tags, createdBy),
-    Viewable by ViewableImp()
-
-open class ArticleBasic(
     id: UUID = UUID.randomUUID(),
     title: String,
     override var anonymous: Boolean = true,
     override var content: String,
     override var description: String,
     override var tags: List<String> = emptyList(),
+    draft: Boolean = false,
+    override var lastVersion: Boolean = false,
     override val createdBy: CitizenBasic
-) : ArticleBasicI,
-    ArticleSimple(id, title, createdBy) {
-
+) : ArticleFull,
+    ArticleAuthI<CitizenBasicI>,
+    ArticleSimple(id, title, createdBy, draft),
+    Viewable by ViewableImp() {
     init {
         tags = tags.distinct()
     }
@@ -40,8 +29,10 @@ open class ArticleBasic(
 open class ArticleSimple(
     id: UUID = UUID.randomUUID(),
     override var title: String,
-    override val createdBy: CitizenBasic
+    override val createdBy: CitizenBasic,
+    override var draft: Boolean = false
 ) : ArticleSimpleI,
+    ArticleAuthI<CitizenBasicI>,
     ArticleRefVersioning(id),
     EntityCreatedAt by EntityCreatedAtImp(),
     EntityCreatedBy<CitizenBasicI> by EntityCreatedByImp(createdBy),
@@ -85,3 +76,10 @@ interface ArticleFull :
     var draft: Boolean
     var lastVersion: Boolean
 }
+
+interface ArticleAuthI<U : CitizenWithUserI> :
+    ArticleI,
+    EntityCreatedBy<U>,
+    EntityDeletedAt {
+    var draft: Boolean
+}

src/main/kotlin/fr/dcproject/entity/Citizen.kt

@@ -29,7 +29,7 @@ open class CitizenBasic(
     override var birthday: DateTime,
     override var voteAnonymous: Boolean = true,
     override var followAnonymous: Boolean = true,
-    user: UserRef
+    override val user: User
 ) : CitizenBasicI,
     CitizenSimple(id, name, user)
 

src/main/kotlin/fr/dcproject/entity/User.kt

@@ -10,7 +10,7 @@ class User(
     id: UUID = UUID.randomUUID(),
     username: String,
     blockedAt: DateTime? = null,
-    override var plainPassword: String?,
+    override var plainPassword: String? = null,
     override var roles: List<Roles> = emptyList()
 ) : UserFull, UserBasic(id, username, blockedAt),
     EntityCreatedAt by EntityCreatedAtImp(),

src/main/kotlin/fr/dcproject/security/voter/ArticleVoter.kt

@@ -1,5 +1,7 @@
 package fr.dcproject.security.voter
 
+import fr.dcproject.entity.ArticleAuthI
+import fr.dcproject.entity.ArticleI
 import fr.dcproject.entity.ArticleSimpleI
 import fr.dcproject.entity.UserI
 import io.ktor.application.ApplicationCall
@@ -16,53 +18,52 @@ class ArticleVoter : Voter {
 
     override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
         return (action is Action || action is CommentVoter.Action || action is VoteVoter.Action)
-            .and(subject is List<*> || subject is ArticleSimpleI? || subject is VoteEntity<*> || subject is CommentEntity<*>)
+            .and(subject is ArticleI? || subject is VoteEntity<*> || subject is CommentEntity<*>)
     }
 
     override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
         val user = call.user
-        if (action == Action.CREATE && user is UserI) {
-            return Vote.GRANTED
-        }
-
-        if (action == Action.VIEW) {
-            if (subject is ArticleSimpleI) {
-                return if (subject.isDeleted()) Vote.DENIED
-                else Vote.GRANTED
-            }
-            if (subject is List<*>) {
-                subject.forEach {
-                    if (it !is ArticleSimpleI || it.isDeleted()) {
-                        return Vote.DENIED
-                    }
-                }
-                return Vote.GRANTED
-            }
-            return Vote.DENIED
-        }
-
+        if (action == Action.CREATE && user is UserI) return Vote.GRANTED
+        if (action == Action.VIEW) return view(subject, user)
+        if (action == Action.DELETE) return delete(subject, user)
+        if (action == Action.UPDATE) return update(subject, user)
         if (action is CommentVoter.Action) return voteForComment(action)
         if (action is VoteVoter.Action) return voteForVote(action, subject)
-
-        if (subject is ArticleSimpleI) {
-            if (action == Action.DELETE && user is UserI && subject.createdBy.user.id == user.id) {
-                return Vote.GRANTED
-            }
-
-            if (action == Action.UPDATE && user is UserI && subject.createdBy.user.id == user.id) {
-                return Vote.GRANTED
-            }
-
-            return Vote.DENIED
-        }
-
-        if (action is Action) {
-            return Vote.DENIED
-        }
+        if (action is Action) return Vote.DENIED
 
         return Vote.ABSTAIN
     }
 
+    private fun view(subject: Any?, user: UserI?): Vote {
+        checkClass(ArticleAuthI::class, subject)
+        if (subject is ArticleAuthI<*>) {
+            return if (subject.isDeleted()) Vote.DENIED
+            else if (subject.draft && (user == null || subject.createdBy.user.id != user.id)) Vote.DENIED
+            else Vote.GRANTED
+        }
+        return Vote.DENIED
+    }
+
+    private fun delete(subject: Any?, user: UserI?): Vote {
+        checkClass(ArticleAuthI::class, subject)
+        if (subject is ArticleAuthI<*>) {
+            if (user is UserI && subject.createdBy.user.id == user.id) {
+                return Vote.GRANTED
+            }
+        }
+        return Vote.DENIED
+    }
+
+    private fun update(subject: Any?, user: UserI?): Vote {
+        checkClass(ArticleAuthI::class, subject)
+        if (subject is ArticleAuthI<*>) {
+            if (user is UserI && subject.createdBy.user.id == user.id) {
+                return Vote.GRANTED
+            }
+        }
+        return Vote.DENIED
+    }
+
     private fun voteForVote(action: VoteVoter.Action, subject: Any?): Vote {
         if (action == VoteVoter.Action.CREATE && subject is VoteEntity<*>) {
             val target = subject.target