diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/CurrencyPairSecurityNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/CurrencyPairSecurityNewAction.java index 8aa67b0ce..e90ee66e3 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/CurrencyPairSecurityNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/CurrencyPairSecurityNewAction.java @@ -22,9 +22,6 @@ public class CurrencyPairSecurityNewAction implements IAction + + + + + diff --git a/clearing-parent/backend-api/src/main/resources/meta/data_initial.xml b/clearing-parent/backend-api/src/main/resources/meta/data_initial.xml index ec7e4e258..0bd754144 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/data_initial.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/data_initial.xml @@ -13,6 +13,8 @@ + + diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json index 25c1442a2..510eae0f4 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1404,7 +1404,7 @@ } , {"code": "code", - "name": "Код","shortname": "Код","type": 12 + "name": "Код","shortname": "Код","type": 2,"length": 25 } , {"code": "baseCurrencyId", @@ -3714,7 +3714,7 @@ } , {"code": "settlementType", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "currencySettlementType","linkCode": "code" + "type": 12,"dbname": "Тип расчета","name": "Тип расчета","shortname": "Тип расчета","searchable": true,"sortable": true,"visible": true,"link": "currencySettlementType","linkCode": "code" } , {"code": "clearingOrganization", @@ -3790,10 +3790,6 @@ {"code": "fullName", "type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование","required": true } - , - {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkKeyCode": "code","linkCode": "description","required": true - } , {"code": "currencyPairId", "type": 1,"dbname": "Идентификатор валютной пары","name": "Валютная пара","shortname": "Инструмент","link": "currencyPair","required": true @@ -3812,16 +3808,12 @@ } , {"code": "settlementType", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "currencySettlementType","required": true + "type": 12,"dbname": "Тип расчета","name": "Тип расчета","shortname": "Тип расчета","link": "currencySettlementType","required": true } , {"code": "workflowStatus", "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","extends": "security","required": true } - , - {"code": "settlementOrganization", - "type": 2,"length": 255,"name": "Наименование расчетной организации","shortname": "Расчетная организация","required": true - } , {"code": "clearingOrganization", "type": 2,"length": 255,"name": "Наименование клиринговой организации","shortname": "Клиринговая организация","required": true,"enabled": false @@ -3857,10 +3849,6 @@ {"code": "fullName", "type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование","required": true } - , - {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkKeyCode": "code","linkCode": "description","required": true - } , {"code": "currencyPairId", "type": 1,"dbname": "Идентификатор валютной пары","name": "Валютная пара","shortname": "Инструмент","link": "currencyPair","required": true @@ -3879,16 +3867,12 @@ } , {"code": "settlementType", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "currencySettlementType","required": true + "dbname": "Тип расчета","name": "Тип расчета","shortname": "Тип расчета","link": "currencySettlementType","required": true } , {"code": "workflowStatus", "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","extends": "security","required": true } - , - {"code": "settlementOrganization", - "type": 2,"length": 255,"name": "Наименование расчетной организации","shortname": "Расчетная организация","required": true - } , {"code": "clearingOrganization", "type": 2,"length": 255,"name": "Наименование клиринговой организации","shortname": "Клиринговая организация","required": true,"enabled": false diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 02e57cbe8..b9855afe7 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -309,7 +309,7 @@ - + @@ -859,7 +859,7 @@ - + @@ -878,14 +878,12 @@ - - + - @@ -894,14 +892,12 @@ - - + - diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 25c1442a2..510eae0f4 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1404,7 +1404,7 @@ } , {"code": "code", - "name": "Код","shortname": "Код","type": 12 + "name": "Код","shortname": "Код","type": 2,"length": 25 } , {"code": "baseCurrencyId", @@ -3714,7 +3714,7 @@ } , {"code": "settlementType", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "currencySettlementType","linkCode": "code" + "type": 12,"dbname": "Тип расчета","name": "Тип расчета","shortname": "Тип расчета","searchable": true,"sortable": true,"visible": true,"link": "currencySettlementType","linkCode": "code" } , {"code": "clearingOrganization", @@ -3790,10 +3790,6 @@ {"code": "fullName", "type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование","required": true } - , - {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkKeyCode": "code","linkCode": "description","required": true - } , {"code": "currencyPairId", "type": 1,"dbname": "Идентификатор валютной пары","name": "Валютная пара","shortname": "Инструмент","link": "currencyPair","required": true @@ -3812,16 +3808,12 @@ } , {"code": "settlementType", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "currencySettlementType","required": true + "type": 12,"dbname": "Тип расчета","name": "Тип расчета","shortname": "Тип расчета","link": "currencySettlementType","required": true } , {"code": "workflowStatus", "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","extends": "security","required": true } - , - {"code": "settlementOrganization", - "type": 2,"length": 255,"name": "Наименование расчетной организации","shortname": "Расчетная организация","required": true - } , {"code": "clearingOrganization", "type": 2,"length": 255,"name": "Наименование клиринговой организации","shortname": "Клиринговая организация","required": true,"enabled": false @@ -3857,10 +3849,6 @@ {"code": "fullName", "type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Наименование","required": true } - , - {"code": "market", - "type": 12,"name": "Наименование режима","shortname": "Режим","link": "market","linkKeyCode": "code","linkCode": "description","required": true - } , {"code": "currencyPairId", "type": 1,"dbname": "Идентификатор валютной пары","name": "Валютная пара","shortname": "Инструмент","link": "currencyPair","required": true @@ -3879,16 +3867,12 @@ } , {"code": "settlementType", - "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "currencySettlementType","required": true + "dbname": "Тип расчета","name": "Тип расчета","shortname": "Тип расчета","link": "currencySettlementType","required": true } , {"code": "workflowStatus", "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","extends": "security","required": true } - , - {"code": "settlementOrganization", - "type": 2,"length": 255,"name": "Наименование расчетной организации","shortname": "Расчетная организация","required": true - } , {"code": "clearingOrganization", "type": 2,"length": 255,"name": "Наименование клиринговой организации","shortname": "Клиринговая организация","required": true,"enabled": false diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql index c6f943d20..a6b4710f4 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql @@ -1,4 +1,4 @@ --- DB version: 3.11.0.80 +-- DB version: 3.11.0.81 -- DATA version: 3.11.0.78 @@ -188,6 +188,16 @@ INSERT INTO CURRENCY_CODE_DICTIONARY(ID, CODE, NAME) values (643, 'RUB', 'Рос INSERT INTO CURRENCY_CODE_DICTIONARY(ID, CODE, NAME) values (840, 'USD', 'Доллар США') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO CURRENCY_CODE_DICTIONARY(ID, CODE, NAME) values (978, 'EUR', 'Евро') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO CURRENCY_CODE_DICTIONARY(ID, CODE, NAME) values (156, 'CNY', 'Китайский Юань') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; + +INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY_ID, QUOTE_CURRENCY_ID, MAJOR_SIGN) values (1, 'EUR/RUB', 'EUR', 'RUB', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY_ID = EXCLUDED.BASE_CURRENCY_ID, QUOTE_CURRENCY_ID = EXCLUDED.QUOTE_CURRENCY_ID, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; + +INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY_ID, QUOTE_CURRENCY_ID, MAJOR_SIGN) values (2, 'USD/RUB', 'USD', 'RUB', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY_ID = EXCLUDED.BASE_CURRENCY_ID, QUOTE_CURRENCY_ID = EXCLUDED.QUOTE_CURRENCY_ID, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; + +INSERT INTO CURRENCY_PAIR_DICTIONARY(ID, CODE, BASE_CURRENCY_ID, QUOTE_CURRENCY_ID, MAJOR_SIGN) values (3, 'CNY/RUВ', 'CNY', 'RUВ', 'CONV') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, BASE_CURRENCY_ID = EXCLUDED.BASE_CURRENCY_ID, QUOTE_CURRENCY_ID = EXCLUDED.QUOTE_CURRENCY_ID, MAJOR_SIGN = EXCLUDED.MAJOR_SIGN; + INSERT INTO INSTRUMENT_TYPE_DICTIONARY(ID, CODE, NAME) values (1, 'RATE', 'Инструмент Денежного рынка') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO INSTRUMENT_TYPE_DICTIONARY(ID, CODE, NAME) values (2, 'CRNC', 'Валюта') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA_INITIAL.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA_INITIAL.sql index c221a3db5..38eceb6de 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DATA_INITIAL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DATA_INITIAL.sql @@ -1,4 +1,4 @@ --- DB version: 3.11.0.78 +-- DB version: 3.11.0.81 -- DATA version: 3.9.0.68 @@ -22,6 +22,10 @@ INSERT INTO CURRENCY(ID, CURRENCY_CODE) values (643, 'RUB') ON CONFLICT (ID) DO INSERT INTO CURRENCY(ID, CURRENCY_CODE) values (840, 'USD') ON CONFLICT (ID) DO UPDATE SET CURRENCY_CODE = EXCLUDED.CURRENCY_CODE; +INSERT INTO CURRENCY(ID, CURRENCY_CODE) values (978, 'EUR') ON CONFLICT (ID) DO UPDATE SET CURRENCY_CODE = EXCLUDED.CURRENCY_CODE; + +INSERT INTO CURRENCY(ID, CURRENCY_CODE) values (156, 'CNY') ON CONFLICT (ID) DO UPDATE SET CURRENCY_CODE = EXCLUDED.CURRENCY_CODE; + INSERT INTO SECURITY(ID, INSTRUMENT_TYPE, SHORT_NAME, FULL_NAME, SECURITY_SYMBOL, WORKFLOW_STATUS) values (643, 'CRNC', 'RUB', 'Российский рубль', 'RUB', 'ACTV') ON CONFLICT (ID) DO UPDATE SET INSTRUMENT_TYPE = EXCLUDED.INSTRUMENT_TYPE, SHORT_NAME = EXCLUDED.SHORT_NAME, FULL_NAME = EXCLUDED.FULL_NAME, SECURITY_SYMBOL = EXCLUDED.SECURITY_SYMBOL, WORKFLOW_STATUS = EXCLUDED.WORKFLOW_STATUS; INSERT INTO SECURITY(ID, INSTRUMENT_TYPE, SHORT_NAME, FULL_NAME, SECURITY_SYMBOL, WORKFLOW_STATUS) values (840, 'CRNC', 'USD', 'Доллар США', 'USD', 'ACTV') ON CONFLICT (ID) DO UPDATE SET INSTRUMENT_TYPE = EXCLUDED.INSTRUMENT_TYPE, SHORT_NAME = EXCLUDED.SHORT_NAME, FULL_NAME = EXCLUDED.FULL_NAME, SECURITY_SYMBOL = EXCLUDED.SECURITY_SYMBOL, WORKFLOW_STATUS = EXCLUDED.WORKFLOW_STATUS; 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 4c9ba02ce..65d3d0bee 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql @@ -1,4 +1,4 @@ --- DB version: 3.11.0.80 +-- DB version: 3.11.0.81 /* Dictionaries */ -- allowed - Справочник признаков допустимости использования объектов @@ -783,10 +783,10 @@ COMMENT ON COLUMN CURRENCY_SETTLEMENT_TYPE_DICTIONARY.NAME IS 'Тип расче GRANT ALL PRIVILEGES ON TABLE CURRENCY_SETTLEMENT_TYPE_DICTIONARY TO clearing; --- currencyPair - Справочник способов доставки документа +-- currencyPair - Справочник валютных пар DROP TABLE IF EXISTS CURRENCY_PAIR_DICTIONARY; -CREATE TABLE CURRENCY_PAIR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), BASE_CURRENCY_ID varchar(4), QUOTE_CURRENCY_ID varchar(4), MAJOR_SIGN varchar(4)); -COMMENT ON TABLE CURRENCY_PAIR_DICTIONARY IS 'Справочник способов доставки документа'; +CREATE TABLE CURRENCY_PAIR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(25), BASE_CURRENCY_ID varchar(4), QUOTE_CURRENCY_ID varchar(4), MAJOR_SIGN varchar(4)); +COMMENT ON TABLE CURRENCY_PAIR_DICTIONARY IS 'Справочник валютных пар'; COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.ID IS 'Идентификатор'; @@ -1759,7 +1759,7 @@ COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CURRENCY_PAIR_ID IS 'Идентифик COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_TYPE IS 'Код статуса (linked to currencySettlementType)'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_TYPE IS 'Тип расчета (linked to currencySettlementType)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; @@ -1791,7 +1791,7 @@ COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_ID IS 'Идент COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_TYPE IS 'Код статуса (linked to currencySettlementType)'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_TYPE IS 'Тип расчета (linked to currencySettlementType)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; diff --git a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql index a6ce5d60e..7901fcf37 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql @@ -20,10 +20,10 @@ COMMENT ON COLUMN CURRENCY_SETTLEMENT_TYPE_DICTIONARY.CODE IS 'Код'; COMMENT ON COLUMN CURRENCY_SETTLEMENT_TYPE_DICTIONARY.NAME IS 'Тип расчета'; GRANT ALL PRIVILEGES ON TABLE CURRENCY_SETTLEMENT_TYPE_DICTIONARY TO clearing; --- currencyPair - Справочник способов доставки документа +-- currencyPair - Справочник валютных пар DROP TABLE IF EXISTS CURRENCY_PAIR_DICTIONARY; -CREATE TABLE CURRENCY_PAIR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), BASE_CURRENCY_ID varchar(4), QUOTE_CURRENCY_ID varchar(4), MAJOR_SIGN varchar(4)); -COMMENT ON TABLE CURRENCY_PAIR_DICTIONARY IS 'Справочник способов доставки документа'; +CREATE TABLE CURRENCY_PAIR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(25), BASE_CURRENCY_ID varchar(4), QUOTE_CURRENCY_ID varchar(4), MAJOR_SIGN varchar(4)); +COMMENT ON TABLE CURRENCY_PAIR_DICTIONARY IS 'Справочник валютных пар'; COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.ID IS 'Идентификатор'; COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.CODE IS 'Код'; COMMENT ON COLUMN CURRENCY_PAIR_DICTIONARY.BASE_CURRENCY_ID IS 'Код валюты лота (linked to currencyCode)'; @@ -70,7 +70,7 @@ COMMENT ON TABLE CURRENCY_PAIR_SECURITY IS 'Валютные пары'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.BASE_UNIT_SIZE IS 'Количество валюты лота'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CURRENCY_PAIR_ID IS 'Идентификатор валютной пары (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_TYPE IS 'Код статуса (linked to currencySettlementType)'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_TYPE IS 'Тип расчета (linked to currencySettlementType)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SETTLEMENT_ORGANIZATION IS 'Наименование расчетной организации'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY.SECURITY_ID IS 'Наименование инструмента (linked to security)'; @@ -91,7 +91,7 @@ COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.EVENT_TYPE IS 'Тип изме COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.BASE_UNIT_SIZE IS 'Количество валюты лота'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CURRENCY_PAIR_ID IS 'Идентификатор валютной пары (linked to currencyPair)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CODE IS 'Наименование валютной пары (linked to currencyPair)'; -COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_TYPE IS 'Код статуса (linked to currencySettlementType)'; +COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_TYPE IS 'Тип расчета (linked to currencySettlementType)'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.CLEARING_ORGANIZATION IS 'Наименование клиринговой организации'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SETTLEMENT_ORGANIZATION IS 'Наименование расчетной организации'; COMMENT ON COLUMN CURRENCY_PAIR_SECURITY_HISTORY.SECURITY_ID IS 'Наименование инструмента (linked to security)'; diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java index 41f805815..21cfa3cd0 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java @@ -110,7 +110,7 @@ public class CurrencyPairSecurityService extends QueueConsumer implements Initia //todo currencyPairSecurity.setCode(req.getCode()); currencyPairSecurity.setSettlementType(req.getSettlementType()); currencyPairSecurity.setClearingOrganization(req.getClearingOrganization()); - currencyPairSecurity.setSettlementOrganization(req.getSettlementOrganization()); + //todo currencyPairSecurity.setSettlementOrganization(req.getSettlementOrganization()); currencyPairSecurity.setSecurityId(currencyPairSecurity.getId()); currencyPairSecurity.setSecuritySymbol(req.getSecuritySymbol()); currencyPairSecurity.setShortName(req.getShortName()); @@ -159,7 +159,7 @@ public class CurrencyPairSecurityService extends QueueConsumer implements Initia //todo currencyPairSecurity.setCode(req.getCode()); currencyPairSecurity.setSettlementType(req.getSettlementType()); currencyPairSecurity.setClearingOrganization(req.getClearingOrganization()); - currencyPairSecurity.setSettlementOrganization(req.getSettlementOrganization()); +// todo currencyPairSecurity.setSettlementOrganization(req.getSettlementOrganization()); currencyPairSecurity.setSecurityId(currencyPairSecurity.getId()); currencyPairSecurity.setSecuritySymbol(req.getSecuritySymbol()); currencyPairSecurity.setShortName(req.getShortName()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ValidationProvider.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ValidationProvider.java index e635797df..5ce7d8510 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ValidationProvider.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ValidationProvider.java @@ -348,9 +348,6 @@ public class ValidationProvider { FieldNotBlankRequiredRule.instance("fullName", CurrencyPairSecurityNewRequest::getFullName, SecuritiesError.RequiredFieldIsEmpty, true), - FieldRequiredRule.instance("market", - CurrencyPairSecurityNewRequest::getMarket, - SecuritiesError.RequiredFieldIsEmpty, true),// todo verify in MarketMap? IdPresentRule.instance("currencyPairId", CurrencyPairSecurityNewRequest::getCurrencyPairId, IMDGDistributedNames.Map_CurrencyPairDictionary, @@ -422,9 +419,6 @@ public class ValidationProvider { FieldNotBlankRequiredRule.instance("fullName", CurrencyPairSecurityUpdateRequest::getFullName, SecuritiesError.RequiredFieldIsEmpty, true), - FieldRequiredRule.instance("market", - CurrencyPairSecurityUpdateRequest::getMarket, - SecuritiesError.RequiredFieldIsEmpty, true),// todo verify in MarketMap? IdPresentRule.instance("currencyPairId", CurrencyPairSecurityUpdateRequest::getCurrencyPairId, IMDGDistributedNames.Map_CurrencyPairDictionary, diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityNewRequest.java index 4229e7f2e..7510ed572 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityNewRequest.java @@ -17,8 +17,6 @@ public class CurrencyPairSecurityNewRequest implements WithSecuritySymbol, WithI @JsonProperty private String fullName; @JsonProperty - private String market; - @JsonProperty private Long currencyPairId; @JsonProperty private BigDecimal lotSize; @@ -31,8 +29,6 @@ public class CurrencyPairSecurityNewRequest implements WithSecuritySymbol, WithI @JsonProperty private String workflowStatus; @JsonProperty - private String settlementOrganization; - @JsonProperty private String clearingOrganization; @Override @@ -69,14 +65,6 @@ public class CurrencyPairSecurityNewRequest implements WithSecuritySymbol, WithI this.fullName = fullName; } - public String getMarket() { - return market; - } - - public void setMarket(String market) { - this.market = market; - } - public Long getCurrencyPairId() { return currencyPairId; } @@ -125,14 +113,6 @@ public class CurrencyPairSecurityNewRequest implements WithSecuritySymbol, WithI this.workflowStatus = workflowStatus; } - public String getSettlementOrganization() { - return settlementOrganization; - } - - public void setSettlementOrganization(String settlementOrganization) { - this.settlementOrganization = settlementOrganization; - } - public String getClearingOrganization() { return clearingOrganization; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityUpdateRequest.java index 211ce561f..66f9c3ebe 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityUpdateRequest.java @@ -18,8 +18,6 @@ public class CurrencyPairSecurityUpdateRequest implements WithId, WithInstrument @JsonProperty private String fullName; @JsonProperty - private String market; - @JsonProperty private Long currencyPairId; @JsonProperty private BigDecimal lotSize; @@ -32,8 +30,6 @@ public class CurrencyPairSecurityUpdateRequest implements WithId, WithInstrument @JsonProperty private String workflowStatus; @JsonProperty - private String settlementOrganization; - @JsonProperty private String clearingOrganization; @Override @@ -78,14 +74,6 @@ public class CurrencyPairSecurityUpdateRequest implements WithId, WithInstrument this.fullName = fullName; } - public String getMarket() { - return market; - } - - public void setMarket(String market) { - this.market = market; - } - public Long getCurrencyPairId() { return currencyPairId; } @@ -135,14 +123,6 @@ public class CurrencyPairSecurityUpdateRequest implements WithId, WithInstrument this.workflowStatus = workflowStatus; } - public String getSettlementOrganization() { - return settlementOrganization; - } - - public void setSettlementOrganization(String settlementOrganization) { - this.settlementOrganization = settlementOrganization; - } - public String getClearingOrganization() { return clearingOrganization; }