mirror of
https://github.com/Sea-Haven-Industries/shoc-backend.git
synced 2026-09-30 11:53:12 +00:00
* feat(work-orders): enrich board search overdue filters and 0-based paging * fix(work-orders): align stacked services with CI build * fix(tests): pass userDataService in comment service unit test * fix(work-orders): use dedicated overdue query flag Stop treating WorkOrderType.Other as an overdue sentinel. Board and advanced search now accept overdue=true while types=Other filters real Other rows; combining both uses OR. * test(work-orders): cover overdue date/status boundary and Other type-filter Lock the PR #23 overdue regression boundary through the public advanced search service. Prove overdue filtering is driven by past-due date plus non-terminal status, not by the WorkOrderType.Other sentinel: - Other + future/not-completed excluded from overdue - past-due + Scheduled included; past-due + Completed/Canceled excluded - types=[PM, Other] keeps real Other rows and does not pull past-due rows - assert 0-based paging (Page=0) is preserved alongside overdue/type filters --------- Co-authored-by: Arthur Bassi <arthur.winiarski.ranger@outlook.com> Co-authored-by: Alexandre Brandizzi <alex_brandizzi@hotmail.com>
64 lines
3.2 KiB
C#
64 lines
3.2 KiB
C#
using Data.SeaHavenIndustries;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using SeaHaven.DataServices.Helpers;
|
|
using SeaHaven.DataServices.Interfaces;
|
|
|
|
namespace SeaHaven.DataServices.Implementation
|
|
{
|
|
public class WorkOrderAdvancedSearchDataService : IWorkOrderAdvancedSearchDataService
|
|
{
|
|
private readonly ApplicationDbContext _context;
|
|
|
|
public WorkOrderAdvancedSearchDataService(ApplicationDbContext context)
|
|
{
|
|
_context = context;
|
|
}
|
|
|
|
public async Task<WorkOrderAdvancedSearchResult> SearchAsync(WorkOrderAdvancedSearchQuery query)
|
|
{
|
|
var baseQuery = WorkOrderBoardQueryFilters.ApplyBaseScope(_context.workOrders.AsNoTracking());
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplyDateRangeFilter(baseQuery, query.DateFrom, query.DateTo);
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplySiteFilter(baseQuery, query.Sites);
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplyTypeFilter(baseQuery, query.Types, query.Overdue);
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplyDispatcherFilter(
|
|
baseQuery, query.Dispatchers, query.MyWorkOrders, query.CurrentUserId);
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplyStatusFilter(baseQuery, query.Statuses);
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplyPmTypeFilter(baseQuery, query.PmTypes);
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplyVendorFilter(baseQuery, query.VendorIds);
|
|
baseQuery = WorkOrderBoardQueryFilters.ApplyDocStatusFilter(baseQuery, query.DocStatuses);
|
|
|
|
var normalizedSearch = WorkOrderBoardSearchFilter.NormalizeSearch(query.Search);
|
|
if (normalizedSearch != null)
|
|
baseQuery = WorkOrderBoardSearchFilter.Apply(baseQuery, normalizedSearch);
|
|
|
|
var totalCount = await baseQuery.CountAsync();
|
|
|
|
var sorted = ApplySort(baseQuery, query.SortBy, query.SortDir);
|
|
var paged = sorted
|
|
.Skip(query.Page * query.PageSize)
|
|
.Take(query.PageSize);
|
|
|
|
var rows = await WorkOrderBoardProjection.ProjectRowsAsync(paged, isUnscheduled: false);
|
|
return new WorkOrderAdvancedSearchResult(rows, totalCount);
|
|
}
|
|
|
|
private static IQueryable<WorkOrder> ApplySort(IQueryable<WorkOrder> query, string sortBy, string sortDir)
|
|
{
|
|
var descending = string.Equals(sortDir, "desc", StringComparison.OrdinalIgnoreCase);
|
|
var field = (sortBy ?? "scheduledDate").Trim().ToLowerInvariant();
|
|
|
|
return field switch
|
|
{
|
|
"wonumber" or "woNumber" => descending
|
|
? query.OrderByDescending(w => w.InternalWONumber)
|
|
: query.OrderBy(w => w.InternalWONumber),
|
|
"duedate" or "dueDate" => descending
|
|
? query.OrderByDescending(w => w.DueDate).ThenBy(w => w.InternalWONumber)
|
|
: query.OrderBy(w => w.DueDate).ThenBy(w => w.InternalWONumber),
|
|
_ => descending
|
|
? query.OrderByDescending(w => w.ScheduledDate).ThenByDescending(w => w.InternalWONumber)
|
|
: query.OrderBy(w => w.ScheduledDate).ThenBy(w => w.InternalWONumber)
|
|
};
|
|
}
|
|
}
|
|
}
|