From 10cf6bc3cb5e08c6366464568e333427b0482a1d Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 31 Jan 2023 13:58:05 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20=D0=BF=D0=BE=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D1=83=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA:=20?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B8=201=20=D0=B2=D0=B8=D0=B4=20=D0=BE?=
 =?UTF-8?q?=D1=82=D1=87=D1=91=D1=82=D0=B0=20=D0=BD=D0=B5=20=D1=81=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D1=82=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C,=20=D1=82=D0=BE=20=D0=B4=D0=B1=D1=83=D0=B4=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5;=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20ReportBR=5F0420314=5FP2?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=B8=D0=B8=20company=20=D0=BF=D0=B8=D1=88=D0=B5?=
 =?UTF-8?q?=D1=82=20warn=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/services/ReportsServiceCommand.java     | 13 +++++++++++--
 .../collector/ReportBR_0420314_P2_Collector.java    |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java
index 260a368d0..499228968 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportsServiceCommand.java
@@ -12,6 +12,7 @@ import ru.spcex.clearing.reports.reports.ReportId;
 import ru.spcex.clearing.reports.services.builders.XMLReportBuilder;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.utils.enumeration.IEnumKey;
+import ru.spcex.platform.utils.log.ExceptionUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -74,12 +75,20 @@ public class ReportsServiceCommand implements InitializingBean {
     public void generateReportAll(@Nullable String reportGroup, LocalDate startDate, LocalDate endDate) throws IOException {
         for (ReportWithPeriodCollector<?> reportDataCollector : allPeriodReports) {
             if (reportGroup == null || QUEUE_RUN_REPORT_COMMAND.equals(reportGroup)) {
-                makeSingleReport(reportDataCollector, startDate, endDate);
+                try {
+                    makeSingleReport(reportDataCollector, startDate, endDate);
+                } catch (Exception e) {
+                    log.error("Error generate report of type {}: {}", reportDataCollector, ExceptionUtils.getStackTrace(e));
+                }
             }
         }
         for (SimpleReportCollector<?> reportDataCollector : allSimpleReports) {
             if (reportGroup == null || QUEUE_RUN_DAILY_REPORT_COMMAND.equals(reportGroup)) {
-                makeSingleReport(reportDataCollector);
+                try {
+                    makeSingleReport(reportDataCollector);
+                } catch (Exception e) {
+                    log.error("Error generate report of type {}: {}", reportDataCollector, ExceptionUtils.getStackTrace(e));
+                }
             }
         }
     }
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
index 027135ddc..46bacd498 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/ReportBR_0420314_P2_Collector.java
@@ -68,6 +68,10 @@ public class ReportBR_0420314_P2_Collector extends ReportWithPeriodCollector<Rep
             final Long companyId = entry.getKey();
             List<PaymentInstruction> paymentInstructionsByCompany = entry.getValue();
             Company company = companyImdg.getSingleObjectByID(companyId);
+            if (company == null) {
+                log.warn("Company not found, id={}", companyId);
+                continue;
+            }
             ProfileDocument profileDocumentCntr = profileDocumentImdg.getSingleObjectByFieldValues(Map.of(
                     "companyId", companyId,
                     "documentType", DocumentTypes.cntr.getKey()