From 5f121a09b023185e21b0074ac72cfcee1aa5b52b Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 29 May 2023 15:14:15 +0300 Subject: [PATCH] =?UTF-8?q?account-service=20AccountService=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=D1=81=D1=82=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spcex/clearing/account/service/AccountService.java | 10 +++++----- .../clearing/util/services/IMDGMessageResolver.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java index 4c9d2d4a5..826555e3a 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java @@ -237,7 +237,7 @@ public class AccountService extends QueueConsumer implements InitializingBean { Collection clearingMemberCategories = clearingMemberCategoryMap.getCollectionObjectsByPredicate(companyIdEquals); if (clearingMemberCategories.isEmpty()) - return makeError(AccountError.ClearingCategoryNotFound, "clearingMemberCategory[companyId]", requestId); + return makeError(requestId, AccountError.ClearingCategoryNotFound, companyId, "(any)"); if (clearingMemberCategories.size() > 1) log.warn("ClearingMemberCategory for companyId {} contains multiply elements, use first", companyId); ClearingMemberCategory clearingMemberCategory = clearingMemberCategories.iterator().next(); @@ -251,12 +251,12 @@ public class AccountService extends QueueConsumer implements InitializingBean { } else if (IEnumKey.contains(clearingCategoryValue, ClearingCategory.F, ClearingCategory.C)) { servicePredicate = relationPredicateBuilder.equals("service", ru.spcex.platform.enumeration.Service.FOND.getKey()); } else { - return makeError(AccountError.ClearingCategoryNotFound, "relation[consumerId = companyId].service", requestId); + return makeError(requestId, AccountError.ClearingCategoryNotFound, companyId, clearingCategoryValue + " (case not implemented)"); } ImdgPredicate finalRelationPredicate = relationPredicateBuilder.and(consumerIdPredicate, servicePredicate); Collection relations = relationMap.getCollectionObjectsByPredicate(finalRelationPredicate); - if (relations.isEmpty()) return makeError(AccountError.WrongFieldValue, "companyId", requestId); + if (relations.isEmpty()) return makeError(requestId, AccountError.WrongFieldValue, "companyId", finalRelationPredicate.toString()); if (relations.size() > 1) log.warn("Relation for consumerId {} contains multiply elements, use first", companyId); Relation relation = relations.iterator().next(); @@ -265,8 +265,8 @@ public class AccountService extends QueueConsumer implements InitializingBean { return null; } - private RequestInfoUpdate makeError(AccountError accountError, String fieldName, Long reqId) { - String errMsg = messageResolver.resolve(new EnumMessage(accountError, fieldName)); + private RequestInfoUpdate makeError(Long reqId, AccountError accountError, Object... args) { + String errMsg = messageResolver.resolve(new EnumMessage(accountError, args)); return new RequestInfoUpdate() .setId(reqId) .setStatus(Status.Error) diff --git a/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/IMDGMessageResolver.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/IMDGMessageResolver.java index ce5a7e0f4..2aca843c6 100644 --- a/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/IMDGMessageResolver.java +++ b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/IMDGMessageResolver.java @@ -36,7 +36,7 @@ public class IMDGMessageResolver implements IMessageResolver { String textTemplate = errorDictionary.getName(); return String.format(textTemplate, errMsg.getArgs()); } catch (Exception errFormatting) { // MissingFormatArgumentException - log.warn("Error in message resolver for error {} id {}", errMsg.getSubject(), errMsg.getSubject().getId()); + log.warn("Error in message resolver for error {} id {}. Format error: {}", errMsg.getSubject(), errMsg.getSubject().getId(), errFormatting); return simplFormatter.get(); } }