diff --git a/pom.xml b/pom.xml
index 93a4cc6..0452f13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
ru.nbch
credit-tracker
- 2.21.5
+ 2.21.7
credit_tracker
Credit Tracker Application
diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java
index a7e5040..e573006 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java
@@ -196,7 +196,7 @@ public class MonitoringService {
String.format("%s_%s_%s.xml",
commonMembercode,
userPackage.getPackageName(),
- CTUtil.getDateFromReportFileName(reportName))
+ LocalDateTime.now().format(CTUtil.responseReportDateTimeFormatter))
));
MonitoringSignalResponse response = new MonitoringSignalResponse();
diff --git a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java
index 1664a42..81320dc 100644
--- a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java
+++ b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java
@@ -17,7 +17,7 @@ import ru.nbch.credit_tracker.entities.indic.Id;
public class CTUtil {
private static final DateTimeFormatter onlineReportDateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss");
- private static final DateTimeFormatter responseReportDateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss");
+ public static final DateTimeFormatter responseReportDateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss");
public static LocalDateTime parseDateFromReportFileName(String reportFileName) {
diff --git a/src/main/java/ru/nbch/credit_tracker/utils/ZipUtils.java b/src/main/java/ru/nbch/credit_tracker/utils/ZipUtils.java
index f17089e..67728cc 100644
--- a/src/main/java/ru/nbch/credit_tracker/utils/ZipUtils.java
+++ b/src/main/java/ru/nbch/credit_tracker/utils/ZipUtils.java
@@ -17,6 +17,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
@Slf4j
@@ -94,7 +95,7 @@ public class ZipUtils {
public static Path zipFile(Path fileForZip) throws IOException {
String fileName = fileForZip.getFileName().toString();
- Path zipFilePath = fileForZip.getParent().resolve(fileName + ".zip");
+ Path zipFilePath = fileForZip.getParent().resolve(FilenameUtils.removeExtension(fileName) + ".zip");
try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(fileForZip), 8 * 1024 * 1024);
BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(zipFilePath.toString()));
ZipOutputStream zos = new ZipOutputStream(bos)) {