@@ -14,6 +14,7 @@ import ru.soune.nocopy.dto.file.AppealResponse;
|
||||
import ru.soune.nocopy.dto.file.FileEntityRequest;
|
||||
import ru.soune.nocopy.dto.file.FileModerationInfo;
|
||||
import ru.soune.nocopy.entity.file.FileEntity;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
import ru.soune.nocopy.service.file.moderation.ModerationService;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -71,9 +72,11 @@ public class FileInteranlInfoHandler implements RequestHandler {
|
||||
try {
|
||||
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 0;
|
||||
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||
List<String> statuses = fileRequest.getStatuses().isEmpty() ? List.of(FileStatus.MODERATION.name(),
|
||||
FileStatus.BLOCKED.name(), FileStatus.ACTIVE.name()): fileRequest.getStatuses();
|
||||
|
||||
Page<FileEntity> files = moderationService.getFilesForModeration(page, pageSize,
|
||||
fileRequest.getSortOrder(), fileRequest.getSortBy());
|
||||
fileRequest.getSortOrder(), fileRequest.getSortBy(), statuses);
|
||||
|
||||
List<Map<String, Object>> filesWithInfo = files.getContent().stream()
|
||||
.map(file -> {
|
||||
@@ -92,11 +95,8 @@ public class FileInteranlInfoHandler implements RequestHandler {
|
||||
moderationInfoMap.put("hasActiveAppeal", info != null && info.getHasActiveAppeal());
|
||||
|
||||
if (info != null && info.getActiveAppeal() != null) {
|
||||
Map<String, Object> appealInfoMap = new HashMap<>();
|
||||
appealInfoMap.put("appealId", info.getActiveAppeal().getAppealId());
|
||||
appealInfoMap.put("status", info.getActiveAppeal().getStatus());
|
||||
appealInfoMap.put("createdAt", info.getActiveAppeal().getCreatedAt());
|
||||
moderationInfoMap.put("appealInfo", appealInfoMap);
|
||||
AppealResponse appealResponse = moderationService.convertToResponse(info.getActiveAppeal());
|
||||
moderationInfoMap.put("appealInfo", appealResponse);
|
||||
} else {
|
||||
moderationInfoMap.put("appealInfo", null);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user