treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend-api http://jira.mfd.msk:8088/browse/CLS-613 DDL & meta

Browse source
This commit is contained in:
AKurakin 2024-04-15 17:47:05 +03:00
parent 4da055edad
commit 9d0e092d70
15 changed files with 48 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/CurrencyPairSecurityNewAction.java
View file

@ -22,9 +22,6 @@ public class CurrencyPairSecurityNewAction implements IAction<CurrencyPairSecuri
@ApiModelProperty(value = "Полное наименование инструмента", example = "NAME of NAME")
@JsonProperty
public String fullName;
@ApiModelProperty(value = "Наименование режима", example = "CDE")
@JsonProperty
public String market;
@ApiModelProperty(value = "Валютная пара", example = "1234")
@JsonProperty
public Long currencyPairId;
@ -43,9 +40,6 @@ public class CurrencyPairSecurityNewAction implements IAction<CurrencyPairSecuri
@ApiModelProperty(value = "Наименование статуса", example = "CDE")
@JsonProperty
public String workflowStatus;
@ApiModelProperty(value = "Наименование расчетной организации", example = "CDE")
@JsonProperty
public String settlementOrganization;
@ApiModelProperty(value = "Наименование клиринговой организации", example = "NAME")
@JsonProperty
public String clearingOrganization;
@ -57,14 +51,12 @@ public class CurrencyPairSecurityNewAction implements IAction<CurrencyPairSecuri
req.setSecuritySymbol(this.getSecuritySymbol());
req.setShortName(this.getShortName());
req.setFullName(this.getFullName());
req.setMarket(this.getMarket());
req.setCurrencyPairId(this.getCurrencyPairId());
req.setLotSize(this.getLotSize());
req.setMinStep(this.getMinStep());
req.setBaseUnitSize(this.getBaseUnitSize());
req.setSettlementType(this.getSettlementType());
req.setWorkflowStatus(this.getWorkflowStatus());
req.setSettlementOrganization(this.getSettlementOrganization());
req.setClearingOrganization(this.getClearingOrganization());
return req;
@ -109,14 +101,6 @@ public class CurrencyPairSecurityNewAction implements IAction<CurrencyPairSecuri
this.fullName = fullName;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
public Long getCurrencyPairId() {
return currencyPairId;
}
@ -165,14 +149,6 @@ public class CurrencyPairSecurityNewAction implements IAction<CurrencyPairSecuri
this.workflowStatus = workflowStatus;
}
public String getSettlementOrganization() {
return settlementOrganization;
}
public void setSettlementOrganization(String settlementOrganization) {
this.settlementOrganization = settlementOrganization;
}
public String getClearingOrganization() {
return clearingOrganization;
}

24
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/CurrencyPairSecurityUpdateAction.java
View file

@ -26,9 +26,6 @@ public class CurrencyPairSecurityUpdateAction implements IAction<CurrencyPairSec
@ApiModelProperty(value = "Полное наименование инструмента", example = "NAME of NAME")
@JsonProperty
public String fullName;
@ApiModelProperty(value = "Наименование режима", example = "CDE")
@JsonProperty
public String market;
@ApiModelProperty(value = "Валютная пара", example = "1234")
@JsonProperty
public Long currencyPairId;
@ -47,9 +44,6 @@ public class CurrencyPairSecurityUpdateAction implements IAction<CurrencyPairSec
@ApiModelProperty(value = "Наименование статуса", example = "CDE")
@JsonProperty
public String workflowStatus;
@ApiModelProperty(value = "Наименование расчетной организации", example = "CDE")
@JsonProperty
public String settlementOrganization;
@ApiModelProperty(value = "Наименование клиринговой организации", example = "NAME")
@JsonProperty
public String clearingOrganization;
@ -62,14 +56,12 @@ public class CurrencyPairSecurityUpdateAction implements IAction<CurrencyPairSec
req.setSecuritySymbol(this.getSecuritySymbol());
req.setShortName(this.getShortName());
req.setFullName(this.getFullName());
req.setMarket(this.getMarket());
req.setCurrencyPairId(this.getCurrencyPairId());
req.setLotSize(this.getLotSize());
req.setMinStep(this.getMinStep());
req.setBaseUnitSize(this.getBaseUnitSize());
req.setSettlementType(this.getSettlementType());
req.setWorkflowStatus(this.getWorkflowStatus());
req.setSettlementOrganization(this.getSettlementOrganization());
req.setClearingOrganization(this.getClearingOrganization());
return req;
}
@ -122,14 +114,6 @@ public class CurrencyPairSecurityUpdateAction implements IAction<CurrencyPairSec
this.fullName = fullName;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
public Long getCurrencyPairId() {
return currencyPairId;
}
@ -178,14 +162,6 @@ public class CurrencyPairSecurityUpdateAction implements IAction<CurrencyPairSec
this.workflowStatus = workflowStatus;
}
public String getSettlementOrganization() {
return settlementOrganization;
}
public void setSettlementOrganization(String settlementOrganization) {
this.settlementOrganization = settlementOrganization;
}
public String getClearingOrganization() {
return clearingOrganization;
}

