From 476372431596cdb82efcadb2f7b32b3dae78705c Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 25 Aug 2023 10:55:54 +0300 Subject: [PATCH] =?UTF-8?q?securities-service=20http://jira.mfd.msk:8088/b?= =?UTF-8?q?rowse/CLS-420=20GatewaySecurityService=20=D0=B1=D1=83=D0=B4?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BF=D1=8B=D1=82=D0=B0=D1=82=D1=8C=D1=81=D1=8F?= =?UTF-8?q?=20=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C,=20=D0=BD=D0=B5=D1=81?= =?UTF-8?q?=D0=BC=D0=BE=D1=82=D1=80=D1=8F=20=D0=BD=D0=B0=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/cud/GatewaySecurityService.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java index e6a8ec5a3..440ef9868 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java @@ -37,6 +37,7 @@ import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; +import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.error.ValidationException; import java.util.*; @@ -66,6 +67,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin private final ValidationProvider validation; private final UserRoleVerification userRoleVerification; private final ValidationHelper validationHelper; + private final IMessageResolver messageResolver; private final RequestHelper requestHelper; @Autowired @@ -76,6 +78,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin UserRoleVerification userRoleVerification, ValidationHelper validationHelper, RequestHelper requestHelper, + IMessageResolver messageResolver, FixedIncomeSecurityService fixedIncomeSecurityService, EquitySecurityService equitySecurityService, @@ -98,6 +101,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin this.userRoleVerification = userRoleVerification.setRoleForVerification(UserRole.Admin); this.validationHelper = validationHelper; this.requestHelper = requestHelper; + this.messageResolver = messageResolver; this.fixedIncomeSecurityService = fixedIncomeSecurityService; this.equitySecurityService = equitySecurityService; @@ -177,7 +181,6 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin } else { log.debug("CompanyId (issuer) found: {}", companyId); } -// ImdgTransaction transaction = imdgProvider.newTransaction(); todo transaction Security security = null; @@ -206,7 +209,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin EquitySecurityGatewayRequest equitySecurityGatewayRequest = (EquitySecurityGatewayRequest) req; EquitySecurityNewRequest equityRequest = equitySecurityGatewayRequest.getSecurity(); if (StringUtils.isEmpty(equityRequest.getSecuritySymbol())) { - log.warn("Skip creating eqtySecurtity without securityId: uuid: {}", req.getUuid()); + log.warn("Skip creating equitySecurity without securityId: uuid: {}", req.getUuid()); return null; } log.debug("Processed request with securitySymbol: {}", equityRequest.getSecuritySymbol()); @@ -223,8 +226,13 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin } } } catch (ValidationException expected) { - log.warn("Error create or update issue: {}", expected.toString()); - return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); + if (security == null) { + log.error("Error create or update issue: {}", messageResolver.resolve(expected.getEnumMsg())); + return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); + } else { + log.warn("Error create or update issue: {}. But issue id={} found, try continue...", + messageResolver.resolve(expected.getEnumMsg()), security.getId()); + } } Long securityId; @@ -259,8 +267,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin log.debug("Has updated listing.id={}", listing.getId()); } } catch (ValidationException expected) { - log.warn("Error create or update listing: {}", expected.toString()); - return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); + log.warn("At request {} for securityId={} has error when create or update listing: {}", + baseRequest.getId(), securityId, messageResolver.resolve(expected.getEnumMsg())); +// return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); } } @@ -280,8 +289,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin log.debug("Has update couponPeriod.id={}", couponPeriod.getId()); } } catch (ValidationException expected) { - log.warn("Error create or update couponPeriod: {}", expected.toString()); - return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); + log.warn("At request {} for securityId={} has error when create or update couponPeriod: {}", + baseRequest.getId(), securityId, messageResolver.resolve(expected.getEnumMsg())); +// return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); } } @@ -300,8 +310,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin log.debug("Has update fixedIncomeCashFlow.id={}", fixedIncomeCashFlow.getId()); } } catch (ValidationException expected) { - log.warn("Error create or update fixedIncomeCashFlow: {}", expected.toString()); - return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); + log.warn("At request {} for securityId={} has error when create or update fixedIncomeCashFlow: {}", + baseRequest.getId(), securityId, messageResolver.resolve(expected.getEnumMsg())); +// return requestHelper.makeErrorResponse(baseRequest, expected.getEnumMsg()); } }