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 84394d492..00716c327 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -2501,6 +2501,8 @@ "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.MoneyMarketSecurityNewAction", + "fields": [ {"code": "instrumentType", "type": 12,"name": "Наименование типа инструмента","shortname": "Тип инструмента","link": "instrumentType","required": true,"enabled": false @@ -2578,6 +2580,8 @@ "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.MoneyMarketSecurityUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "moneyMarketSecurity","linkCode": "id","required": true @@ -2770,6 +2774,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,shareType", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.EquitySecurityNewAction", + "fields": [ {"code": "instrumentType", "type": 12,"name": "Наименование типа инструмента","shortname": "Тип инструмента","link": "instrumentType","required": true,"enabled": false @@ -2823,6 +2829,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,shareType", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.EquitySecurityUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "equitySecurity","linkCode": "id","required": true @@ -2981,6 +2989,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,bondType,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.FixedIncomeSecurityNewAction", + "fields": [ {"code": "instrumentType", "type": 12,"name": "Наименование типа инструмента","shortname": "Тип инструмента","link": "instrumentType","required": true,"enabled": false @@ -3054,6 +3064,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,bondType,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.FixedIncomeSecurityUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "fixedIncomeSecurity","linkCode": "id","required": true @@ -3131,6 +3143,8 @@ "confirmation": "securitySymbol,shortName", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "fixedIncomeSecurity","linkCode": "id","required": true @@ -3505,6 +3519,8 @@ "confirmation": "companyId,code,tradingClearingRegistryId,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.ClientCodeNewAction", + "fields": [ {"code": "companyId", "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true,"enabled": false @@ -3538,6 +3554,8 @@ "confirmation": "companyId,code,tradingClearingRegistryId,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.ClientCodeUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3648,6 +3666,8 @@ "confirmation": "companyId,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryNewAction", + "fields": [ {"code": "companyId", "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true @@ -3673,6 +3693,8 @@ "confirmation": "companyId,code,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3925,6 +3947,8 @@ "confirmation": "contract,outboundAmount,refundDate", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew", + "fields": [ {"code": "contract", "type": 2,"length": 255,"name": "Договор","shortname": "Договор","required": true @@ -4006,6 +4030,8 @@ "confirmation": "companyId,account,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountNewAction", + "fields": [ {"code": "companyId", "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true @@ -4031,6 +4057,8 @@ "confirmation": "companyId,account,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "account","linkCode": "id","required": true @@ -4060,6 +4088,8 @@ "confirmation": "companyId,account", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "account","linkCode": "id","required": true @@ -4226,6 +4256,8 @@ "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNewAction", + "fields": [ {"code": "currency", "type": 12,"name": "Код валюты","shortname": "Валюта","required": true,"link": "currencyCode","linkCode": "code" @@ -4275,6 +4307,8 @@ "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "bankAccount","linkCode": "id","required": true @@ -4489,6 +4523,8 @@ "name": "Новый шаблон расписания операционного дня", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerTemplateNewAction", + "fields": [ {"code": "task", "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true @@ -4524,6 +4560,8 @@ "name": "Изменение шаблона расписания операционного дня", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerTemplateUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "plannerTemplate","linkCode": "id","required": true @@ -4614,6 +4652,8 @@ "name": "Добавление записи в календарь", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.ClearingCalendarNewAction", + "fields": [ {"code": "clearingDate", "type": 6,"name": "Дата","shortname": "Дата","required": true @@ -4633,6 +4673,8 @@ "name": "Изменение записи в календаре", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.ClearingCalendarUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clearingCalendar","linkCode": "id","required": true @@ -4731,6 +4773,8 @@ "name": "Новое расписание", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerNewAction", + "fields": [ {"code": "task", "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true @@ -4770,6 +4814,8 @@ "name": "Изменение расписания", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "planner","required": true,"linkCode": "id" @@ -6666,6 +6712,8 @@ "destination": "payment-instructions/clearing-outbound", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.payment.PIClearingOutbondActionNew", + "fields": [ {"code": "senderId", "type": 1,"name": "Участник отправитель","shortname": "Отправитель","link": "company","required": true 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 d7d11b810..a7999061e 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -578,7 +578,7 @@ - + @@ -597,7 +597,7 @@ - + @@ -643,7 +643,7 @@ - + @@ -656,7 +656,7 @@ - + @@ -695,7 +695,7 @@ - + @@ -713,7 +713,7 @@ - + @@ -732,7 +732,7 @@ - + @@ -818,7 +818,7 @@ - + @@ -826,7 +826,7 @@ - + @@ -853,13 +853,13 @@ - + - + @@ -921,7 +921,7 @@ - + @@ -941,20 +941,20 @@ - + - + - + @@ -995,7 +995,7 @@ - + @@ -1007,7 +1007,7 @@ - + @@ -1055,7 +1055,7 @@ - +
@@ -1064,7 +1064,7 @@ - + @@ -1087,12 +1087,12 @@ - + - + @@ -1117,7 +1117,7 @@ - + @@ -1127,7 +1127,7 @@ - + @@ -1554,7 +1554,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/IOperatorTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/IOperatorTest.java index 3bb4f522d..c31d29f3c 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/IOperatorTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/IOperatorTest.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import ru.spcex.clearing.backendapi.meta.MetaServer; import ru.spcex.clearing.backendapi.service.impl.OperatorImpl; import ru.spcex.clearing.backendapi.service.validation.ActionMetaValidation; import ru.spcex.clearing.backendapi.service.validation.ActionValidationProvider; @@ -29,4 +30,10 @@ public class IOperatorTest { return new ActionValidationProvider(hazelcastServiceTest); } + @Bean + public ActionMetaValidation actionMetaValidation(MetaServer metaServer) { + return new ActionMetaValidation(metaServer); + } + + } diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 2d5c5b1e8..00716c327 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -2501,6 +2501,8 @@ "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.MoneyMarketSecurityNewAction", + "fields": [ {"code": "instrumentType", "type": 12,"name": "Наименование типа инструмента","shortname": "Тип инструмента","link": "instrumentType","required": true,"enabled": false @@ -2578,6 +2580,8 @@ "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.MoneyMarketSecurityUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "moneyMarketSecurity","linkCode": "id","required": true @@ -2770,6 +2774,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,shareType", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.EquitySecurityNewAction", + "fields": [ {"code": "instrumentType", "type": 12,"name": "Наименование типа инструмента","shortname": "Тип инструмента","link": "instrumentType","required": true,"enabled": false @@ -2823,6 +2829,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,shareType", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.EquitySecurityUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "equitySecurity","linkCode": "id","required": true @@ -2981,6 +2989,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,bondType,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.FixedIncomeSecurityNewAction", + "fields": [ {"code": "instrumentType", "type": 12,"name": "Наименование типа инструмента","shortname": "Тип инструмента","link": "instrumentType","required": true,"enabled": false @@ -3054,6 +3064,8 @@ "confirmation": "securitySymbol,shortName,fullName,isin,bondType,nominalValue,nominalCurrency", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.securities.FixedIncomeSecurityUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "fixedIncomeSecurity","linkCode": "id","required": true @@ -3131,6 +3143,8 @@ "confirmation": "securitySymbol,shortName", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "fixedIncomeSecurity","linkCode": "id","required": true @@ -3505,6 +3519,8 @@ "confirmation": "companyId,code,tradingClearingRegistryId,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.ClientCodeNewAction", + "fields": [ {"code": "companyId", "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true,"enabled": false @@ -3538,6 +3554,8 @@ "confirmation": "companyId,code,tradingClearingRegistryId,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.ClientCodeUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3648,6 +3666,8 @@ "confirmation": "companyId,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryNewAction", + "fields": [ {"code": "companyId", "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true @@ -3673,6 +3693,8 @@ "confirmation": "companyId,code,moneyAccountId,depoAccountId,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clientCode","linkCode": "id","required": true @@ -3925,6 +3947,8 @@ "confirmation": "contract,outboundAmount,refundDate", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew", + "fields": [ {"code": "contract", "type": 2,"length": 255,"name": "Договор","shortname": "Договор","required": true @@ -4006,6 +4030,8 @@ "confirmation": "companyId,account,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountNewAction", + "fields": [ {"code": "companyId", "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true @@ -4031,6 +4057,8 @@ "confirmation": "companyId,account,status", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "account","linkCode": "id","required": true @@ -4228,6 +4256,8 @@ "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNewAction", + "fields": [ {"code": "currency", "type": 12,"name": "Код валюты","shortname": "Валюта","required": true,"link": "currencyCode","linkCode": "code" @@ -4277,6 +4307,8 @@ "confirmation": "currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account,destination", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "bankAccount","linkCode": "id","required": true @@ -4491,6 +4523,8 @@ "name": "Новый шаблон расписания операционного дня", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerTemplateNewAction", + "fields": [ {"code": "task", "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true @@ -4526,6 +4560,8 @@ "name": "Изменение шаблона расписания операционного дня", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerTemplateUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "plannerTemplate","linkCode": "id","required": true @@ -4616,6 +4652,8 @@ "name": "Добавление записи в календарь", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.ClearingCalendarNewAction", + "fields": [ {"code": "clearingDate", "type": 6,"name": "Дата","shortname": "Дата","required": true @@ -4635,6 +4673,8 @@ "name": "Изменение записи в календаре", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.ClearingCalendarUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "clearingCalendar","linkCode": "id","required": true @@ -4733,6 +4773,8 @@ "name": "Новое расписание", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerNewAction", + "fields": [ {"code": "task", "type": 12,"name": "Наименование задачи","shortname": "Задача","link": "task","required": true @@ -4772,6 +4814,8 @@ "name": "Изменение расписания", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.schedule.PlannerUpdateAction", + "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "planner","required": true,"linkCode": "id" @@ -6668,6 +6712,8 @@ "destination": "payment-instructions/clearing-outbound", + "class": "ru.spcex.clearing.backendapi.controller.request.cud.payment.PIClearingOutbondActionNew", + "fields": [ {"code": "senderId", "type": 1,"name": "Участник отправитель","shortname": "Отправитель","link": "company","required": true