From 303f026489ec840ac2e99fb80bad0a3b6846ce99 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Thu, 25 Apr 2024 18:11:23 +0300
Subject: [PATCH] =?UTF-8?q?ddl=20imdg=20CurrencyPairSecurity=20(=D1=81?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BC=D0=B0=D0=BD=D0=BE=20=D0=B2=2007db6680928)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statics/data/security/CurrencyPairSecurity.java    | 10 +++++++++-
 .../CurrencyPairSecurityHistoryMapStore.java           |  3 ++-
 .../imdg/object/CurrencyPairSecurityMapStore.java      |  4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java
index 27c80f440..74cd59f45 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/CurrencyPairSecurity.java
@@ -13,7 +13,7 @@ public class CurrencyPairSecurity extends Security {
     private static final long serialVersionUID = ConstSerializable.serialVersionUID;
 
     private BigDecimal baseUnitSize;
-//    private Long currencyPairId;
+    private Long currencyPairId;
     private String code;
     private String settlementType;
     private String clearingOrganization;
@@ -34,6 +34,14 @@ public class CurrencyPairSecurity extends Security {
         this.baseUnitSize = value;
     }
 
+    public Long getCurrencyPairId() {
+        return currencyPairId;
+    }
+
+    public void setCurrencyPairId(Long currencyPairId) {
+        this.currencyPairId = currencyPairId;
+    }
+
     public String getCode() {
         return code;
     }
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java
index d869ddbc7..0b880b0a0 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CurrencyPairSecurityHistoryMapStore.java
@@ -28,7 +28,7 @@ public class CurrencyPairSecurityHistoryMapStore extends ASecurityHistoryMapStor
     @Override
     public String[] getFields() {
         return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE",
-                "CURRENCY_PAIR_SECURITY_ID", "BASE_UNIT_SIZE", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SECURITY_ID", "CREATED_AT", "UPDATED_AT"
+                "CURRENCY_PAIR_SECURITY_ID", "BASE_UNIT_SIZE", "CURRENCY_PAIR_ID", "CODE", "SETTLEMENT_TYPE", "CLEARING_ORGANIZATION", "SECURITY_ID", "CREATED_AT", "UPDATED_AT"
         };
     }
 
@@ -43,6 +43,7 @@ public class CurrencyPairSecurityHistoryMapStore extends ASecurityHistoryMapStor
 
                 object.getId(),
                 object.getBaseUnitSize(),
+                object.getCurrencyPairId(),
                 object.getCode(),
                 object.getSettlementType(),
                 object.getClearingOrganization(),
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java
index 6ccd64137..11b1bd375 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CurrencyPairSecurityMapStore.java
@@ -32,7 +32,7 @@ public class CurrencyPairSecurityMapStore extends ASecurityMapStore<CurrencyPair
     @Override
     public String[] getFields() {
         return new String[]{
-                "BASE_UNIT_SIZE",  "CODE",  "SETTLEMENT_TYPE",  "CLEARING_ORGANIZATION",  "SECURITY_ID",  "ID",  "CREATED_AT",  "UPDATED_AT"
+                "BASE_UNIT_SIZE", "CURRENCY_PAIR_ID", "CODE",  "SETTLEMENT_TYPE",  "CLEARING_ORGANIZATION",  "SECURITY_ID",  "ID",  "CREATED_AT",  "UPDATED_AT"
         };
     }
 
@@ -40,6 +40,7 @@ public class CurrencyPairSecurityMapStore extends ASecurityMapStore<CurrencyPair
     public CurrencyPairSecurity objectReader(ResultSet resultSet) throws SQLException {
         CurrencyPairSecurity object = new CurrencyPairSecurity();
         object.setBaseUnitSize(resultSet.getObject("BASE_UNIT_SIZE", BigDecimal.class));
+        object.setCurrencyPairId(resultSet.getObject("CURRENCY_PAIR_ID", Long.class));
         object.setCode(resultSet.getObject("CODE", String.class));
         object.setSettlementType(resultSet.getObject("SETTLEMENT_TYPE", String.class));
         object.setClearingOrganization(resultSet.getObject("CLEARING_ORGANIZATION", String.class));
@@ -56,6 +57,7 @@ public class CurrencyPairSecurityMapStore extends ASecurityMapStore<CurrencyPair
     public Object[] objectToField(CurrencyPairSecurity object) {
         Object[] args = new Object[]{
                 object.getBaseUnitSize(),
+                object.getCurrencyPairId(),
                 object.getCode(),
                 object.getSettlementType(),
                 object.getClearingOrganization(),