5
clearing-parent/backend-api/src/main/resources/meta/data.xml
View file

@ -93,6 +93,11 @@
<companyRole id="7" code="ODEP" name="Участник расчетов по открытым депозитным счетам на секции МКР"/>
<currencyCode id="643" code="RUB" name="Российский рубль"/>
<currencyCode id="840" code="USD" name="Доллар США"/>
<currencyCode id="978" code="EUR" name="Евро"/>
<currencyCode id="156" code="CNY" name="Китайский Юань"/>
<currencyPair id="1" code="EUR/RUB" baseCurrencyId="EUR" quoteCurrencyId="RUB" majorSign="CONV"/>
<currencyPair id="2" code="USD/RUB" baseCurrencyId="USD" quoteCurrencyId="RUB" majorSign="CONV"/>
<currencyPair id="3" code="CNY/RUВ" baseCurrencyId="CNY" quoteCurrencyId="RUВ" majorSign="CONV"/>
<instrumentType id="1" code="RATE" name="Инструмент Денежного рынка"/>
<instrumentType id="2" code="CRNC" name="Валюта"/>
<instrumentType id="3" code="EQTY" name="Акция"/>

2
clearing-parent/backend-api/src/main/resources/meta/data_initial.xml
View file

@ -13,6 +13,8 @@
<companySymbols id="2" companyId="2" companySymbol="BIC" companySymbolValue="044030505"/>
<currency id="643" currencyCode="RUB"/>
<currency id="840" currencyCode="USD"/>
<currency id="978" currencyCode="EUR"/>
<currency id="156" currencyCode="CNY"/>
<security id="643" instrumentType="CRNC" shortName="RUB" fullName="Российский рубль" securitySymbol="RUB" workflowStatus="ACTV"/>
<security id="840" instrumentType="CRNC" shortName="USD" fullName="Доллар США" securitySymbol="USD" workflowStatus="ACTV"/>
<account id="1" companyId="1" account="30414810300000006000" accountType="TRAN" status="ACTV" processingSign="ALWD"/>

24
clearing-parent/backend-api/src/main/resources/meta/meta.json
View file

@ -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

12
clearing-parent/backend-api/src/main/resources/meta/meta.xml
View file

