From a8eaf758c4efe67813d29293d936e55e1a3fb4e1 Mon Sep 17 00:00:00 2001
From: etreshenkov <etreshenkov@mfd.ru>
Date: Thu, 1 Jun 2023 17:33:49 +0300
Subject: [PATCH] creation DF-03/12 by PaymentInstruction

---
 .../session/stage/impl/FormingPaymentInstruction.java     | 8 ++++----
 .../clearing/dbf/exporter/services/CommandService.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java
index 4c7b635f6..57f8eda0c 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstruction.java
@@ -16,6 +16,7 @@ import ru.clearing.classes.statics.data.security.Security;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.importexport.SwtExporterRequest;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.service.builder.PaymentInstructionBuilder;
 import ru.spcex.clearing.session.stage.ISessionStage;
@@ -321,10 +322,9 @@ public class FormingPaymentInstruction implements ISessionStage {
         }
 
         if (sdf12GroupId != null) {
-            ExportToFileRequest exportToFileRequest = new ExportToFileRequest();
-            exportToFileRequest.setNameOfTable("DF-12");
-            exportToFileRequest.setSdfGroupId(sdf12GroupId);
-            kafkaSender.sendRequestToQueue(Consts.EXPORT_PROCESS, exportToFileRequest);
+            SwtExporterRequest swtExporterRequest = new SwtExporterRequest();
+            swtExporterRequest.setType("SDF_12");
+            kafkaSender.sendRequestToQueue(Consts.SWT_EXPORTER, swtExporterRequest);
         }
     }
 
diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
index dbd77268d..9a9afee90 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
@@ -77,7 +77,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
         Optional<Table> tableForExport = Arrays.stream(Table.values()).
                 filter(table -> table.getFilePrefix().equalsIgnoreCase(request.getNameOfTable())).findFirst();
         if (tableForExport.isEmpty()) {
-            throw new IllegalStateException("Unsupported table prefix");
+            throw new IllegalStateException(String.format("Unsupported table prefix: %s", request.getNameOfTable()));
         }
         ResultContainer resultContainer = ResultContainer.createNewTask(tableForExport.get());
         resultContainer.setGroupId(request.getSdfGroupId());