deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

refactor study Role.canWrite

Browse source
This commit is contained in:
Thibault Duplessis 2017-02-14 14:41:32 +01:00
parent 6e628a1aa9
commit 7c5bb2b18c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/study/src/main/StudyApi.scala
View file

@ -192,9 +192,9 @@ final class StudyApi(
(study isOwner byUserId) ?? {
val role = StudyMember.Role.byId.getOrElse(roleStr, StudyMember.Role.Read)
study.members.get(userId) ifTrue study.isPublic foreach { member =>
if (member.role == StudyMember.Role.Read && role == StudyMember.Role.Write)
if (!member.role.canWrite && role.canWrite)
bus.publish(lila.hub.actorApi.study.StudyMemberGotWriteAccess(userId, studyId.value), 'study)
else if (member.role == StudyMember.Role.Write && role == StudyMember.Role.Read)
else if (member.role.canWrite && !role.canWrite)
bus.publish(lila.hub.actorApi.study.StudyMemberLostWriteAccess(userId, studyId.value), 'study)
}
studyRepo.setRole(study, userId, role) >>-

8
modules/study/src/main/StudyMember.scala
View file

@ -9,7 +9,7 @@ case class StudyMember(
role: StudyMember.Role,
addedAt: DateTime) {
def canContribute = role == StudyMember.Role.Write
def canContribute = role.canWrite
}
object StudyMember {
@ -18,10 +18,10 @@ object StudyMember {
def make(user: User) = StudyMember(id = user.id, role = Role.Read, addedAt = DateTime.now)
sealed abstract class Role(val id: String)
sealed abstract class Role(val id: String, val canWrite: Boolean)
object Role {
case object Read extends Role("r")
case object Write extends Role("w")
case object Read extends Role("r", false)
case object Write extends Role("w", true)
val byId = List(Read, Write).map { x => x.id -> x }.toMap
}
}