Skip to content
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.

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

⚡ refactor: Adjust query sorting #367

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ public async Task UpdateAsync(AlarmRule alarmRule, bool isEnabled, CheckFrequenc
public async Task<AlarmRuleRecord?> GetLatest(Guid alarmRuleId)
{
var query = await _alarmRuleRecordRepository.GetQueryableAsync();
return query.Where(x => x.AlarmRuleId == alarmRuleId).OrderByDescending(x => x.Id).FirstOrDefault();
return query.Where(x => x.AlarmRuleId == alarmRuleId).OrderByDescending(x => x.CreationTime).FirstOrDefault();
}

public async Task<long?> GetOffsetResult(Guid alarmRuleId, int offsetPeriod, string alias)
{
var query = await _alarmRuleRecordRepository.GetQueryableAsync();
var offsetRecord = query.Where(x => x.AlarmRuleId == alarmRuleId).OrderByDescending(x => x.Id).Skip(offsetPeriod - 1).FirstOrDefault();
var offsetRecord = query.Where(x => x.AlarmRuleId == alarmRuleId).OrderByDescending(x => x.CreationTime).Skip(offsetPeriod - 1).FirstOrDefault();

return offsetRecord?.AggregateResult.FirstOrDefault(x => x.Key == alias).Value;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ public void Configure(EntityTypeBuilder<AlarmRuleRecord> builder)
builder.ToTable(AlertConsts.DB_TABLE_PREFIX + "AlarmRuleRecords", AlertConsts.DB_SCHEMA);
builder.Property(x => x.AggregateResult).HasConversion(new JsonValueConverter<ConcurrentDictionary<string, long>>());
builder.Property(x => x.RuleResultItems).HasConversion(new JsonValueConverter<List<RuleResultItem>>());
builder.HasIndex(u => u.CreationTime);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public async Task<IQueryable<AlarmHistory>> GetQueryableAsync()

public async Task<AlarmHistory?> GetLastAsync(Guid alarmRuleId)
{
return await Context.Set<AlarmHistory>().Where(x => x.AlarmRuleId == alarmRuleId).OrderByDescending(x => x.Id).FirstOrDefaultAsync();
return await Context.Set<AlarmHistory>().Where(x => x.AlarmRuleId == alarmRuleId).OrderByDescending(x => x.CreationTime).FirstOrDefaultAsync();
}
}
Loading