treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return empty reports list if package was found, but folder is empty

Browse source
This commit is contained in:
Mikhail Trofimov 2025-07-03 17:49:29 +03:00
parent 7c4e81b18f
commit da024aaa3e
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
View file

@ -240,7 +240,7 @@ public class SignalFacade {
public ResponseEntity<MonitoringReportListResponse> getReportList(String username, String packageName) { public ResponseEntity<MonitoringReportListResponse> getReportList(String username, String packageName) {
try { try {
if (!signalService.isPackageExists(username, packageName)) { if (!signalService.isPackageExists(username, packageName)) {
throw clientExcp(SignalError.ERROR_016, XmlErrorFormat.MonitoringReportListError, packageName); throw clientExcp(SignalError.ERROR_012, XmlErrorFormat.MonitoringReportListError, packageName);
} }
String memberCode = username.substring(0, 6); String memberCode = username.substring(0, 6);
@ -248,30 +248,21 @@ public class SignalFacade {
String dirPath = config.getLoadDir() + File.separator + memberCode; String dirPath = config.getLoadDir() + File.separator + memberCode;
File folder = new File(dirPath); File folder = new File(dirPath);
if (folder.exists() && folder.isDirectory()) {
MonitoringReportListResponse.Reports reports = new MonitoringReportListResponse.Reports(); MonitoringReportListResponse.Reports reports = new MonitoringReportListResponse.Reports();
if (folder.exists() && folder.isDirectory()) {
File[] files = folder.listFiles(); File[] files = folder.listFiles();
if (files == null) { if (files != null) {
throw clientExcp(SignalError.ERROR_012, XmlErrorFormat.MonitoringReportListError, packageName);
}
for (File file : files) { for (File file : files) {
if (file.isFile() && file.getName().startsWith(filePrefix)) { if (file.isFile() && file.getName().startsWith(filePrefix)) {
reports.getReports().add(file.getName()); reports.getReports().add(file.getName());
} }
} }
}
if (reports.getReports().isEmpty()) { }
throw clientExcp(SignalError.ERROR_012, XmlErrorFormat.MonitoringReportListError, packageName);
} else {
MonitoringReportListResponse response = new MonitoringReportListResponse(); MonitoringReportListResponse response = new MonitoringReportListResponse();
response.setPackageName(packageName); response.setPackageName(packageName);
response.setReports(reports); response.setReports(reports);
return ResponseEntity.ok(response); return ResponseEntity.ok(response);
}
} else {
log.error("Пакет {} был найден в бд для memberCode {}, но ни одного архива не было найдено в папке {}", packageName, username, dirPath);
throw clientExcp(SignalError.ERROR_013, XmlErrorFormat.MonitoringReportListError, packageName);
}
} catch (Exception e) { } catch (Exception e) {
if (e instanceof SignalClientException) { if (e instanceof SignalClientException) {
throw (SignalClientException) e; throw (SignalClientException) e;