From 5e5133b580ce344151ae66904d18335d6d0a18a6 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Sat, 27 May 2023 15:51:58 +0300 Subject: [PATCH] . --- .../spcex/clearing/util/services/IMDGMessageResolver.java | 2 +- .../reports/reports/bp/LiabilitiesClaimsReportBuilder.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 0149ece9f..ce5a7e0f4 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 @@ -30,7 +30,7 @@ public class IMDGMessageResolver implements IMessageResolver { try { ErrorCodeDictionary errorDictionary = errorCodeDictionaryIMDG.getSingleObjectByID(errMsg.getSubject().getId()); if (errorDictionary == null) { - log.warn("ERROR_CODE_DICTIONARY not found fo id={}", errMsg.getSubject().getId()); + log.warn("ERROR_CODE_DICTIONARY not found for id={}", errMsg.getSubject().getId()); return simplFormatter.get(); } String textTemplate = errorDictionary.getName(); diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java index 8c505c261..5e82a2020 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java @@ -104,6 +104,10 @@ public abstract class LiabilitiesClaimsReportBuilder

extends CSVReportBuilder execution.getTradingClearingRegistryId() ); + if (registry == null) { + log.warn("registry not found for companyId={}", execution.getCompanyId()); + } + String id = String.valueOf(execution.getId()); String docDate = dateFormatter.format(nowDate); String docTime = timeFormatter.format(nowTime); @@ -114,7 +118,7 @@ public abstract class LiabilitiesClaimsReportBuilder

extends CSVReportBuilder String sessionId = String.valueOf(execution.getSessionId()); String clearingDate = dateFormatter.format(execution.getClearingDate()); String clearingTime = dateFormatter.format(execution.getClearingDate()); - String trdAccId = registry.getTradingClearingRegistry(); + String trdAccId = registry == null? null : registry.getTradingClearingRegistry(); String account = String.valueOf(tradingClearingRegistry.getMoneyAccountId()); String depoAccount = String.valueOf(tradingClearingRegistry.getDepoAccountId()); String currency = execution.getSettlementCurrency();