From db71d1ebd3651107aeac61b1faa9ee09d661b6b9 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Thu, 18 Dec 2025 11:21:37 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-921

---
 .../service/ClearingCalendarService.java      | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
index 31dc9c814..6c80ae66f 100644
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
@@ -1,5 +1,12 @@
 package ru.spcex.clearing.scheduler.service;
 
+import java.time.DayOfWeek;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
 import org.slf4j.Logger;
@@ -19,7 +26,9 @@ import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendar
 import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarUpdateRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
+import static ru.spcex.clearing.scheduler.ISchedulerChecker.isWorkDayByTradingCalendar;
 import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder;
+import static ru.spcex.clearing.scheduler.config.PlannerQueueConfig.addToPlannerQueue;
 import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.platform.enumeration.DayStatus;
 import ru.spcex.platform.enumeration.Parent;
@@ -28,17 +37,6 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 import ru.spcex.platform.utils.validation.IValidator;
 
-import java.time.DayOfWeek;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Function;
-
-import static ru.spcex.clearing.scheduler.ISchedulerChecker.isWorkDayByTradingCalendar;
-import static ru.spcex.clearing.scheduler.config.PlannerQueueConfig.addToPlannerQueue;
-
 @Service
 public class ClearingCalendarService extends QueueConsumer implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
@@ -140,8 +138,16 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
         log.debug("CommonDeleteRequest received id = {}", req.getId());
         ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());
 
+        LocalDate deletedDate = clearingCalendar != null ? clearingCalendar.getClearingDate() : null;
+
         clearingCalendarMap.delete(clearingCalendar);
-        deleteFromPlannerAllTodayMap();
+
+        if (deletedDate != null && deletedDate.equals(LocalDate.now())) {
+            log.debug("deleted clearing calendar id={}; clearingDate=today; ", clearingCalendar.getId());
+            deleteFromPlannerAllTodayMap();
+        } else {
+            log.debug("Skip deleteFromPlannerAllTodayMap(): deletedDate={}, today={}", deletedDate, LocalDate.now());
+        }
         return null;
     }