From 43a11267fc04ab804552ca38f2e66c88bb019e13 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Thu, 25 Apr 2024 17:44:51 +0300
Subject: [PATCH] ddl http://jira.mfd.msk:8088/browse/CLS-664 fix DDL bug

---
 .../statics/data/execution/ExecutionCurrency.java        | 9 ---------
 clearing-parent/db-scripts/src/main/resources/db/DDL.sql | 4 ++--
 .../businessevent/ExecutionCurrencyHistoryMapStore.java  | 3 +--
 .../imdg/businessobject/ExecutionCurrencyMapStore.java   | 5 ++---
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCurrency.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCurrency.java
index f96b6ab90..931cafc36 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCurrency.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/execution/ExecutionCurrency.java
@@ -41,7 +41,6 @@ public class ExecutionCurrency extends ExecutionCommon {
     private String settlementOrganization;
 //    private String coverageStatus;
 //    private Long sessionId;
-    private String depoCode;
 //    private LocalDate clearingDate;
 
     // --- API ExecutionCommon ---
@@ -169,12 +168,4 @@ public class ExecutionCurrency extends ExecutionCommon {
         this.settlementOrganization = value;
     }
 
-    public String getDepoCode() {
-        return depoCode;
-    }
-
-    public void setDepoCode(String value) {
-        this.depoCode = value;
-    }
-
 }
\ No newline at end of file
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
index cc8fef6d0..8b3528701 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
@@ -1750,7 +1750,7 @@ GRANT ALL PRIVILEGES ON TABLE LISTING_HISTORY TO clearing;
 
 -- currencyPairSecurity - Инструменты валютного рынка
 DROP TABLE IF EXISTS CURRENCY_PAIR_SECURITY;
