From f7b129bf2459069cb817c1f79d31fa59d80595ee Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 19 May 2023 18:26:31 +0300
Subject: [PATCH] =?UTF-8?q?dbf-exporter=20http://jira.mfd.msk:8088/browse/?=
 =?UTF-8?q?CLS-313=D0=B8=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2=20=D0=B8?=
 =?UTF-8?q?=20=D0=B4=D0=B5=D1=82=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8E=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=BD=D0=B3=D0=B0=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dbf/exporter/logic/data/enums/FilenameTemplate.java       | 4 ++++
 .../clearing/dbf/exporter/logic/stages/PrepareDBFFile.java    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
index 03327e824..d534771cb 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
@@ -79,10 +79,14 @@ public enum FilenameTemplate {
         for (SftpFileInfo file : files) {
             String name = file.getFilename();
             String[] splitName = name.split("_");
+            if (splitName.length < 3)
+                throw new IllegalArgumentException("Filename did not contains 3 or 4 separator \"_\": " + name);
             String prefix = splitName[0];
             String timestamp = splitName[2];
 
             if (prefix.equalsIgnoreCase(prefixOfTable) && timestamp.contains(timestampNow)) {
+                if (splitName.length < 4)
+                    throw new IllegalArgumentException("Filename did not contains 4 separator \"_\": " + name);
                 String counter = splitName[3];
                 int positionOfDot = counter.indexOf('.');
                 if (positionOfDot != -1) {
diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
index ff8acaed5..2b88238c0 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
@@ -39,6 +39,7 @@ public class PrepareDBFFile extends Stage implements InitializingBean {
     public StageResult process(ResultContainer resultContainer) {
         Objects.requireNonNull(resultContainer.getTableForExport());
         List<SftpFileInfo> files = gateway.listFiles(settings.getStore().getOutDir());
+        log.debug("From sFTP dir \"{}\" list {} file names.", settings.getStore().getOutDir(), files.size());
         Table table = resultContainer.getTableForExport();
         LocalDateTime currentDateTime = LocalDateTime.now();
         resultContainer.setRegistrationDateTime(currentDateTime);
@@ -64,6 +65,7 @@ public class PrepareDBFFile extends Stage implements InitializingBean {
             throw new IOException("Output directory " + outDirPath + " is file.");
         if (!outDirFile.exists()) Files.createDirectories(outDirFile.toPath());
         this.outDir = outDirPath;
+        log.info("Output directory: {}", outDirFile.getAbsolutePath());
     }
 
     private static final Map<Table, FilenameTemplate> nameTemplates = new EnumMap<>(Table.class);