From 964910ec691ed0cba8e5591fe99f2193830067f0 Mon Sep 17 00:00:00 2001 From: vladp Date: Fri, 27 Mar 2026 16:37:20 +0700 Subject: [PATCH] dev add reason entity --- .../java/ru/soune/nocopy/handler/FileEntityHandler.java | 3 --- .../service/file/moderation/ModerationService.java | 9 +++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java index 3d68059..6cf8112 100644 --- a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java @@ -790,9 +790,6 @@ public class FileEntityHandler implements RequestHandler { fileMap.put("fileName", file.getOriginalFileName()); fileMap.put("userId", file.getUserId()); fileMap.put("status", file.getStatus() != null ? file.getStatus().name() : null); - fileMap.put("createdAt", file.getCreatedAt()); - fileMap.put("fileSize", file.getFileSize()); - fileMap.put("formattedSize", fileEntityService.formatFileSize(file.getFileSize())); Map moderationInfoMap = new HashMap<>(); moderationInfoMap.put("hasActiveAppeal", info != null && info.getHasActiveAppeal()); diff --git a/src/main/java/ru/soune/nocopy/service/file/moderation/ModerationService.java b/src/main/java/ru/soune/nocopy/service/file/moderation/ModerationService.java index 188888c..8e3cfec 100644 --- a/src/main/java/ru/soune/nocopy/service/file/moderation/ModerationService.java +++ b/src/main/java/ru/soune/nocopy/service/file/moderation/ModerationService.java @@ -60,6 +60,7 @@ public class ModerationService { .moderationReasonId(request.getModerationReasonId()) .comment(request.getComment()) .build(); + moderationLogRepository.save(log); file.setStatus(request.getNewStatus()); @@ -91,7 +92,7 @@ public class ModerationService { throw new SecurityException("User is not the owner of this file"); } - if (!canAppeal(file)) { + if (canAppeal(file)) { throw new InvalidAppealException("Cannot appeal this file. Current status: " + file.getStatus()); } @@ -156,11 +157,7 @@ public class ModerationService { * Проверка, можно ли подать апелляцию на файл */ public boolean canAppeal(FileEntity file) { - if (file.getStatus() != FileStatus.BLOCKED) { - return false; - } - - return true; + return file.getStatus() == FileStatus.BLOCKED; } /**