-CREATE TABLE CURRENCY_PAIR_SECURITY(, CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+CREATE TABLE CURRENCY_PAIR_SECURITY(ID bigint PRIMARY KEY, CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE CURRENCY_PAIR_SECURITY IS 'Инструменты валютного рынка';
 
 COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CURRENCY_PAIR_ID IS 'Валютная пара (linked to currencyPair)';
@@ -1776,7 +1776,7 @@ GRANT ALL PRIVILEGES ON TABLE CURRENCY_PAIR_SECURITY TO clearing;
 
 -- History log of currencyPairSecurity - Инструменты валютного рынка
 DROP TABLE IF EXISTS CURRENCY_PAIR_SECURITY_HISTORY;
-CREATE TABLE CURRENCY_PAIR_SECURITY_HISTORY(CURRENCY_PAIR_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), , CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+CREATE TABLE CURRENCY_PAIR_SECURITY_HISTORY(CURRENCY_PAIR_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CURRENCY_PAIR_ID bigint, BASE_UNIT_SIZE numeric(72,2), CODE varchar(255), SETTLEMENT_TYPE varchar(4), CLEARING_ORGANIZATION varchar(255), SECURITY_ID bigint, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE CURRENCY_PAIR_SECURITY_HISTORY IS 'История изменений таблицы currencyPairSecurity';
 COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_SECURITY_ID IS 'Идентификатор записи в таблице CURRENCY_PAIR_SECURITY';
 COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_TIME IS 'Дата и время изменения';
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionCurrencyHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionCurrencyHistoryMapStore.java
index 9d04b2560..cb1f2439a 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionCurrencyHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/ExecutionCurrencyHistoryMapStore.java
@@ -28,7 +28,7 @@ public class ExecutionCurrencyHistoryMapStore extends TemplateEventMapStore<Exec
     @Override
     public String[] getFields() {
         return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE",
-                "EXECUTION_CURRENCY_ID", "CREATED_AT", "UPDATED_AT", "EXCHANGE_EXECUTION_ID", "EXCHANGE_EXECUTION_TIME", "EXCHANGE_EXECUTION_MICROSECONDS", "TRADING_DATE", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "SECURITY_ID", "SECURITY_SYMBOL", "SECURITY_NAME", "COMPANY_ID", "PARTY_TRADING_CLEARING_REGISTRY_ID", "PARTY_TRADING_CLEARING_REGISTRY", "COUNTER_PARTY_ID", "COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID", "COUNTER_PARTY_TRADING_CLEARING_REGISTRY", "MARKET", "PRICE", "LOTS", "SETTLEMENT_AMOUNT", "QUANTITY", "SIDE", "CURRENCY_CODE", "SETTLEMENT_ORGANIZATION", "COVERAGE_STATUS", "SESSION_ID", "DEPO_CODE", "CLEARING_DATE"
+                "EXECUTION_CURRENCY_ID", "CREATED_AT", "UPDATED_AT", "EXCHANGE_EXECUTION_ID", "EXCHANGE_EXECUTION_TIME", "EXCHANGE_EXECUTION_MICROSECONDS", "TRADING_DATE", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "SECURITY_ID", "SECURITY_SYMBOL", "SECURITY_NAME", "COMPANY_ID", "PARTY_TRADING_CLEARING_REGISTRY_ID", "PARTY_TRADING_CLEARING_REGISTRY", "COUNTER_PARTY_ID", "COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID", "COUNTER_PARTY_TRADING_CLEARING_REGISTRY", "MARKET", "PRICE", "LOTS", "SETTLEMENT_AMOUNT", "QUANTITY", "SIDE", "CURRENCY_CODE", "SETTLEMENT_ORGANIZATION", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE"
         };
     }
 
@@ -69,7 +69,6 @@ public class ExecutionCurrencyHistoryMapStore extends TemplateEventMapStore<Exec
                 object.getSettlementOrganization(),
                 object.getCoverageStatus(),
                 object.getSessionId(),
-                object.getDepoCode(),
                 TimeUtil.toDateFromLocalDate(object.getClearingDate())
         };
         return args;
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java
index 9c641a1c1..24c5ec025 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java
@@ -31,7 +31,8 @@ public class ExecutionCurrencyMapStore extends TemplateMapStore<ExecutionCurrenc
     @Override
     public String[] getFields() {
         return new String[]{
-                "ID",  "CREATED_AT",  "UPDATED_AT",  "EXCHANGE_EXECUTION_ID",  "EXCHANGE_EXECUTION_TIME",  "EXCHANGE_EXECUTION_MICROSECONDS",  "TRADING_DATE",  "SETTLEMENT_DATE",  "SETTLEMENT_CODE",  "SECURITY_ID",  "SECURITY_SYMBOL",  "SECURITY_NAME",  "COMPANY_ID",  "PARTY_TRADING_CLEARING_REGISTRY_ID",  "PARTY_TRADING_CLEARING_REGISTRY",  "COUNTER_PARTY_ID",  "COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID",  "COUNTER_PARTY_TRADING_CLEARING_REGISTRY",  "MARKET",  "PRICE",  "LOTS",  "SETTLEMENT_AMOUNT",  "QUANTITY",  "SIDE",  "CURRENCY_CODE",  "SETTLEMENT_ORGANIZATION",  "COVERAGE_STATUS",  "SESSION_ID",  "DEPO_CODE",  "CLEARING_DATE"
+                "ID", "CREATED_AT", "UPDATED_AT",
+                "EXCHANGE_EXECUTION_ID", "EXCHANGE_EXECUTION_TIME", "EXCHANGE_EXECUTION_MICROSECONDS", "TRADING_DATE", "SETTLEMENT_DATE", "SETTLEMENT_CODE", "SECURITY_ID", "SECURITY_SYMBOL", "SECURITY_NAME", "COMPANY_ID", "PARTY_TRADING_CLEARING_REGISTRY_ID", "PARTY_TRADING_CLEARING_REGISTRY", "COUNTER_PARTY_ID", "COUNTER_PARTY_TRADING_CLEARING_REGISTRY_ID", "COUNTER_PARTY_TRADING_CLEARING_REGISTRY", "MARKET", "PRICE", "LOTS", "SETTLEMENT_AMOUNT", "QUANTITY", "SIDE", "CURRENCY_CODE", "SETTLEMENT_ORGANIZATION", "COVERAGE_STATUS", "SESSION_ID", "CLEARING_DATE"
         };
     }
 
@@ -66,7 +67,6 @@ public class ExecutionCurrencyMapStore extends TemplateMapStore<ExecutionCurrenc
         object.setSettlementOrganization(resultSet.getObject("SETTLEMENT_ORGANIZATION", String.class));
         object.setCoverageStatus(resultSet.getObject("COVERAGE_STATUS", String.class));
         object.setSessionId(resultSet.getObject("SESSION_ID", Long.class));
-        object.setDepoCode(resultSet.getObject("DEPO_CODE", String.class));
         object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
         return object;
     }
@@ -102,7 +102,6 @@ public class ExecutionCurrencyMapStore extends TemplateMapStore<ExecutionCurrenc
                 object.getSettlementOrganization(),
                 object.getCoverageStatus(),
                 object.getSessionId(),
-                object.getDepoCode(),
                 TimeUtil.toDateFromLocalDate(object.getClearingDate())
         };
         return args;