Skip to content

[TAM-2038] Fix alert schedule for sensors with aggregated values #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GonzoSpire merged 2 commits into from
Mar 24, 2026
Merged

[TAM-2038] Fix alert schedule for sensors with aggregated values #1022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cadea9e
[TAM-2038] Fix alert schedule for sensors with aggregated values
Mar 23, 2026
8d9ee55
up version
Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[TAM-2038] Fix alert schedule for sensors with aggregated values
  • Loading branch information
Siarhei Hanich committed Mar 23, 2026
commit cadea9e449e284d937b93253466b860fe9d908a6
4 changes: 2 additions & 2 deletions src/server/HSMCommon/SensorValues/BaseValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public DateTime Time

[JsonIgnore]
[MemoryPackIgnore]
public DateTime LastUpdateTime => LastReceivingTime ?? ReceivingTime;
public DateTime LastUpdateTime => LastReceivingTime ?? Time;


[JsonIgnore]
Expand All @@ -113,7 +113,7 @@ public bool TryAggregateValue(BaseValue value)
{
if (IsEqual(value))
{
LastReceivingTime = value.ReceivingTime;
LastReceivingTime = value.Time;
AggregatedValuesCount++;

return true;
Expand Down
4 changes: 2 additions & 2 deletions src/server/HSMServer.Core/Model/Policies/PolicyCollection/SensorPolicyCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ internal bool SensorTimeout(BaseValue value)
bool schedulePassed = true;
if (TimeToLive.ScheduleId.HasValue)
{
schedulePassed = _scheduleProvider.IsWorkingTime(TimeToLive.ScheduleId.Value, value.Time);
schedulePassed = _scheduleProvider.IsWorkingTime(TimeToLive.ScheduleId.Value, value.LastUpdateTime);
}

if (!schedulePassed)
Expand Down Expand Up @@ -183,7 +183,7 @@ protected override bool CalculateStorageResult(ValueType value, bool isLastValue
bool schedulePassed = true;
if (policy.ScheduleId.HasValue)
{
schedulePassed = _scheduleProvider.IsWorkingTime(policy.ScheduleId.Value, value.Time);
schedulePassed = _scheduleProvider.IsWorkingTime(policy.ScheduleId.Value, value.LastUpdateTime);
}

if (!schedulePassed)
Expand Down
2 changes: 1 addition & 1 deletion src/server/HSMServer/ApiObjectsConverters/ApiCsvConverters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ internal static class ApiCsvConverters
NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
};

private static readonly Func<BaseValue, string> _baseLastUpdateLambda = value => value.LastReceivingTime is null ? nameof(BaseValue.ReceivingTime) : nameof(BaseValue.LastReceivingTime);
private static readonly Func<BaseValue, string> _baseLastUpdateLambda = value => value.LastReceivingTime is null ? nameof(BaseValue.Time) : nameof(BaseValue.LastReceivingTime);

private static readonly Dictionary<Header, ExportOptions> _simpleSensorHeader = new()
{
Expand Down
Loading