From 316e2fe042da9bdf477025401b4d228aab427fe9 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 5 Apr 2023 13:18:59 +0300
Subject: [PATCH] =?UTF-8?q?backend-api,=20UserMapStore:=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20BaseRequest.?=
 =?UTF-8?q?userId=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/queue/AbstractQueueController.java           | 2 +-
 .../ru/spcex/clearing/backendapi/service/IOperator.java     | 2 +-
 .../clearing/backendapi/service/UserAuthProcessor.java      | 4 ++--
 .../clearing/backendapi/service/impl/OperatorImpl.java      | 6 ++++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java
index 6aa77ebba..5718d77e3 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java
@@ -15,7 +15,7 @@ public class AbstractQueueController {
 
     protected <T> CudResponse processRequest(String destination, IAction<T> iAction) throws ExecutionException, InterruptedException {
         CudResponse responseToClient = new CudResponse();
-        responseToClient.setPayload(operator.sendRequestToQueue(destination, iAction));
+        responseToClient.setPayload(operator.sendRequestToQueue(destination, iAction, true));
         responseToClient.setCode(0);
         responseToClient.setMessage("success");
         return responseToClient;
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/IOperator.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/IOperator.java
index 6d86d7660..67c331b7a 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/IOperator.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/IOperator.java
@@ -6,5 +6,5 @@ import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import java.util.concurrent.ExecutionException;
 
 public interface IOperator {
-    QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction) throws ExecutionException, InterruptedException;
+    QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction, boolean appendUserId) throws ExecutionException, InterruptedException;
 }
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAuthProcessor.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAuthProcessor.java
index a98799a8a..ba9789792 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAuthProcessor.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/UserAuthProcessor.java
@@ -47,7 +47,7 @@ public class UserAuthProcessor {
         requestData.setSurname(surname);
         requestData.setMiddleName(middleName);
         try {
-            operator.sendRequestToQueue(Consts.USER_AUTH_SUCCESS, authEvent);
+            operator.sendRequestToQueue(Consts.USER_AUTH_SUCCESS, authEvent, false);
         } catch (Throwable e) { //ExecutionException | InterruptedException
             log.error(ExceptionUtils.getStackTrace(e));
         }
@@ -59,7 +59,7 @@ public class UserAuthProcessor {
         requestData.setUsername(identifier);
         requestData.setTime(Instant.now());
         try {
-            operator.sendRequestToQueue(Consts.USER_LOGOUT_SUCCESS, logoutEvent);
+            operator.sendRequestToQueue(Consts.USER_LOGOUT_SUCCESS, logoutEvent, false);
         } catch (Throwable e) {
             log.error(ExceptionUtils.getStackTrace(e));
         }
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java
index c3dbe2c7d..b039cdd82 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/OperatorImpl.java
@@ -64,13 +64,15 @@ public class OperatorImpl implements IOperator {
     }
 
     @Override
-    public QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction) throws ExecutionException, InterruptedException {
+    public QueueSuccessResponse sendRequestToQueue(String destination, IAction<?> iAction, boolean appendUserId) throws ExecutionException, InterruptedException {
         throwValidate(destination, iAction);
         BaseRequest<Object> request = new BaseRequest<>();
         request.setId(idGenerator.nextId());
         request.setActionType(iAction.getActionType());
         request.setRequestPayload(iAction.toRequest());
-        request.setUserId(currentUserId());
+        if (appendUserId) {
+            request.setUserId(currentUserId());
+        }
         //сохраняет данные о запросе в хранилище
         saveRequestToStorage(destination, request);
         Future<RecordMetadata> send = kafka.send(new ProducerRecord<>(destination, request));