From 301d06a4c426da8a516fd091741a14288cbebdf7 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 28 Dec 2022 14:51:12 +0300
Subject: [PATCH] =?UTF-8?q?imdg=20http://jira.mfd.msk:8088/browse/CLS-198?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20eventType=20?=
 =?UTF-8?q?=D0=B2=20=5FHISTORY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clearing/classes/objects/BusinessEvent.java   | 10 ++++++++++
 .../AccountBalanceHistoryMapStore.java            |  3 ++-
 .../businessevent/AccountHistoryMapStore.java     |  3 ++-
 .../AccountRoutingHistoryMapStore.java            |  3 ++-
 .../businessevent/BankAccountHistoryMapStore.java |  3 ++-
 .../businessevent/CompanyHistoryMapStore.java     |  6 ++++--
 .../InformationAccountHistoryMapStore.java        |  3 ++-
 .../businessevent/RelationHistoryMapStore.java    |  3 ++-
 .../businessevent/SecurityHistoryMapStore.java    |  3 ++-
 .../businessevent/UserConnectHistoryMapStore.java |  3 ++-
 .../imdg/businessevent/UserHistoryMapStore.java   |  3 ++-
 .../imdg/services/AbstractUpdateMapService.java   | 15 +++++++++++----
 12 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java
index c077ebe2a..64a7508b4 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java
@@ -11,6 +11,7 @@ public abstract class BusinessEvent<T extends SpcexObjectBase /*BusinessObject*/
 
     private Instant eventTime;
     private Long userId;
+    private String eventType; // varchar(4)
 
     public Instant getEventTime() {
         return eventTime;
@@ -20,6 +21,14 @@ public abstract class BusinessEvent<T extends SpcexObjectBase /*BusinessObject*/
         this.eventTime = eventTime;
     }
 
+    public String getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -36,6 +45,7 @@ public abstract class BusinessEvent<T extends SpcexObjectBase /*BusinessObject*/
     public String toString() {
         return getClass().getSimpleName() + "{" +
                 "eventTime=" + eventTime +
+                "eventType=" + eventType +
                 ", userId=" + userId +
                 ", object=" + getObject() +
                 '}';
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountBalanceHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountBalanceHistoryMapStore.java
index 0540af846..7de3427c7 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountBalanceHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountBalanceHistoryMapStore.java
@@ -27,7 +27,7 @@ public class AccountBalanceHistoryMapStore extends TemplateEventMapStore<Account
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "ACCOUNT_BALANCE_ID", "COMPANY_ID", "CREATED_AT", "UPDATED_AT", "ACCOUNT_ID", "ACCOUNT_TYPE",
                 "ACCOUNT", "OPEN_BALANCE_AMOUNT", "START_BALANCE_AMOUNT", "CLOSE_BALANCE_AMOUNT",
                 "TRADE_BALANCE_AMOUNT", "FREE_BALANCE_AMOUNT", "CHANGE_BALANCE_AMOUNT",
@@ -42,6 +42,7 @@ public class AccountBalanceHistoryMapStore extends TemplateEventMapStore<Account
         Object[] args = new Object[]{
                 updateLog.getId(),
                 TimeUtil.toDateFromInstant(updateLog.getEventTime()),
+                updateLog.getEventType(),
                 updateLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java
index 696dedba4..0f24bb82a 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java
@@ -27,7 +27,7 @@ public class AccountHistoryMapStore extends TemplateEventMapStore<AccountHistory
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "ACCOUNT_ID", "CREATED_AT", "UPDATED_AT", "ACCOUNT", "ACCOUNT_TYPE", "RELATION_ID", "ACCOUNT_STATUS", "PROCESSING_SIGN", "COMPANY_ID"
         };
     }
@@ -38,6 +38,7 @@ public class AccountHistoryMapStore extends TemplateEventMapStore<AccountHistory
         Object[] args = new Object[]{
                 updateLog.getId(),
                 TimeUtil.toDateFromInstant(updateLog.getEventTime()),
+                updateLog.getEventType(),
                 updateLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java
index dc71a1316..301724bb6 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountRoutingHistoryMapStore.java
@@ -27,7 +27,7 @@ public class AccountRoutingHistoryMapStore extends TemplateEventMapStore<Account
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "ACCOUNT_ROUTING_ID", "DESTINATION_ID", "RELATION_ID", "SOURCE_ID"
         };
     }
