@@ -13,13 +13,10 @@ public class FileViolationSummaryDTO {
|
|||||||
private String fileId;
|
private String fileId;
|
||||||
private Integer supportId;
|
private Integer supportId;
|
||||||
private String fileName;
|
private String fileName;
|
||||||
private String storedFileName;
|
|
||||||
private String filePath;
|
|
||||||
private Long fileSize;
|
private Long fileSize;
|
||||||
private String mimeType;
|
private String mimeType;
|
||||||
private FileStatus status;
|
private FileStatus status;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
private long violationCount;
|
private long violationCount;
|
||||||
private LocalDateTime latestViolationDate;
|
private LocalDateTime latestViolationDate;
|
||||||
private List<ViolationInfoDTO> violations;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,10 +20,7 @@ import ru.soune.nocopy.repository.ViolationRepository;
|
|||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Collections;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@@ -72,6 +69,10 @@ public class ViolationService {
|
|||||||
List<Violation> fileViolations = violationsByFileId.getOrDefault(file.getId(),
|
List<Violation> fileViolations = violationsByFileId.getOrDefault(file.getId(),
|
||||||
Collections.emptyList());
|
Collections.emptyList());
|
||||||
|
|
||||||
|
if (fileViolations.isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
LocalDateTime latestDate = fileViolations.stream()
|
LocalDateTime latestDate = fileViolations.stream()
|
||||||
.map(Violation::getCreatedDate)
|
.map(Violation::getCreatedDate)
|
||||||
.max(LocalDateTime::compareTo)
|
.max(LocalDateTime::compareTo)
|
||||||
@@ -89,6 +90,7 @@ public class ViolationService {
|
|||||||
.latestViolationDate(latestDate)
|
.latestViolationDate(latestDate)
|
||||||
.build();
|
.build();
|
||||||
})
|
})
|
||||||
|
.filter(Objects::nonNull)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user