From daa2e880ffeccac1962044ac0c4417f0cfd60ac2 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 10 Feb 2023 11:53:33 +0300
Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-189=20fix?=
 =?UTF-8?q?=20SDF=2003/11=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D1=83=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20(=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D0=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clearing/service/SdfCreatorBySTLDPayment.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java
index 9438e3c93..22f2c9c4e 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/SdfCreatorBySTLDPayment.java
@@ -65,19 +65,19 @@ public class SdfCreatorBySTLDPayment {
         /*Map<GroupWrapper, List<PaymentInstruction>> byOrder = */
         List<Map.Entry<GroupWrapper, Collection<List<PaymentInstruction>>>> allEntries = group(paymentInstructionFound);
 
+        Set<String> queueToSend = new HashSet<>();
         allEntries.forEach(entry -> {
             log.info("Group category {}, index {}", entry.getKey().category, entry.getKey().getSortIndex());
             GroupWrapper group = entry.getKey();
             Collection<List<PaymentInstruction>> bySenderGroups = entry.getValue();
-            Set<String> queueToSend = new HashSet<>();
             for (List<PaymentInstruction> bySenderGroup : bySenderGroups) {
                 Long senderIdSpecificToGroup = bySenderGroup.iterator().next().getSenderId();
                 log.info("Group senderId {}", senderIdSpecificToGroup);
                 queueToSend.add(saveSdfBeforeSendToKafka(senderIdSpecificToGroup, group.category, bySenderGroup, generationId));
             }
-            log.info("Send command target queue: {}", queueToSend);
-            sendToKafkaSDFRequests(queueToSend, generationId);
         });
+        log.info("Send command target queue: {}", queueToSend);
+        sendToKafkaSDFRequests(queueToSend, generationId);
         allEntries.forEach(entry -> {
             //category group
             GroupWrapper group = entry.getKey();
@@ -158,8 +158,8 @@ public class SdfCreatorBySTLDPayment {
             }
             SdfClearingRequest kafkaMessage = new SdfClearingRequest();
             kafkaMessage.setGroupId(generationId);
-            Long requestId = kafkaSender.sendRequestToQueue(Consts.SDF03_PROCESS, kafkaMessage);
-            log.debug("Send to kafka command, queue={}, requestId={}", kQueue, requestId);
+            Long requestId = kafkaSender.sendRequestToQueue(kQueue, kafkaMessage);
+            log.debug("Send to kafka command, queue={}, requestId={}, generationId={}", kQueue, requestId, generationId);
         }
     }