@ -309,7 +309,7 @@
</currencySettlementType>
<currencyPair name="Справочник валютных пар" class="ru.clearing.platform.dictionary.СurrencyPair" table="currency_pair">
<id name="Идентификатор" shortname="ID" type="1"/>
<code name="Код" shortname="Код" type="12"/>
<code name="Код" shortname="Код" type="2" length="25"/>
<baseCurrencyId name="Код валюты лота" shortname="Валюта лота" link="currencyCode" type="12"/>
<quoteCurrencyId name="Код сопряженной валюты" shortname="Сопряженная валюта" link="currencyCode" type="12"/>
<majorSign name="Код признака конвертируемости валюты" shortname="Конвертируемость валюты" link="majorSign" type="12"/>
@ -859,7 +859,7 @@
<baseUnitSize type="11" name="Количество валюты лота" shortname="Количество" visible="true" searchable="true" sortable="true"/>
<currencyPairId type="1" dbname="Идентификатор валютной пары" name="Валютная пара" shortname="Инструмент" searchable="true" sortable="true" ignore="true" link="currencyPair"/>
<code type="2" length="255" name="Наименование валютной пары" shortname="Валютная пара" searchable="true" sortable="true" visible="true" link="currencyPair" linkKeyCode="id" linkCode="name"/>
<settlementType type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" link="currencySettlementType" linkCode="code"/>
<settlementType type="12" dbname="Тип расчета" name="Тип расчета" shortname="Тип расчета" searchable="true" sortable="true" visible="true" link="currencySettlementType" linkCode="code"/>
<clearingOrganization type="2" length="255" name="Наименование клиринговой организации" shortname="Клиринговая организация" searchable="true" sortable="true" visible="true"/>
<settlementOrganization type="2" length="255" name="Наименование расчетной организации" shortname="Расчетная организация" searchable="true" sortable="true" visible="true"/>
<securityId type="1" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
@ -878,14 +878,12 @@
<securitySymbol type="2" length="255" name="Код инструмента" shortname="Код" required="true"/>
<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" required="true"/>
<fullName type="2" length="255" name="Полное наименование инструмента" shortname="Наименование" required="true"/>
<market type="12" name="Наименование режима" shortname="Режим" link="market" linkKeyCode="code" linkCode="description" required="true"/>
<currencyPairId type="1" dbname="Идентификатор валютной пары" name="Валютная пара" shortname="Инструмент" link="currencyPair" required="true"/>
<lotSize type="11" name="Размер лота" shortname="Лот" required="true"/>
<minStep type="11" name="Шаг цены" shortname="Шаг цены" required="true"/>
<baseUnitSize type="11" name="Количество валюты лота" shortname="Количество" required="true"/>
<settlementType type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" link="currencySettlementType" required="true"/>
<settlementType type="12" dbname="Тип расчета" name="Тип расчета" shortname="Тип расчета" link="currencySettlementType" required="true"/>
<workflowStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" link="workflowStatus" extends="security" required="true"/>
<settlementOrganization type="2" length="255" name="Наименование расчетной организации" shortname="Расчетная организация" required="true"/>
<clearingOrganization type="2" length="255" name="Наименование клиринговой организации" shortname="Клиринговая организация" required="true" enabled="false"/>
</post>
<put name="Изменение валютной пары" confirmation="securitySymbol,shortName,fullName,section,lotCurrencyCode,counterPartyLotCurrencyCode,lots,price,accuracy,amountLotsCurrency,settlementDate,workflowStatus" class="ru.spcex.clearing.backendapi.controller.request.cud.securities.CurrencyPairSecurityUpdateAction">
@ -894,14 +892,12 @@
<securitySymbol type="2" length="255" name="Код инструмента" shortname="Код" required="true"/>
<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" required="true"/>
<fullName type="2" length="255" name="Полное наименование инструмента" shortname="Наименование" required="true"/>
<market type="12" name="Наименование режима" shortname="Режим" link="market" linkKeyCode="code" linkCode="description" required="true"/>
<currencyPairId type="1" dbname="Идентификатор валютной пары" name="Валютная пара" shortname="Инструмент" link="currencyPair" required="true"/>
<lotSize type="11" name="Размер лота" shortname="Лот" required="true"/>
<minStep type="11" name="Шаг цены" shortname="Шаг цены" required="true"/>
<baseUnitSize type="11" name="Количество валюты лота" shortname="Количество" required="true"/>
<settlementType type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" link="currencySettlementType" required="true"/>
<settlementType dbname="Тип расчета" name="Тип расчета" shortname="Тип расчета" link="currencySettlementType" required="true"/>
<workflowStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" link="workflowStatus" extends="security" required="true"/>
<settlementOrganization type="2" length="255" name="Наименование расчетной организации" shortname="Расчетная организация" required="true"/>
<clearingOrganization type="2" length="255" name="Наименование клиринговой организации" shortname="Клиринговая организация" required="true" enabled="false"/>
</put>
<delete name="Блокировка валютной пары" confirmation="securitySymbol,shortName" class="ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction">

24
clearing-parent/backend-api/src/test/resources/meta.json
View file

@ -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

12
clearing-parent/db-scripts/src/main/resources/db/DATA.sql
View file

@ -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;

6
clearing-parent/db-scripts/src/main/resources/db/DATA_INITIAL.sql
View file

@ -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;

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

@ -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 'Наименование клиринговой организации';

10
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.11.sql
View file

@ -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)';

4
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CurrencyPairSecurityService.java
View file

@ -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());

6
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/validation/ValidationProvider.java
View file

@ -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,

20
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityNewRequest.java
View file

@ -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;
}

20
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/security/CurrencyPairSecurityUpdateRequest.java
View file

@ -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;
}