From 8755f3e1ca08a065b51c7115b2eb9cd767d2a4f2 Mon Sep 17 00:00:00 2001
From: psemenkov <psemenkov@mfd.ru>
Date: Fri, 19 May 2023 18:35:26 +0300
Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-313=20?=
 =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exporter/config/KafkaSenderConfig.java    | 30 +++++++++----------
 .../logic/data/enums/FilenameTemplate.java    |  1 +
 .../data/enums/FilenameTemplateTest.java      | 28 +++++++++++++++++
 3 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java

diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/KafkaSenderConfig.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/KafkaSenderConfig.java
index 687b73447..bd4994aca 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/KafkaSenderConfig.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/KafkaSenderConfig.java
@@ -40,7 +40,6 @@ public class KafkaSenderConfig {
         return KafkaProducerFactory.producerFactory(kafkaSettings);
     }
 
-//    @Autowired(required = false)
     @Bean("kafkaTemplate")
     public KafkaTemplate<String, Object> kafkaTemplate(ProducerFactory<String, Object> pf) {
         if (pf == null) {
@@ -49,19 +48,18 @@ public class KafkaSenderConfig {
         return new KafkaTemplate<>(pf);
     }
 
-//    @Autowired(required = false)
-@Bean
-public Supplier<KafkaSender> kafkaSenderSupplier(KafkaTemplate<String, Object> kafkaTemplate,
-                                                 ImdgProvider imdgProvider) {
-    ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
-    return () -> KafkaSender
-            .setup()
-            .setKafkaTemplate(kafkaTemplate)
-            .idGenerator(imdgIdGenerator::nextId)
-            .imdgProvider(s -> {
-                Imdg<RequestInfo> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class);
-                return imdg::insert;
-            })
-            .build();
-}
+    @Bean
+    public Supplier<KafkaSender> kafkaSenderSupplier(KafkaTemplate<String, Object> kafkaTemplate,
+                                                     ImdgProvider imdgProvider) {
+        ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
+        return () -> KafkaSender
+                .setup()
+                .setKafkaTemplate(kafkaTemplate)
+                .idGenerator(imdgIdGenerator::nextId)
+                .imdgProvider(s -> {
+                    Imdg<RequestInfo> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class);
+                    return imdg::insert;
+                })
+                .build();
+    }
 }
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 d534771cb..bc51d59e6 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
@@ -77,6 +77,7 @@ public enum FilenameTemplate {
         int res = 0;
         String timestampNow = utilFormatter.format(LocalDateTime.now());
         for (SftpFileInfo file : files) {
+            if (file.isDirectory()) continue;
             String name = file.getFilename();
             String[] splitName = name.split("_");
             if (splitName.length < 3)
diff --git a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java
new file mode 100644
index 000000000..a59594bc4
--- /dev/null
+++ b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java
@@ -0,0 +1,28 @@
+package ru.spcex.clearing.dbf.exporter.logic.data.enums;
+
+import com.jcraft.jsch.ChannelSftp.LsEntry;
+import org.junit.jupiter.api.Test;
+import org.springframework.integration.sftp.session.SftpFileInfo;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.*;
+
+class FilenameTemplateTest {
+
+    @Test
+    void countSameFilesInDir() {
+        LsEntry lsEntry = mock(LsEntry.class);
+        doReturn("DF-02_S_PRC2305191321_1.DBF").when(lsEntry).getFilename();
+        SftpFileInfo sftpFileInfo = spy(new SftpFileInfo(lsEntry));
+        doReturn(false).when(sftpFileInfo).isDirectory();
+        List<SftpFileInfo> files = List.of(sftpFileInfo);
+        int count = FilenameTemplate.df_section_dateTime.countSameFilesInDir("DF-02", files);
+        assertEquals(1, count);
+
+//        doReturn("DF-02_S_PRC230").when(lsEntry).getFilename();
+//        count = FilenameTemplate.df_section_dateTime.countSameFilesInDir("DF-02", files);
+//        assertEquals(0, count);
+    }
+}
\ No newline at end of file