From 9bd0ad49ec7a81129fc12e12621caf238ad6b174 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Sat, 27 Apr 2024 11:15:51 +0300 Subject: [PATCH] account-service http://jira.mfd.msk:8088/browse/CLS-631 TradingClearingRegistryList bug fix --- .../TradingClearingRegistryListValidationConfig.java | 7 ++++--- .../TradingClearingRegistryListController.java | 3 ++- .../backend-api/src/main/resources/meta/meta.json | 6 +++--- .../backend-api/src/main/resources/meta/meta.xml | 6 +++--- clearing-parent/backend-api/src/test/resources/meta.json | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/{register => registry}/TradingClearingRegistryListController.java (97%) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryListValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryListValidationConfig.java index b18cd3eac..abdec906e 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryListValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryListValidationConfig.java @@ -79,17 +79,18 @@ public class TradingClearingRegistryListValidationConfig { addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary); return new ValidatorImpl>(context, IdPresentRule.instance2("id", - TradingClearingRegistryListUpdateRequest::getTradingClearingRegistryId, + TradingClearingRegistryListUpdateRequest::getId, IMDGDistributedNames.Map_TradingClearingRegistryList, TradingClearingRegistryList.class, AccountError.RequiredFieldEmpty, - AccountError.TradingClearingRegistryNotFound, + AccountError.RecordNotFound, true, (tcrList)-> { Long accountId = tcrList.getAccountId(); if (accountId==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; Imdg tradingClearingRegistryListImdg = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistryList, TradingClearingRegistryList.class); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/TradingClearingRegistryListController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryListController.java similarity index 97% rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/TradingClearingRegistryListController.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryListController.java index b9f529e0e..c0a854b60 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/TradingClearingRegistryListController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryListController.java @@ -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.ApiParam; @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.Map; import java.util.concurrent.ExecutionException; +// todo unittest for TradingClearingRegistryListController @Controller @RequestMapping("/trading-clearing-registries-list") public class TradingClearingRegistryListController extends AbstractQueueController { 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 5bb12cbfb..03c6f56b7 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.json +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json @@ -1,6 +1,6 @@ { - "version": "3.11.0.85", + "version": "3.11.0.86", "enums": { @@ -4303,7 +4303,7 @@ "name": "Добавление списка счетов ТКР", - "confirmation": "tradingClearingRegistryId,accountId,status", + "confirmation": "tradingClearingRegistryId,accountId", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction", @@ -4322,7 +4322,7 @@ "name": "Изменение списка счетов ТКР", - "confirmation": "tradingClearingRegistryId,accountId,status", + "confirmation": "id,status", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction", 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 9abe6aae7..5923015e0 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1,6 +1,6 @@ - + @@ -997,11 +997,11 @@ - + - + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 5bb12cbfb..03c6f56b7 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.11.0.85", + "version": "3.11.0.86", "enums": { @@ -4303,7 +4303,7 @@ "name": "Добавление списка счетов ТКР", - "confirmation": "tradingClearingRegistryId,accountId,status", + "confirmation": "tradingClearingRegistryId,accountId", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListNewAction", @@ -4322,7 +4322,7 @@ "name": "Изменение списка счетов ТКР", - "confirmation": "tradingClearingRegistryId,accountId,status", + "confirmation": "id,status", "class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryListUpdateAction",