From 50494d87c0c5f6eeda4dec66bd5c1d838278d4e9 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 18 Aug 2023 16:02:58 +0300
Subject: [PATCH] =?UTF-8?q?scheduler-service=20fix=20NullPointerException?=
 =?UTF-8?q?=20=D0=B2=20backend-api.RequestInfoAccepter:=20userRequest.id?=
 =?UTF-8?q?=20=D0=B8=20userId=20=D0=BF=D1=80=D0=BE=D0=B1=D1=80=D0=B0=D1=81?=
 =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D1=82=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B6=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduler/service/LauncherService.java         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java
index 8f6aa7b79..3c08e822b 100644
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherService.java
@@ -81,14 +81,15 @@ public class LauncherService extends QueueConsumer implements InitializingBean {
         launcherMap.insert(launcher);
         log.debug("successfully processed, new id {}", launcher.getId());
         if (Task.dbfExport_OUTV.equalsByKey(req.getTaskName())) {
-            processRequestOUTV(Task.dbfExport_OUTV, req);
+            processRequestOUTV(userRequest, req);
         } else {
             kafkaProducer.send(new ProducerRecord<>("launcher-" + launcher.getTask(), userRequest));
         }
     }
 
-    private void processRequestOUTV(Task dbfExport__OUTV, LauncherCommandRequest launcherNew) {
-        log.debug("Redirect {} to queue {}", dbfExport__OUTV, Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION);
+    private void processRequestOUTV(BaseRequest<LauncherCommandRequest> userRequest, LauncherCommandRequest launcherNew) {
+        log.debug("Redirect {} (userRequest.id={}) to queue {}", launcherNew.getTaskName(),
+                userRequest.getId(), Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION);
         var req = new PIClearingOutbondActionNewRequest();
         req.setSenderId(launcherNew.getSenderId());
         req.setAddresseeId(launcherNew.getAddresseeId());
@@ -99,10 +100,11 @@ public class LauncherService extends QueueConsumer implements InitializingBean {
 
         final String destination = Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION;
         BaseRequest<Object> request = new BaseRequest<>();
-        request.setId(null);
-        request.setActionType(ActionType.NEW);
+        request.setId(userRequest.getId()); // для уведомлений фронтэнда
+        request.setActionType(userRequest.getActionType());
         request.setRequestPayload(req);
-        request.setUserId(launcherNew.getUserId());
+        request.setUserId(userRequest.getUserId());
+        request.setCorrelationId(userRequest.getCorrelationId());
         Future<RecordMetadata> send = kafkaProducer.send(new ProducerRecord<>(destination, request));
         try {
             send.get();