Add file info public

src/main/java/ru/soune/nocopy/handler/FileInteranlInfoHandler.java

@@ -76,7 +76,7 @@ public class FileInteranlInfoHandler implements RequestHandler {
                     FileStatus.BLOCKED.name(), FileStatus.ACTIVE.name()): fileRequest.getStatuses();
 
             Page<FileEntity> files = moderationService.getFilesForModeration(page, pageSize,
-                    fileRequest.getSortOrder(), fileRequest.getSortBy(), statuses);
+                    fileRequest.getSortOrder(), fileRequest.getSortBy(), statuses, fileRequest.getIsAppeal());
 
             List<Map<String, Object>> filesWithInfo = files.getContent().stream()
                     .map(file -> {

src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java

@@ -79,6 +79,10 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
     @Query("SELECT f FROM FileEntity f WHERE f.status IN :statuses")
     Page<FileEntity> findByStatusInAndSorted(@Param("statuses") List<String> statuses, Pageable pageable);
 
+
+    @Query("SELECT f FROM FileEntity f JOIN FileAppeal fa ON fa.fileId == f.id WHERE f.status IN :statuses")
+    Page<FileEntity> findByStatusInAndSortedWithAppeal(@Param("statuses") List<String> statuses, Pageable pageable);
+
     List<FileEntity> findByUserIdAndStatusIn(Long userId, List<FileStatus> statuses);
 
     @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.status IN :statuses")

src/main/java/ru/soune/nocopy/service/file/moderation/ModerationService.java

@@ -225,7 +225,7 @@ public class ModerationService {
 
     @Transactional(readOnly = true)
     public Page<FileEntity> getFilesForModeration(int page, int size, String sortDirection, String sortBy,
-                                                  List<String> statuses) {
+                                                  List<String> statuses, Boolean isAppeal) {
         if (sortDirection == null || sortDirection.isEmpty()) {
             sortDirection = "desc";
         }
@@ -236,7 +236,8 @@ public class ModerationService {
 
         Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.fromString(sortDirection), sortBy));
 
-        return fileEntityRepository.findByStatusInAndSorted(statuses, pageable);
+        return isAppeal ? fileEntityRepository.findByStatusInAndSortedWithAppeal(statuses, pageable):
+                fileEntityRepository.findByStatusInAndSorted(statuses, pageable);
     }