From 70433b7f85be172af41e8342967aed2e6a53ab71 Mon Sep 17 00:00:00 2001
From: psemenkov <psemenkov@mfd.ru>
Date: Mon, 24 Apr 2023 17:52:20 +0300
Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-268=20?=
 =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=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

---
 .../scheduler/PlannerAllTodayBuilder.java     | 22 ++++++++++---------
 .../imdg/services/PlannerAllTodayMaker.java   |  8 +++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java b/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java
index afca5a269..3030d10a2 100644
--- a/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java
+++ b/clearing-parent/cleaning-builders/src/main/java/ru/spcex/clearing/scheduler/PlannerAllTodayBuilder.java
@@ -24,27 +24,29 @@ public class PlannerAllTodayBuilder {
     }
     private PlannerAllTodayBuilder(){}
 
+    //пока для clearingCalendar нет сеттера append, если появится нужно поправить ClearingCalendarService.deleteFromPlannerAllTodayMap()
+    //из-за поля this.parent = Parent.Template.getKey();
     public PlannerAllTodayBuilder append(PlannerTemplate plannerTemplate){
         this.task = plannerTemplate.getTask();
         this.taskTime = plannerTemplate.getTaskTime();
         this.taskStatus = plannerTemplate.getTaskStatus();
         this.companyId = plannerTemplate.getCompanyId();
         this.securityId = plannerTemplate.getSecurityId();
-        this.parent = Parent.Planner.getKey();
+        this.parent = Parent.Template.getKey();
         this.id = plannerTemplate.getId();
         return this;
     }
 
-    public PlannerAllTodayBuilder append(Planner plannerTemplate){
-        this.task = plannerTemplate.getTask();
-        this.taskTime = plannerTemplate.getTaskTime();
-        this.clearingDate = plannerTemplate.getClearingDate();
-        this.market = plannerTemplate.getMarket();
-        this.taskStatus = plannerTemplate.getTaskStatus();
-        this.companyId = plannerTemplate.getCompanyId();
-        this.securityId = plannerTemplate.getSecurityId();
+    public PlannerAllTodayBuilder append(Planner planner){
+        this.task = planner.getTask();
+        this.taskTime = planner.getTaskTime();
+        this.clearingDate = planner.getClearingDate();
+        this.market = planner.getMarket();
+        this.taskStatus = planner.getTaskStatus();
+        this.companyId = planner.getCompanyId();
+        this.securityId = planner.getSecurityId();
         this.parent = Parent.Planner.getKey();
-        this.id = plannerTemplate.getId();
+        this.id = planner.getId();
         return this;
     }
 
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java
index 40eea61ce..4b74e1c97 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/PlannerAllTodayMaker.java
@@ -3,6 +3,7 @@ package ru.spcex.clearing.imdg.services;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
 import ru.clearing.classes.statics.data.scheduler.Planner;
@@ -27,7 +28,7 @@ public class PlannerAllTodayMaker {
     private final IMap<Long, PlannerAllToday> plannerAllTodayMap;
 
     @Autowired
-    public PlannerAllTodayMaker(HazelcastInstance hazelcastInstance) {
+    public PlannerAllTodayMaker(@Qualifier("hazelcastInstanceImdg") HazelcastInstance hazelcastInstance) {
         this.hazelcastInstance = hazelcastInstance;
         plannerMap = hazelcastInstance.getMap(Map_Planner);
         clearingCalendarMap = hazelcastInstance.getMap(Map_ClearingCalendar);
@@ -61,9 +62,8 @@ public class PlannerAllTodayMaker {
         List<PlannerAllToday> res = new ArrayList<>();
 
         if (needAddFromPlannerTemplate(currentDate, clearingCalendarMap.values())){
-            for (PlannerTemplate plannerTemplate : plannerTemplateMap.values()) {
-                res.add(PlannerAllTodayBuilder.builder().append(plannerTemplate).build());
-            }
+            plannerTemplateMap.values().stream().filter(plannerTemplate -> Status.Active.getKey().equals(plannerTemplate.getTaskStatus()))
+                    .forEach(plannerTemplate -> res.add(PlannerAllTodayBuilder.builder().append(plannerTemplate).build()));
         }
         return res;
     }