From 8d6b5ef9be517eb930b4e1bec913e798d0dfed99 Mon Sep 17 00:00:00 2001
From: aalehin <aalehin@mfd.ru>
Date: Mon, 19 Dec 2022 16:33:55 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-63 --- fix up

---
 .../request/cud/utilities/UserAuthAction.java | 40 +++++++++++++++++++
 .../backendapi/service/UserAuthProcessor.java |  6 +--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java
index b5559e8dd..f7f55519d 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/UserAuthAction.java
@@ -56,4 +56,44 @@ public class UserAuthAction implements IAction<UserAuthRequest> {
     public ActionType getActionType() {
         return ActionType.SYSTEM;
     }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public List<String> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(List<String> roles) {
+        this.roles = roles;
+    }
+
+    public Instant getTime() {
+        return time;
+    }
+
+    public void setTime(Instant time) {
+        this.time = time;
+    }
+
+    public String getServerIp() {
+        return serverIp;
+    }
+
+    public void setServerIp(String serverIp) {
+        this.serverIp = serverIp;
+    }
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
 }
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 975b75dee..97f35a7a6 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
@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import ru.spcex.clearing.backendapi.controller.request.cud.utilities.UserAuthAction;
 import ru.spcex.clearing.backendapi.controller.request.cud.utilities.UserLogoutAction;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.utilities.UserAuthRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.utilities.UserLogoutRequest;
 import ru.spcex.platform.utils.log.ExceptionUtils;
 
@@ -34,15 +33,14 @@ public class UserAuthProcessor {
     }
 
     public void sendAuthSuccessEvent(String identifier, Collection<String> roles, String userIp, String serverIp) {
-        UserAuthAction authEvent = new UserAuthAction();
-        UserAuthRequest requestData = authEvent.toRequest();
+        UserAuthAction requestData = new UserAuthAction();
         requestData.setUsername(identifier);
         requestData.setTime(Instant.now());
         requestData.setRoles(new ArrayList<>(roles));
         requestData.setServerIp(serverIp + ":" + serverPort); //getServerAddress() + ":" + serverPort
         requestData.setClientIp(userIp);
         try {
-            operator.sendRequestToQueue(Consts.USER_AUTH_SUCCESS, authEvent);
+            operator.sendRequestToQueue(Consts.USER_AUTH_SUCCESS, requestData);
         } catch (Throwable e) { //ExecutionException | InterruptedException
             log.error(ExceptionUtils.getStackTrace(e));
         }