fixes

src/server/HSMServer.Core/AlertSchedule/AlertScheduleProvider.cs

@@ -1,16 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using NLog;
 using HSMServer.Core.DataLayer;
 using HSMServer.Core.Model.Policies;
 
 
-
 namespace HSMServer.Core.Schedule
 {
     public class AlertScheduleProvider : IAlertScheduleProvider
     {
+        private readonly TimeSpan CLEANUP_PERIOD = TimeSpan.FromMinutes(5);
+
         private readonly IDatabaseCore _database;
         private readonly AlertScheduleParser _parser = new();
         private readonly Logger _logger = LogManager.GetCurrentClassLogger();
@@ -19,6 +21,9 @@ public class AlertScheduleProvider : IAlertScheduleProvider
 
         private readonly object _lock = new object();
 
+        private readonly Timer _cleanupTimer;
+        private bool _disposed = false;
+
         private class CacheEntry
         {
             public AlertSchedule Schedule { get; set; }
@@ -69,6 +74,11 @@ public AlertScheduleProvider(IDatabaseCore database)
         {
             _database = database;
             LoadSchedulesFromDatabase();
+
+            _cleanupTimer = new Timer(_ => CleanupIntervalCache(),
+                null,
+                CLEANUP_PERIOD,
+                CLEANUP_PERIOD);
         }
 
         public bool IsWorkingTime(Guid id, DateTime time)
@@ -100,7 +110,7 @@ public bool IsWorkingTime(Guid id, DateTime time)
         public bool IsWorkingTime(Guid id, DateTime startTime, DateTime endTime)
         {
             if (startTime >= endTime)
-                throw new ArgumentException("Start time must be less than end time");
+                throw new ArgumentException("Start time must be less than end time", nameof(startTime));
 
             lock (_lock)
             {
@@ -173,6 +183,47 @@ public void SaveSchedule(AlertSchedule schedule)
             }
         }
 
+        public void CleanupIntervalCache()
+        {
+            try
+            {
+                lock (_lock)
+                {
+                    var cleanupThreshold = DateTime.UtcNow.AddMinutes(1);
+                    int totalRemoved = 0;
+
+                    foreach (var cacheEntry in _cache.Values)
+                    {
+                        var keysToRemove = new HashSet<(DateTime, DateTime)>();
+
+                        foreach (var kvp in cacheEntry.IntervalCache)
+                        {
+                            if (kvp.Key.EndTime < cleanupThreshold)
+                            {
+                                keysToRemove.Add(kvp.Key);
+                            }
+                        }
+
+                        foreach (var key in keysToRemove)
+                        {
+                            cacheEntry.IntervalCache.Remove(key);
+                        }
+
+                        totalRemoved += keysToRemove.Count;
+                    }
+
+                    if (totalRemoved > 0)
+                    {
+                        _logger.Debug($"Cleaned up {totalRemoved} expired interval cache entries");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Error during interval cache cleanup");
+            }
+        }
+
         private void LoadSchedulesFromDatabase()
         {
             var scheduleEntities = _database.GetAllAlertSchedules();
@@ -204,5 +255,15 @@ private void LoadSchedulesFromDatabase()
                 }
             }
         }
+
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                _cleanupTimer?.Dispose();
+                _disposed = true;
+                GC.SuppressFinalize(this);
+            }
+        }
     }
 }

src/server/HSMServer.Core/Cache/TreeValuesCache.cs

@@ -2295,24 +2295,19 @@ private void RemoveProductFromCache(ProductModel product)
         public List<BaseSensorModel> GetSensorsByAlertSchedule(Guid id)
         {
             var result = new List<BaseSensorModel>();
-            foreach (var (_, sensor) in _sensorsById)
+
+            foreach (var sensor in _sensorsById.Values)
             {
                 if (sensor.Policies.TimeToLive.ScheduleId == id)
                 {
                     result.Add(sensor);
                     continue;
                 }
 
-
-                foreach (var policy in sensor.Policies)
-                {
-                    if (policy.ScheduleId == id)
-                    {
-                        result.Add(sensor);
-                        continue;
-                    }
-                }
+                if (sensor.Policies.Any(policy => policy.ScheduleId == id))
+                    result.Add(sensor);
             }
+
             return result;
         }
     }

src/server/HSMServer.Core/Model/Policies/AlertSchedule.cs

@@ -63,10 +63,10 @@ public bool IsWorkingTime(DateTime dateTime)
         public bool IsWorkingTime(DateTime startTime, DateTime endTime)
         {
             if (startTime >= endTime)
-                throw new ArgumentException("Start time must be less than end time");
+                throw new ArgumentException("Start time must be less than end time", nameof(startTime));
 
-            var currentTime = startTime;
-            var end = endTime;
+            var currentTime = ConvertUtcToLocalTime(startTime);
+            var end = ConvertUtcToLocalTime(endTime);
 
             while (currentTime.Date <= end.Date)
             {