http://jira.mfd.msk:8088/browse/CLS-870

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/Registry.java

@@ -61,6 +61,7 @@ public class Registry extends BusinessObject implements Cloneable {
     private String sessionType;
     private Long paymentId;
     private String section;
+    private String market;
 
     public Long getCompanyId() {
         return companyId;
@@ -444,6 +445,14 @@ public class Registry extends BusinessObject implements Cloneable {
         this.section = section;
     }
 
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String market) {
+        this.market = market;
+    }
+
     @Override
     public Registry clone() {
         try {

clearing-parent/db-scripts/src/main/resources/db/DDL.sql

@@ -2082,7 +2082,7 @@ GRANT ALL PRIVILEGES ON TABLE TRADING_CLEARING_REGISTRY_LIST_HISTORY TO clearing
 
 -- registry - Регистр активов, обязательств и требований УК
 DROP TABLE IF EXISTS REGISTRY;
-CREATE TABLE REGISTRY(COMPANY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), REGISTRY_DESIGNATION varchar(4), REGISTRY_INSTRUMENT_TYPE varchar(4), REGISTRY_CAPACITY varchar(4), REGISTRY_UNIT varchar(4), REGISTRY_CODE varchar(4), TRADING_CLEARING_REGISTRY_ID bigint, TRADING_CLEARING_REGISTRY varchar(50), REGISTRY_STATUS varchar(4), SECURITY_SYMBOL varchar(255), BALANCE numeric(72,18), BALANCE_RUB numeric(72,18), OPEN_BALANCE numeric(72,18), CLOSE_BALANCE numeric(72,18), CREDIT numeric(72,18), DEBIT numeric(72,18), SETTLED_CREDIT numeric(72,18), SETTLED_DEBIT numeric(72,18), CHECK_BALANCE numeric(72,18), DIFF_BALANCE numeric(72,18), PLAN_BALANCE numeric(72,18), BALANCE_DIMENSION varchar(4), SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), TRADING_DATE date, CLEARING_DATE date, REFUND_DATE date, VALUE_DATE date, PRICE numeric(72,18), CONTRACT varchar(255), COUNTER_PARTY_ID bigint, COMMENT varchar(255), REASON varchar(255), PARENT_ID bigint, GROUP_ID bigint, SESSION_ID bigint, SESSION_TYPE varchar(4), PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, SECURITY_ID bigint, SECTION varchar(4));
+CREATE TABLE REGISTRY(COMPANY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), REGISTRY_DESIGNATION varchar(4), REGISTRY_INSTRUMENT_TYPE varchar(4), REGISTRY_CAPACITY varchar(4), REGISTRY_UNIT varchar(4), REGISTRY_CODE varchar(4), TRADING_CLEARING_REGISTRY_ID bigint, TRADING_CLEARING_REGISTRY varchar(50), REGISTRY_STATUS varchar(4), SECURITY_SYMBOL varchar(255), BALANCE numeric(72,18), BALANCE_RUB numeric(72,18), OPEN_BALANCE numeric(72,18), CLOSE_BALANCE numeric(72,18), CREDIT numeric(72,18), DEBIT numeric(72,18), SETTLED_CREDIT numeric(72,18), SETTLED_DEBIT numeric(72,18), CHECK_BALANCE numeric(72,18), DIFF_BALANCE numeric(72,18), PLAN_BALANCE numeric(72,18), BALANCE_DIMENSION varchar(4), SETTLEMENT_DATE date, SETTLEMENT_CODE varchar(12), TRADING_DATE date, CLEARING_DATE date, REFUND_DATE date, VALUE_DATE date, PRICE numeric(72,18), CONTRACT varchar(255), COUNTER_PARTY_ID bigint, COMMENT varchar(255), REASON varchar(255), PARENT_ID bigint, GROUP_ID bigint, SESSION_ID bigint, SESSION_TYPE varchar(4), PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, SECURITY_ID bigint, SECTION varchar(4), MARKET varchar(8));
 COMMENT ON TABLE REGISTRY IS 'Регистр активов, обязательств и требований УК';
 
 COMMENT ON COLUMN REGISTRY.COMPANY_ID IS 'Идентификатор  участника (linked to company)';
@@ -2185,6 +2185,8 @@ COMMENT ON COLUMN REGISTRY.SECURITY_ID IS 'Идентификатор инстр
 
 COMMENT ON COLUMN REGISTRY.SECTION IS 'Код секции (linked to section)';
 
