From 2a8bda41e94689208ee8bfdffc3841d0b94d3ed3 Mon Sep 17 00:00:00 2001
From: psemenkov <psemenkov@mfd.ru>
Date: Fri, 19 May 2023 19:41:05 +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=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20plannerAllToday=20=D0=B5?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B8=20=D1=82=D0=B5=D0=BA.=D0=B4=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8C=3D=D0=9F=D0=9D-=D0=9F=D0=A2=20=D0=B8=20=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=20clearingCalendar=20(=D1=82.?=
 =?UTF-8?q?=D0=B5.=20=D0=BD=D0=B5=D1=82=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B8).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduler/service/PlannerTemplateService.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
index 2e70f0eda..c6b65e707 100644
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
@@ -21,7 +21,7 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder;
 import ru.spcex.clearing.util.security.UserRoleVerification;
-import ru.spcex.platform.enumeration.DayStatus;
+import ru.spcex.platform.enumeration.Status;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
@@ -106,7 +106,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
         plannerTemplate.setSecurityId(req.getSecurityId());
         plannerTemplateMap.insert(plannerTemplate);
 
-        if (todayWorkDay()) {
+        if (todayWorkDay() && Status.Active.equalsByKey(plannerTemplate.getTaskStatus())) {
             PlannerAllToday plannerAllToday = PlannerAllTodayBuilder.builder().append(plannerTemplate).build();
             plannerAllTodayMap.insert(plannerAllToday);
             addToPlannerQueue(TaskManager.Process.add, plannerAllToday);
@@ -143,7 +143,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
                 plannerAllToday.setId(oldPlannerAllToday.getId());
                 plannerAllTodayMap.insert(plannerAllToday);
                 addToPlannerQueue(TaskManager.Process.update, oldPlannerAllToday);
-            }else {
+            } else if (Status.Active.equalsByKey(plannerTemplate.getTaskStatus())) {
                 plannerAllTodayMap.insert(plannerAllToday);
                 addToPlannerQueue(TaskManager.Process.add, plannerAllToday);
             }
@@ -165,7 +165,7 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
 
         if (todayWorkDay()) {
             PlannerAllToday plannerAllToday = plannerAllTodayMap.getSingleObjectBySQL(String.format("parentId = %s", plannerTemplate.getId()));
-            if (plannerAllToday != null){
+            if (plannerAllToday != null) {
                 plannerAllTodayMap.delete(plannerAllToday);
                 addToPlannerQueue(TaskManager.Process.delete, plannerAllToday);
             }
@@ -178,13 +178,12 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin
         LocalDate currentDate = LocalDate.now();
         boolean isWeekend = Arrays.asList(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY).contains(currentDate.getDayOfWeek());
         //проверим есть ли другие записи clearingCalendar с таким же clearingDate, если они актуальные ничего не удаляем
-        Collection<ClearingCalendar> clearingCalendars = clearingCalendarMap.getCollectionObjectsByFieldValues(Map.of("dayStatus", DayStatus.Workday.getKey(),
-                "clearingDate", currentDate));
+        Collection<ClearingCalendar> clearingCalendars = clearingCalendarMap.getCollectionObjectsByFieldValues(Map.of("clearingDate", currentDate));
         if (clearingCalendars != null && !clearingCalendars.isEmpty()) {
             for (ClearingCalendar calendar : clearingCalendars) {
                 if (isValidWorkday(calendar, isWeekend)) return true;
             }
-        }
+        } else return !isWeekend;
         return false;
     }
 }