From cb0d720ae0974e35ae4cf2a9617ec7b5568a34d4 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Fri, 28 Jul 2023 18:51:04 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-358 hot fix

---
 .../reports/ks/KSRepTradesReportBuilder.java   | 18 ++++++++++++++----
 .../reports/services/ReportService.java        |  8 +++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
index d135fc090..c77faeb1f 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepTradesReportBuilder.java
@@ -95,11 +95,21 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
                 ksRepTradesReport.setTrId(execution.getId());
                 ksRepTradesReport.setTkr(execution.getTradingClearingRegistryId());
 
-                Company company = companyImdg.getSingleObjectByID(execution.getCompanyId());
-                ksRepTradesReport.setFirmId(company != null ? company.getTradingCode() : null);
+                if (execution.getCompanyId() != null) {
+                    Company company = companyImdg.getSingleObjectByID(execution.getCompanyId());
+                    ksRepTradesReport.setFirmId(company != null ? company.getTradingCode() : null);
+                } else {
+                    log.info("Execution id = {} was skipped: company_id is null", execution.getId());
+                    continue;
+                }
 
-                Session session = sessionImdg.getSingleObjectByID(execution.getSessionId());
-                ksRepTradesReport.setSessionDate(session != null ? session.getCreated() : null);
+                if (execution.getSessionId() != null) {
+                    Session session = sessionImdg.getSingleObjectByID(execution.getSessionId());
+                    ksRepTradesReport.setSessionDate(session != null ? session.getCreated() : null);
+                } else {
+                    log.info("Execution id = {} was skipped: session_id is null", execution.getId());
+                    continue;
+                }
 
                 if (execution instanceof ExecutionDeposit executionDeposit) {
                     ksRepTradesReport.setCashLiability(executionDeposit.getFirstLegAmount());
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java
index 482fbf73b..dfa173181 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java
@@ -108,11 +108,17 @@ public class ReportService extends QueueConsumer implements InitializingBean {
         this.reportRequestGREPValidator = reportRequestGREPValidator;
         this.reportRequestGRETValidator = reportRequestGRETValidator;
         this.reportRequestGREFValidator = reportRequestGREFValidator;
-        this.outFolder = new File(reportsServiceSettings.getReportModuleOut());
         this.reportBuildersForGREP = reportBuildersForGREP;
         this.reportBuildersForGREF = reportBuildersForGREF;
         this.reportBuildersForGRET = reportBuildersForGRET;
         this.sessionImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Session, Session.class);
+        this.outFolder = new File(reportsServiceSettings.getReportModuleOut());
+        if (!outFolder.exists()) {
+            boolean mkDirOk = outFolder.mkdirs();
+            if (!mkDirOk) throw new IllegalStateException("Can't create output directory for reports, reports-service was terminated");
+        } else if (!outFolder.isDirectory()) {
+            throw new IllegalStateException("Output reports path from settings is not directory!");
+        }
         assert outFolder.isDirectory();
     }