+COMMENT ON COLUMN REGISTRY.MARKET IS 'Код класса инструмента';
+
 GRANT ALL PRIVILEGES ON TABLE REGISTRY TO clearing;
 
 

clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.19.sql

@@ -0,0 +1,6 @@
+-- DB version: 3.18 -> 3.19
+
+ALTER TABLE REGISTRY ADD COLUMN IF NOT EXISTS MARKET VARCHAR(8);
+COMMENT ON COLUMN REGISTRY.MARKET IS 'Код класса инструмента';
+
+INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.19') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RegistryMapStore.java

@@ -68,7 +68,14 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
     @Override
     public String[] getFields() {
         return new String[]{
-                "COMPANY_ID", "TRADING_CODE", "CLEARING_CODE", "SHORT_NAME", "FULL_NAME", "ACCOUNT_ID", "ACCOUNT_TYPE", "ACCOUNT", "REGISTRY_DESIGNATION", "REGISTRY_INSTRUMENT_TYPE", "REGISTRY_CAPACITY", "REGISTRY_UNIT", "REGISTRY_CODE", "TRADING_CLEARING_REGISTRY_ID", "TRADING_CLEARING_REGISTRY", "REGISTRY_STATUS", "SECURITY_SYMBOL", "BALANCE", "BALANCE_RUB", "OPEN_BALANCE", "CLOSE_BALANCE", "CREDIT", "DEBIT", "SETTLED_CREDIT", "SETTLED_DEBIT", "CHECK_BALANCE", "DIFF_BALANCE", "PLAN_BALANCE", "BALANCE_DIMENSION", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "TRADING_DATE", "CLEARING_DATE", "REFUND_DATE", "VALUE_DATE", "PRICE", "CONTRACT", "COUNTER_PARTY_ID", "COMMENT", "REASON", "PARENT_ID", "GROUP_ID", "SESSION_ID", "SESSION_TYPE", "PAYMENT_ID", "ID", "CREATED_AT", "UPDATED_AT", "SECURITY_ID", "SECTION"
+                "COMPANY_ID", "TRADING_CODE", "CLEARING_CODE", "SHORT_NAME", "FULL_NAME", "ACCOUNT_ID", "ACCOUNT_TYPE",
+            "ACCOUNT", "REGISTRY_DESIGNATION", "REGISTRY_INSTRUMENT_TYPE", "REGISTRY_CAPACITY", "REGISTRY_UNIT",
+            "REGISTRY_CODE", "TRADING_CLEARING_REGISTRY_ID", "TRADING_CLEARING_REGISTRY", "REGISTRY_STATUS",
+            "SECURITY_SYMBOL", "BALANCE", "BALANCE_RUB", "OPEN_BALANCE", "CLOSE_BALANCE", "CREDIT", "DEBIT",
+            "SETTLED_CREDIT", "SETTLED_DEBIT", "CHECK_BALANCE", "DIFF_BALANCE", "PLAN_BALANCE", "BALANCE_DIMENSION",
+            "SETTLEMENT_DATE", "SETTLEMENT_CODE", "TRADING_DATE", "CLEARING_DATE", "REFUND_DATE", "VALUE_DATE", "PRICE",
+            "CONTRACT", "COUNTER_PARTY_ID", "COMMENT", "REASON", "PARENT_ID", "GROUP_ID", "SESSION_ID", "SESSION_TYPE",
+            "PAYMENT_ID", "ID", "CREATED_AT", "UPDATED_AT", "SECURITY_ID", "SECTION", "MARKET"
         };
     }
 
@@ -125,6 +132,7 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
         object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
         object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
         object.setSection(resultSet.getObject("SECTION", String.class));
+        object.setMarket(resultSet.getObject("MARKET", String.class));
         return object;
     }
 
@@ -180,7 +188,8 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
                 TimeUtil.toDateFromInstant(object.getCreated()),
                 TimeUtil.toDateFromInstant(object.getUpdated()),
                 object.getSecurityId(),
-                object.getSection()
+                object.getSection(),
+                object.getMarket()
         };
         return args;
     }

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java

@@ -14,7 +14,7 @@ public class HazelcastLifecycleSupport extends AbstractHazelcastLifecycleSupport
     /**
      * Рабочая версия БД. Требуется вручную сверять с DDL.sql и накручивать эту переменную.
      */
-    public static final String CHECK_DB_VERSION = "3.18";
+    public static final String CHECK_DB_VERSION = "3.19";
 
     private final Logger log = LoggerFactory.getLogger(this.getClass());