post warning permissions

maxcom · Oct 29, 2024 · 96264d6 · 96264d6
1 parent 9975f9c
commit 96264d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/src/main/scala/ru/org/linux/warning/WarningController.scala b/src/main/scala/ru/org/linux/warning/WarningController.scala
@@ -35,22 +35,10 @@ class PostWarningRequest(@BeanProperty var topic: Topic, @BeanProperty var comme
 class WarningController(warningService: WarningService, topicDao: TopicDao, commentReadService: CommentReadService) {
   @RequestMapping(value = Array("/post-warning"), method = Array(RequestMethod.GET))
   def showForm(@ModelAttribute(value = "request") request: PostWarningRequest): ModelAndView = AuthUtil.AuthorizedOnly { currentUser =>
-    if (!warningService.canPostWarning(currentUser)) {
+    if (!warningService.canPostWarning(currentUser, request.topic, Option(request.comment))) {
       throw new AccessViolationException("Вы не можете отправить уведомление")
     }
 
-    if (request.topic.isDeleted) {
-      throw new AccessViolationException("Топик удален")
-    }
-
-    if (request.topic.isExpired) {
-      throw new AccessViolationException("Топик перемещен в архив")
-    }
-
-    if (request.comment!=null && request.comment.isDeleted) {
-      throw new AccessViolationException("Комментарий удален")
-    }
-
     // TODO rate limit warning
     // TODO show topic / comment
 
@@ -62,19 +50,19 @@ class WarningController(warningService: WarningService, topicDao: TopicDao, comm
   @RequestMapping(value = Array("/post-warning"), method = Array(RequestMethod.POST))
   def post(@ModelAttribute(value = "request")  request: PostWarningRequest,
            errors: Errors): ModelAndView = AuthUtil.AuthorizedOnly { currentUser =>
-    if (!warningService.canPostWarning(currentUser)) {
-      throw new AccessViolationException("Вы не можете отправить уведомление")
+    if (!warningService.canPostWarning(currentUser, request.topic, Option(request.comment))) {
+      errors.reject(null, "Вы не можете отправить уведомление")
     }
 
-    if (request.topic.isDeleted) {
+    if (request.topic.deleted) {
       errors.reject(null, "Топик удален")
     }
 
-    if (request.topic.isExpired) {
+    if (request.topic.expired) {
       errors.reject(null, "Топик перемещен в архив")
     }
 
-    if (request.comment!=null && request.comment.isDeleted) {
+    if (request.comment!=null && request.comment.deleted) {
       errors.reject(null, "Комментарий удален")
     }
 

diff --git a/src/main/scala/ru/org/linux/warning/WarningService.scala b/src/main/scala/ru/org/linux/warning/WarningService.scala
@@ -34,7 +34,7 @@ class WarningService(warningDao: WarningDao, eventService: UserEventService, use
     warningDao.postWarning(topicId = topic.id, commentId = comment.map(_.id), authorId = author.getId, message = message)
   }
 
-  def canPostWarning(user: CurrentUser): Boolean = {
-    user.moderator
+  def canPostWarning(user: CurrentUser, topic: Topic, comment: Option[Comment]): Boolean = {
+    !topic.deleted && !topic.expired && comment.forall(!_.deleted) && user.moderator
   }
 }