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

Split Entities for remove nullable variables

Browse Source
This commit is contained in:
Fabrice Lecomte
2020-01-28 11:08:43 +01:00
parent 3cdd1f3a46
commit 813d6857e9
52 changed files with 569 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/fr/dcproject/security/voter/ArticleVoter.kt
View File

@@ -1,8 +1,8 @@
package fr.dcproject.security.voter
import fr.dcproject.entity.User
import fr.dcproject.entity.ArticleSimpleI
import fr.dcproject.entity.UserI
import io.ktor.application.ApplicationCall
import fr.dcproject.entity.Article as ArticleEntity
import fr.dcproject.entity.Comment as CommentEntity
import fr.dcproject.entity.Vote as VoteEntity
@@ -16,23 +16,23 @@ 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 ArticleEntity? || subject is VoteEntity<*> || subject is CommentEntity<*>)
.and(subject is List<*> || subject is ArticleSimpleI? || 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 User) {
if (action == Action.CREATE && user is UserI) {
return Vote.GRANTED
}
if (action == Action.VIEW) {
if (subject is ArticleEntity) {
if (subject is ArticleSimpleI) {
return if (subject.isDeleted()) Vote.DENIED
else Vote.GRANTED
}
if (subject is List<*>) {
subject.forEach {
if (it !is ArticleEntity || it.isDeleted()) {
if (it !is ArticleSimpleI || it.isDeleted()) {
return Vote.DENIED
}
}
@@ -44,12 +44,12 @@ class ArticleVoter : Voter {
if (action is CommentVoter.Action) return voteForComment(action)
if (action is VoteVoter.Action) return voteForVote(action, subject)
if (subject is ArticleEntity) {
if (action == Action.DELETE && user is User && subject.createdBy?.userId == user.id) {
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 User && subject.createdBy?.userId == user.id) {
if (action == Action.UPDATE && user is UserI && subject.createdBy.user.id == user.id) {
return Vote.GRANTED
}
@@ -66,7 +66,7 @@ class ArticleVoter : Voter {
private fun voteForVote(action: VoteVoter.Action, subject: Any?): Vote {
if (action == VoteVoter.Action.CREATE && subject is VoteEntity<*>) {
val target = subject.target
if (target !is ArticleEntity) {
if (target !is ArticleSimpleI) {
return Vote.ABSTAIN
}
if (target.isDeleted()) {

20
src/main/kotlin/fr/dcproject/security/voter/CitizenVoter.kt
View File

@@ -1,7 +1,7 @@
package fr.dcproject.security.voter
import fr.dcproject.entity.Citizen
import fr.dcproject.entity.User
import fr.dcproject.entity.CitizenBasicI
import fr.dcproject.entity.UserI
import io.ktor.application.ApplicationCall
import io.ktor.locations.KtorExperimentalLocationsAPI
@@ -17,7 +17,7 @@ class CitizenVoter : Voter {
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action)
.and(subject is List<*> || subject is Citizen?)
.and(subject is List<*> || subject is CitizenBasicI?)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
@@ -28,13 +28,13 @@ class CitizenVoter : Voter {
if (action == Action.VIEW) {
if (user == null) return Vote.DENIED
if (subject is Citizen) {
if (subject is CitizenBasicI) {
return if (subject.isDeleted()) Vote.DENIED
else Vote.GRANTED
}
if (subject is List<*>) {
subject.forEach {
if (it !is Citizen || it.isDeleted()) {
if (it !is CitizenBasicI || it.isDeleted()) {
return Vote.DENIED
}
}
@@ -48,14 +48,14 @@ class CitizenVoter : Voter {
}
if (action == Action.UPDATE &&
user is User &&
subject is Citizen &&
subject.user?.id == user.id) {
user is UserI &&
subject is CitizenBasicI &&
subject.user.id == user.id) {
return Vote.GRANTED
}
if (action == Action.CHANGE_PASSWORD && user != null && subject is Citizen) {
val userToChange = subject.user ?: error("Citizen must have User")
if (action == Action.CHANGE_PASSWORD && user != null && subject is CitizenBasicI) {
val userToChange = subject.user
return if (user.id == userToChange.id) {
Vote.GRANTED
} else {

2
src/main/kotlin/fr/dcproject/security/voter/CommentVoter.kt
View File

@@ -38,7 +38,7 @@ class CommentVoter : Voter {
return Vote.DENIED
}
if (action == Action.UPDATE && user != null && subject is Comment<*> && user.id == subject.createdBy?.userId) {
if (action == Action.UPDATE && user != null && subject is Comment<*> && user.id == subject.createdBy.user.id) {
return Vote.GRANTED
}

16
src/main/kotlin/fr/dcproject/security/voter/ConstitutionVoter.kt
View File

@@ -1,9 +1,9 @@
package fr.dcproject.security.voter
import fr.dcproject.entity.Comment
import fr.dcproject.entity.User
import fr.dcproject.entity.ConstitutionSimple
import fr.dcproject.entity.UserI
import io.ktor.application.ApplicationCall
import fr.dcproject.entity.Constitution as ConstitutionEntity
import fr.dcproject.entity.Vote as VoteEntity
class ConstitutionVoter : Voter {
@@ -16,7 +16,7 @@ class ConstitutionVoter : 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 ConstitutionEntity? || subject is VoteEntity<*> || subject is Comment<*>)
.and(subject is List<*> || subject is ConstitutionSimple<*, *>? || subject is VoteEntity<*> || subject is Comment<*>)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {
@@ -26,13 +26,13 @@ class ConstitutionVoter : Voter {
}
if (action == Action.VIEW) {
if (subject is ConstitutionEntity) {
if (subject is ConstitutionSimple<*, *>) {
return if (subject.isDeleted()) Vote.DENIED
else Vote.GRANTED
}
if (subject is List<*>) {
subject.forEach {
if (it !is ConstitutionEntity || it.isDeleted()) {
if (it !is ConstitutionSimple<*, *> || it.isDeleted()) {
return Vote.DENIED
}
}
@@ -41,11 +41,11 @@ class ConstitutionVoter : Voter {
return Vote.DENIED
}
if (action == Action.DELETE && user is User && subject is ConstitutionEntity && subject.createdBy?.userId == user.id) {
if (action == Action.DELETE && user is UserI && subject is ConstitutionSimple<*, *> && subject.createdBy.user.id == user.id) {
return Vote.GRANTED
}
if (action == Action.UPDATE && user is User && subject is ConstitutionEntity && subject.createdBy?.userId == user.id) {
if (action == Action.UPDATE && user is UserI && subject is ConstitutionSimple<*, *> && subject.createdBy.user.id == user.id) {
return Vote.GRANTED
}
@@ -62,7 +62,7 @@ class ConstitutionVoter : Voter {
private fun voteForVote(action: VoteVoter.Action, subject: Any?): Vote {
if (action == VoteVoter.Action.CREATE && subject is VoteEntity<*>) {
val target = subject.target
if (target !is ConstitutionEntity) {
if (target !is ConstitutionSimple<*, *>) {
return Vote.ABSTAIN
}
if (target.isDeleted()) {

2
src/main/kotlin/fr/dcproject/security/voter/FollowVoter.kt
View File

@@ -47,7 +47,7 @@ class FollowVoter : Voter {
}
private fun voteView(user: UserEntity?, subject: FollowEntity<*>): Vote {
return if ((user != null && subject.createdBy?.user?.id == user.id) || subject.createdBy?.followAnonymous == false) Vote.GRANTED
return if ((user != null && subject.createdBy.user.id == user.id) || !subject.createdBy.followAnonymous) Vote.GRANTED
else Vote.DENIED
}
}

4
src/main/kotlin/fr/dcproject/security/voter/VoteVoter.kt
View File

@@ -24,7 +24,7 @@ class VoteVoter : Voter {
if (action == Action.VIEW && user != null) {
if (subject is VoteEntity<*>) {
return if (subject.createdBy?.userId != user.id) {
return if (subject.createdBy.user.id != user.id) {
Vote.DENIED
} else {
Vote.GRANTED
@@ -33,7 +33,7 @@ class VoteVoter : Voter {
if (subject is List<*>) {
subject.forEach {
if (it !is VoteEntity<*> || it.createdBy?.userId != user.id) {
if (it !is VoteEntity<*> || it.createdBy.user.id != user.id) {
return Vote.DENIED
}
}