Hide churned trial accounts from company/health screens by default
- Companies list and Company Health now hide Expired/Canceled accounts whose subscription ended 14+ days ago; show/hide toggle via banner - KPI cards on Company Health exclude churned tenants when hidden - showChurned param threads through sort, pagination, search, and filter forms - Powder catalog: fix missing UnitPrice on user-contributed entries; add back-sync to fill catalog gaps on existing matches; wire AiAugmentFromUrl and manual inventory Create into catalog contribute path Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using PowderCoating.Core.Entities;
|
||||
using PowderCoating.Core.Enums;
|
||||
using PowderCoating.Core.Interfaces.Services;
|
||||
using PowderCoating.Infrastructure.Data;
|
||||
|
||||
@@ -21,15 +22,34 @@ public class CompanyListService : ICompanyListService
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public async Task<(List<Company> Companies, int TotalCount)> GetPagedAsync(
|
||||
string? searchTerm, string sortColumn, string sortDirection, int page, int pageSize)
|
||||
public async Task<(List<Company> Companies, int TotalCount, int ChurnedCount)> GetPagedAsync(
|
||||
string? searchTerm, string sortColumn, string sortDirection, int page, int pageSize,
|
||||
bool hideChurned = true)
|
||||
{
|
||||
var cutoff = DateTime.UtcNow.AddDays(-14);
|
||||
|
||||
// Always count churned regardless of hideChurned so the banner can show a number.
|
||||
var churnedCount = await _context.Companies
|
||||
.AsNoTracking()
|
||||
.IgnoreQueryFilters()
|
||||
.Where(c => !c.IsDeleted
|
||||
&& (c.SubscriptionStatus == SubscriptionStatus.Expired || c.SubscriptionStatus == SubscriptionStatus.Canceled)
|
||||
&& c.SubscriptionEndDate != null
|
||||
&& c.SubscriptionEndDate < cutoff)
|
||||
.CountAsync();
|
||||
|
||||
var query = _context.Companies
|
||||
.AsNoTracking()
|
||||
.IgnoreQueryFilters()
|
||||
.Where(c => !c.IsDeleted)
|
||||
.AsQueryable();
|
||||
|
||||
if (hideChurned)
|
||||
query = query.Where(c =>
|
||||
!((c.SubscriptionStatus == SubscriptionStatus.Expired || c.SubscriptionStatus == SubscriptionStatus.Canceled)
|
||||
&& c.SubscriptionEndDate != null
|
||||
&& c.SubscriptionEndDate < cutoff));
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(searchTerm))
|
||||
{
|
||||
var s = searchTerm.ToLower();
|
||||
@@ -61,7 +81,7 @@ public class CompanyListService : ICompanyListService
|
||||
.Take(pageSize)
|
||||
.ToListAsync();
|
||||
|
||||
return (companies, totalCount);
|
||||
return (companies, totalCount, churnedCount);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
||||
Reference in New Issue
Block a user