@@ -38,6 +38,7 @@ public class AccountRoutingHistoryMapStore extends TemplateEventMapStore<Account
         Object[] args = new Object[]{
                 updateLog.getId(),
                 TimeUtil.toDateFromInstant(updateLog.getEventTime()),
+                updateLog.getEventType(),
                 updateLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java
index 7d88eae0e..b06c486d4 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java
@@ -27,7 +27,7 @@ public class BankAccountHistoryMapStore extends TemplateEventMapStore<BankAccoun
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "BANK_ACCOUNT_ID", "ACCOUNT_ID", "BANK_IDENTIFICATION_CODE", "BANK_NAME", "CORRESPONDENT_ACCOUNT", "CORRESPONDENT_ACCOUNT_NAME", "CURRENCY", "DESTINATION", "IBAN", "INTERNATIONAL_TRANSFER_SIGN", "SWIFT_CODE", "TAXPAYER_IDENTIFICATION_NUMBER", "TAX_REGISTRATION_REASON_CODE", "ACCOUNT", "COMPANY_ID"
         };
     }
@@ -38,6 +38,7 @@ public class BankAccountHistoryMapStore extends TemplateEventMapStore<BankAccoun
         Object[] args = new Object[]{
                 historyLog.getId(),
                 TimeUtil.toDateFromInstant(historyLog.getEventTime()),
+                historyLog.getEventType(),
                 historyLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java
index 0ba4f25b9..980680214 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java
@@ -32,14 +32,14 @@ public class CompanyHistoryMapStore extends BusinessEventMapStore<CompanyHistory
     @Override
     public String[] getFields() {
         return new String[]{
-                "id", "event_time", "event_user_id",
+                "id", "event_time", "event_type", "event_user_id",
                 "company_id", "created_at", "updated_at", "trading_code", "clearing_code", "registration_code", "workflow_status", "short_name", "full_name"
         };
     }
 
     public String[] getFieldsForCompanyInfo() {
         return new String[]{
-                "id", "event_time", "event_user_id",
+                "id", "event_time", "event_type", "event_user_id",
                 "company_info_id", "company_id", "corporation_sole_type", "country_code", "description",
                 "professional_sign", "legal_kind", "organization_type", "residence", "short_name_eng", "full_name_eng"
 //                ,"short_name", "full_name", "trading_code", "clearing_code", "registration_code"
@@ -58,6 +58,7 @@ public class CompanyHistoryMapStore extends BusinessEventMapStore<CompanyHistory
             Object[] args = new Object[]{
                     companyHistory.getId(),
                     TimeUtil.toDateFromInstant(companyHistory.getEventTime()),
+                    companyHistory.getEventType(),
                     companyHistory.getUserId(),
 
                     company.getId(), // company_id
@@ -94,6 +95,7 @@ public class CompanyHistoryMapStore extends BusinessEventMapStore<CompanyHistory
         return new ArrayList<>(Arrays.asList(
                 rootUpdate.getId(),
                 TimeUtil.toDateFromInstant(rootUpdate.getEventTime()),
+                rootUpdate.getEventType(),
                 rootUpdate.getUserId(),
 
                 companyInfo.getId(), // company_info_id
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java
index 2cc1fb804..9805a3d2a 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/InformationAccountHistoryMapStore.java
@@ -27,7 +27,7 @@ public class InformationAccountHistoryMapStore extends TemplateEventMapStore<Inf
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "INFORMATION_ACCOUNT_ID", "ACCOUNT_ID", "CLEARING_ACCOUNT_ID", "COMPANY_ID"
         };
     }
@@ -38,6 +38,7 @@ public class InformationAccountHistoryMapStore extends TemplateEventMapStore<Inf
         Object[] args = new Object[]{
                 historyLog.getId(),
                 TimeUtil.toDateFromInstant(historyLog.getEventTime()),
+                historyLog.getEventType(),
                 historyLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java
index 09cb8499c..e6c04d67a 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/RelationHistoryMapStore.java
@@ -28,7 +28,7 @@ public class RelationHistoryMapStore extends TemplateEventMapStore<RelationHisto
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "RELATION_ID", "CREATED_AT", "UPDATED_AT", "CONSUMER_ID", "SUPPLIER_ID", "SERVICE_STATUS", "SERVICE", "SERVICE_PRODUCT", "COMMENT"
         };
     }
@@ -39,6 +39,7 @@ public class RelationHistoryMapStore extends TemplateEventMapStore<RelationHisto
         Object[] args = new Object[]{
                 updateLog.getId(),
                 TimeUtil.toDateFromInstant(updateLog.getEventTime()),
+                updateLog.getEventType(),
                 updateLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SecurityHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SecurityHistoryMapStore.java
index c986bbad1..a2cd1de19 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SecurityHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/SecurityHistoryMapStore.java
@@ -27,7 +27,7 @@ public class SecurityHistoryMapStore extends TemplateEventMapStore<SecurityHisto
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "SECURITY_ID", "CREATED_AT", "UPDATED_AT", "INSTRUMENT_TYPE", "ISSUER_ID", "SHORT_NAME", "FULL_NAME", "SHORT_NAME_ENG", "FULL_NAME_ENG", "SECURITY_SYMBOL", "WORKFLOW_STATUS"
         };
     }
@@ -38,6 +38,7 @@ public class SecurityHistoryMapStore extends TemplateEventMapStore<SecurityHisto
         Object[] args = new Object[]{
                 updateLog.getId(),
                 TimeUtil.toDateFromInstant(updateLog.getEventTime()),
+                updateLog.getEventType(),
                 updateLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java
index e2f79fd69..84470739a 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java
@@ -27,7 +27,7 @@ public class UserConnectHistoryMapStore extends TemplateEventMapStore<UserConnec
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "USER_CONNECT_ID", "CREATED_AT", "UPDATED_AT", "USER_ID", "CONNECTION_TIME", "DISCONNECTION_TIME", "SERVER_IP", "CLIENT_IP", "CONNECTION_STATE", "CLEARING_DATE", "ERROR_CODE", "ERROR_TEXT"
         };
     }
@@ -38,6 +38,7 @@ public class UserConnectHistoryMapStore extends TemplateEventMapStore<UserConnec
         Object[] args = new Object[]{
                 historyLog.getId(),
                 TimeUtil.toDateFromInstant(historyLog.getEventTime()),
+                historyLog.getEventType(),
                 historyLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java
index d1932cf4e..cd0e43e63 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserHistoryMapStore.java
@@ -27,7 +27,7 @@ public class UserHistoryMapStore extends TemplateEventMapStore<UserHistory> {
 
     @Override
     public String[] getFields() {
-        return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
+        return new String[]{"ID", "EVENT_TIME", "EVENT_TYPE", "EVENT_USER_ID",
                 "USER_CLS_ID", "CREATED_AT", "UPDATED_AT", "IDENTIFIER"
         };
     }
@@ -38,6 +38,7 @@ public class UserHistoryMapStore extends TemplateEventMapStore<UserHistory> {
         Object[] args = new Object[]{
                 historyLog.getId(),
                 TimeUtil.toDateFromInstant(historyLog.getEventTime()),
+                historyLog.getEventType(),
                 historyLog.getUserId(),
 
                 object.getId(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractUpdateMapService.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractUpdateMapService.java
index f90e5ee06..e447f052c 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractUpdateMapService.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractUpdateMapService.java
@@ -15,9 +15,12 @@ import java.time.Instant;
 
 public abstract class AbstractUpdateMapService implements InitializingBean,
         EntryAddedListener<Long, Object>, EntryUpdatedListener<Long, Object>, EntryRemovedListener<Long, Object> {
-    protected final String EVENT_CREATE = "CREATE";
-    protected final String EVENT_UPDATE = "UPDATE";
-    protected final String EVENT_DELETE = "DELETE";
+    /**
+     * EVENT_TYPE_DICTIONARY
+     */
+    protected final String EVENT_CREATE = "CRET";
+    protected final String EVENT_UPDATE = "UPDT";
+    protected final String EVENT_DELETE = "DELT";
     protected final HazelcastInstance hazelcastServerInstance;
     private final Logger log = LoggerFactory.getLogger(this.getClass());
 
@@ -53,7 +56,11 @@ public abstract class AbstractUpdateMapService implements InitializingBean,
     protected void createBusinessEvent(BusinessEvent businessEvent, String eventType) {
         businessEvent.setId(hazelcastServerInstance.getIdGenerator(IMDGDistributedNames.MAP_SEQUENCE_NAME).newId());
         businessEvent.setEventTime(Instant.now());
-        businessEvent.setUserId(0L); // todo откуда брать пользователя, причину изменений?
+        if (eventType != null && eventType.length() > 4) { // never
+            eventType = eventType.substring(0, 4);
+        }
+        businessEvent.setEventType(eventType);
+        businessEvent.setUserId(0L);
         log.debug("business event created {} {}", businessEvent.getClass().getName(), businessEvent);
     }
 }