Skip to content

Feature auto test dataitem sorting #787

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

Open
hylsss wants to merge 2 commits into
base: auto-test
Choose a base branch
from
Open

Feature auto test dataitem sorting #787

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10fb11a
Feature auto test dataitem sorting
Feb 3, 2026
2f2eb0e
update codes
Feb 3, 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
43 changes: 34 additions & 9 deletions src/SmartTalk.Core/Services/AutoTest/AutoTestDataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using Serilog;
using SmartTalk.Core.Data;
using SmartTalk.Core.Domain.AutoTest;
using SmartTalk.Core.Ioc;
Expand Down Expand Up @@ -120,28 +121,52 @@ on autoTestDataSetItem.DataItemId equals autoTestDataItem.Id
select autoTestDataItem;

var count = await query.CountAsync(cancellationToken).ConfigureAwait(false);


var allItems = await query.ToListAsync(cancellationToken).ConfigureAwait(false);

var sortedItems = allItems.OrderByDescending(item =>
{
try
{
if (string.IsNullOrWhiteSpace(item.InputJson)) return DateTime.MinValue;

var jsonObject = JsonConvert.DeserializeObject<Dictionary<string, object>>(item.InputJson);

if (jsonObject != null && jsonObject.TryGetValue("OrderDate", out var orderDateObj))
{
if (DateTime.TryParse(orderDateObj?.ToString(), out var orderDate))
{
return orderDate;
}
}
}
catch (Exception ex)
{
Log.Error(ex, "Unexpected error while extracting OrderDate from AutoTestDataItem {ItemId}", item.Id);
}

return DateTime.MinValue;
});

var sortedItemsList = sortedItems.ToList();

List<AutoTestDataItem> resultItems;

if (page.HasValue && pageSize.HasValue)
{
resultItems = await query
.OrderByDescending(x => x.CreatedAt)
resultItems = sortedItemsList
.Skip((page.Value - 1) * pageSize.Value)
.Take(pageSize.Value)
.ToListAsync(cancellationToken).ConfigureAwait(false);
.ToList();
}
else
{
resultItems = await query
.OrderByDescending(x => x.CreatedAt)
.ToListAsync(cancellationToken)
.ConfigureAwait(false);
resultItems = sortedItemsList;
}

return (count, resultItems);
}


public async Task<List<int>> GetDataItemIdsByDataSetIdAsync(int dataSetId, CancellationToken cancellationToken)
{
return await _repository.Query<AutoTestDataSetItem>()
Expand Down