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

account-service http://jira.mfd.msk:8088/browse/CLS-631 TradingClearingRegistryList bug fix

Browse source
This commit is contained in:
AKurakin 2024-04-27 11:15:51 +03:00
parent 8671f8e64c
commit 9bd0ad49ec
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryListValidationConfig.java
View file

@ -79,17 +79,18 @@ public class TradingClearingRegistryListValidationConfig {
addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary); addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
return new ValidatorImpl<ImdgValidationContext<TradingClearingRegistryListUpdateRequest>>(context, return new ValidatorImpl<ImdgValidationContext<TradingClearingRegistryListUpdateRequest>>(context,
IdPresentRule.instance2("id", IdPresentRule.instance2("id",
TradingClearingRegistryListUpdateRequest::getTradingClearingRegistryId, TradingClearingRegistryListUpdateRequest::getId,
IMDGDistributedNames.Map_TradingClearingRegistryList, IMDGDistributedNames.Map_TradingClearingRegistryList,
TradingClearingRegistryList.class, TradingClearingRegistryList.class,
AccountError.RequiredFieldEmpty, AccountError.RequiredFieldEmpty,
AccountError.TradingClearingRegistryNotFound, AccountError.RecordNotFound,
true, true,
(tcrList)-> { (tcrList)-> {
Long accountId = tcrList.getAccountId(); Long accountId = tcrList.getAccountId();
if (accountId==null) if (accountId==null)
return null; return null;
if (!IEnumKey.contains(context.getValidatedObject().getStatus(), ServiceStatus.Active, ServiceStatus.Reopened)) if (!IEnumKey.contains(context.getValidatedObject().getStatus(),
ServiceStatus.Active, ServiceStatus.Reopened))
return null; return null;
Imdg<TradingClearingRegistryList> tradingClearingRegistryListImdg = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistryList, TradingClearingRegistryList.class); Imdg<TradingClearingRegistryList> tradingClearingRegistryListImdg = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistryList, TradingClearingRegistryList.class);

3
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/TradingClearingRegistryListController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryListController.java
View file

@ -1,4 +1,4 @@
package ru.spcex.clearing.backendapi.controller.queue.register; package ru.spcex.clearing.backendapi.controller.queue.registry;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
// todo unittest for TradingClearingRegistryListController
@Controller @Controller
@RequestMapping("/trading-clearing-registries-list") @RequestMapping("/trading-clearing-registries-list")
public class TradingClearingRegistryListController extends AbstractQueueController { public class TradingClearingRegistryListController extends AbstractQueueController {

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

@ -1,6 +1,6 @@
{ {
"version": "3.11.0.85", "version": "3.11.0.86",
"enums": { "enums": {
@ -4303,7 +4303,7 @@
"name": "Добавление списка счетов ТКР", "name": "Добавление списка счетов ТКР",
"confirmation": "tradingClearingRegistryId,accountId,status", "confirmation": "tradingClearingRegistryId,accountId",
"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction",
@ -4322,7 +4322,7 @@
"name": "Изменение списка счетов ТКР", "name": "Изменение списка счетов ТКР",
"confirmation": "tradingClearingRegistryId,accountId,status", "confirmation": "id,status",
"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction",

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?--> <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
<meta version="3.11.0.85"> <meta version="3.11.0.86">
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" --> <!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
<!--Здесь словари--> <!--Здесь словари-->
<enums> <enums>
@ -997,11 +997,11 @@
<createdAt field="created" type="4" name="Дата и время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/> <createdAt field="created" type="4" name="Дата и время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
<updatedAt field="updated" type="4" name="Дата и время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/> <updatedAt field="updated" type="4" name="Дата и время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
<actions> <actions>
<post name="Добавление списка счетов ТКР" confirmation="tradingClearingRegistryId,accountId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction"> <post name="Добавление списка счетов ТКР" confirmation="tradingClearingRegistryId,accountId" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction">
<tradingClearingRegistryId type="1" name="Торгово-клиринговый регистр" shortname="ТКР" link="tradingClearingRegistry" linkCode="code"/> <tradingClearingRegistryId type="1" name="Торгово-клиринговый регистр" shortname="ТКР" link="tradingClearingRegistry" linkCode="code"/>
<accountId type="1" name="Идентификатор счёта" shortname="Счёт" link="account" linkCode="account"/> <accountId type="1" name="Идентификатор счёта" shortname="Счёт" link="account" linkCode="account"/>
</post> </post>
<put name="Изменение списка счетов ТКР" confirmation="tradingClearingRegistryId,accountId,status" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction"> <put name="Изменение списка счетов ТКР" confirmation="id,status" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction">
<id type="1" name="Идентификатор записи" shortname="ID" link="clientCode" linkCode="id" required="true"/> <id type="1" name="Идентификатор записи" shortname="ID" link="clientCode" linkCode="id" required="true"/>
<status type="12" name="Наименование статуса" shortname="Статус" link="serviceStatus" required="true"/> <status type="12" name="Наименование статуса" shortname="Статус" link="serviceStatus" required="true"/>
</put> </put>

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

@ -1,6 +1,6 @@
{ {
"version": "3.11.0.85", "version": "3.11.0.86",
"enums": { "enums": {
@ -4303,7 +4303,7 @@
"name": "Добавление списка счетов ТКР", "name": "Добавление списка счетов ТКР",
"confirmation": "tradingClearingRegistryId,accountId,status", "confirmation": "tradingClearingRegistryId,accountId",
"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction",
@ -4322,7 +4322,7 @@
"name": "Изменение списка счетов ТКР", "name": "Изменение списка счетов ТКР",
"confirmation": "tradingClearingRegistryId,accountId,status", "confirmation": "id,status",
"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction",