From be0116212528897b9326a22ca19c646e1a53c1c0 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Mon, 29 May 2023 20:15:45 +0300
Subject: [PATCH] =?UTF-8?q?meta=203.5.0.30=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-344=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExecutionDepositHistoryMapStore.java           |  3 ++-
 .../imdg/businessevent/SessionHistoryMapStore.java |  6 ++++--
 .../imdg/structure/CheckerBusinessMapStore.java    | 14 +++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java
index 8ef0d462f..6aa6cfe82 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionDepositHistoryMapStore.java
@@ -32,7 +32,7 @@ public class ExecutionDepositHistoryMapStore extends TemplateEventMapStore<Execu
                 "TRADING_DATE", "TRADING_CLEARING_REGISTRY_ID", "MARKET", "PRICE", "LOTS", "QUANTITY", "FIRST_LEG_AMOUNT",
                 "SECOND_LEG_AMOUNT", "INTEREST_AMOUNT", "SIDE", "SETTLEMENT_CURRENCY", "COMPANY_ID", "DURATION",
                 "FIRST_LEG_SETTLEMENT_DATE", "SECOND_LEG_SETTLEMENT_DATE", "FIRST_LEG_SETTLEMENT_CODE",
-                "SECOND_LEG_SETTLEMENT_CODE", "SECURITY_FULL_NAME", "SECURITY_SYMBOL", "SECURITY_ID", "CONTRACT",
+                "SECOND_LEG_SETTLEMENT_CODE", "SECURITY_FULL_NAME", "SECURITY_SYMBOL", "SECURITY_CODE", "SECURITY_ID", "CONTRACT",
                 "COUNTER_PARTY_ID", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE"
         };
     }
@@ -70,6 +70,7 @@ public class ExecutionDepositHistoryMapStore extends TemplateEventMapStore<Execu
                 object.getSecondLegSettlementCode(),
                 object.getSecurityFullName(),
                 object.getSecuritySymbol(),
+                object.getSecurityCode(),
                 object.getSecurityId(),
                 object.getContract(),
                 object.getCounterPartyId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SessionHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SessionHistoryMapStore.java
index bd20bc481..983861037 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SessionHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SessionHistoryMapStore.java
@@ -28,7 +28,8 @@ public class SessionHistoryMapStore extends TemplateEventMapStore<SessionHistory
     @Override
     public String[] getFields() {
         return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE",
-                "SESSION_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "SESSION_STATUS", "COMPANY_ID", "SECURITY_ID", "USER_ID", "SECTION", "SESSION_TYPE"
+                "SESSION_ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "SESSION_STATUS", "COMPANY_ID", "SECURITY_ID", "USER_ID", "SECTION", "SESSION_TYPE",
+                "WORKFLOW_STATUS"
         };
     }
 
@@ -50,7 +51,8 @@ public class SessionHistoryMapStore extends TemplateEventMapStore<SessionHistory
                 object.getSecurityId(),
                 object.getUserId(),
                 object.getSection(),
-                object.getSessionType()
+                object.getSessionType(),
+                object.getWorkflowStatus()
         };
         return args;
     }
diff --git a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/CheckerBusinessMapStore.java b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/CheckerBusinessMapStore.java
index bec21d209..b1bfc8cac 100644
--- a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/CheckerBusinessMapStore.java
+++ b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/CheckerBusinessMapStore.java
@@ -61,11 +61,19 @@ public class CheckerBusinessMapStore<T> {
         if (settingOperations != null) {
             for (SettingOperation settingOperation : settingOperations) {
                 Method method = null;
+                Class<?> theClass = clazz;
                 try {
-                    method = clazz.getDeclaredMethod(settingOperation.getMethodName(), settingOperation.getParameterTypes());
+                    method = theClass.getDeclaredMethod(settingOperation.getMethodName(), settingOperation.getParameterTypes());
                 } catch (NoSuchMethodException exception) {
-                    log.debug("settingOperations for Superclass " + clazz.getName());
-                    method = clazz.getSuperclass().getDeclaredMethod(settingOperation.getMethodName(), settingOperation.getParameterTypes());
+                    log.debug("settingOperations for Superclass " + theClass.getName());
+                    try {
+                        theClass = theClass.getSuperclass();
+                        method = theClass.getDeclaredMethod(settingOperation.getMethodName(), settingOperation.getParameterTypes());
+                    } catch (NoSuchMethodException exception2) { // Имеется некоторое наследование для удобства обработки данных.
+                        theClass = theClass.getSuperclass();
+                        log.debug("settingOperations for Superclass 2 " + theClass.getName());
+                        method = clazz.getSuperclass().getDeclaredMethod(settingOperation.getMethodName(), settingOperation.getParameterTypes());
+                    }
                 }
                 method.invoke(predictableObj, settingOperation.getParams());
             }