Phases 3 & 4: Complete data access architecture migration
Phase 3 — eliminated ApplicationDbContext from all non-exempt controllers, routing all data access through IUnitOfWork. Added IPlainRepository<T> for the four platform entities (Announcement, BannedIp, DashboardTip, ReleaseNote) that intentionally don't extend BaseEntity and therefore can't use the constrained IRepository<T>. Added permanent-exception comments to the 18 controllers that legitimately retain direct DbContext access (Identity infra, cross-tenant platform ops, bulk streaming exports). Phase 4 — added EnforceDataAccessArchitecture() to Program.cs, a startup gate that reflects over every Controller subclass and throws at boot if any non-exempt controller injects ApplicationDbContext. The app cannot start with a violation. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -14,7 +14,6 @@ using PowderCoating.Application.Interfaces;
|
||||
using PowderCoating.Core.Entities;
|
||||
using PowderCoating.Core.Enums;
|
||||
using PowderCoating.Core.Interfaces;
|
||||
using PowderCoating.Infrastructure.Data;
|
||||
|
||||
namespace PowderCoating.Web.Controllers;
|
||||
|
||||
@@ -25,7 +24,6 @@ public class ExpensesController : Controller
|
||||
private readonly IMapper _mapper;
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly ILogger<ExpensesController> _logger;
|
||||
private readonly ApplicationDbContext _context;
|
||||
private readonly IAzureBlobStorageService _blobStorage;
|
||||
private readonly StorageSettings _storageSettings;
|
||||
private readonly IAccountBalanceService _accountBalanceService;
|
||||
@@ -40,7 +38,6 @@ public class ExpensesController : Controller
|
||||
IMapper mapper,
|
||||
UserManager<ApplicationUser> userManager,
|
||||
ILogger<ExpensesController> logger,
|
||||
ApplicationDbContext context,
|
||||
IAzureBlobStorageService blobStorage,
|
||||
IOptions<StorageSettings> storageSettings,
|
||||
IAccountBalanceService accountBalanceService,
|
||||
@@ -51,7 +48,6 @@ public class ExpensesController : Controller
|
||||
_mapper = mapper;
|
||||
_userManager = userManager;
|
||||
_logger = logger;
|
||||
_context = context;
|
||||
_blobStorage = blobStorage;
|
||||
_storageSettings = storageSettings.Value;
|
||||
_accountBalanceService = accountBalanceService;
|
||||
@@ -80,28 +76,25 @@ public class ExpensesController : Controller
|
||||
[NonAction]
|
||||
public async Task<IActionResult> IndexLegacy(string? search, int? accountId, DateTime? from, DateTime? to, int page = 1, int pageSize = 25)
|
||||
{
|
||||
var query = _context.Expenses
|
||||
.Include(e => e.Vendor)
|
||||
.Include(e => e.ExpenseAccount)
|
||||
.Include(e => e.PaymentAccount)
|
||||
.Include(e => e.Job)
|
||||
.Where(e => !e.IsDeleted);
|
||||
var allExpenses = (await _unitOfWork.Expenses.GetAllAsync(
|
||||
false, e => e.Vendor, e => e.ExpenseAccount, e => e.PaymentAccount, e => e.Job))
|
||||
.AsEnumerable();
|
||||
|
||||
if (!string.IsNullOrEmpty(search))
|
||||
query = query.Where(e => e.ExpenseNumber.Contains(search) ||
|
||||
e.Memo!.Contains(search) ||
|
||||
allExpenses = allExpenses.Where(e => e.ExpenseNumber.Contains(search) ||
|
||||
(e.Memo != null && e.Memo.Contains(search)) ||
|
||||
(e.Vendor != null && e.Vendor.CompanyName.Contains(search)));
|
||||
|
||||
if (accountId.HasValue)
|
||||
query = query.Where(e => e.ExpenseAccountId == accountId.Value);
|
||||
allExpenses = allExpenses.Where(e => e.ExpenseAccountId == accountId.Value);
|
||||
|
||||
if (from.HasValue)
|
||||
query = query.Where(e => e.Date >= from.Value);
|
||||
allExpenses = allExpenses.Where(e => e.Date >= from.Value);
|
||||
|
||||
if (to.HasValue)
|
||||
query = query.Where(e => e.Date <= to.Value);
|
||||
allExpenses = allExpenses.Where(e => e.Date <= to.Value);
|
||||
|
||||
var expenses = await query.OrderByDescending(e => e.CreatedAt).ToListAsync();
|
||||
var expenses = allExpenses.OrderByDescending(e => e.CreatedAt).ToList();
|
||||
var dtos = _mapper.Map<List<ExpenseListDto>>(expenses);
|
||||
|
||||
ViewBag.Search = search;
|
||||
@@ -110,11 +103,11 @@ public class ExpensesController : Controller
|
||||
ViewBag.To = to?.ToString("yyyy-MM-dd");
|
||||
ViewBag.TotalAmount = dtos.Sum(e => e.Amount);
|
||||
|
||||
var expenseAccounts = await _context.Accounts
|
||||
.Where(a => !a.IsDeleted && a.IsActive &&
|
||||
(a.AccountType == AccountType.Expense || a.AccountType == AccountType.CostOfGoods))
|
||||
var expenseAccounts = (await _unitOfWork.Accounts.FindAsync(
|
||||
a => a.IsActive &&
|
||||
(a.AccountType == AccountType.Expense || a.AccountType == AccountType.CostOfGoods)))
|
||||
.OrderBy(a => a.AccountNumber)
|
||||
.ToListAsync();
|
||||
.ToList();
|
||||
|
||||
ViewBag.AccountFilter = expenseAccounts
|
||||
.Select(a => new SelectListItem($"{a.AccountNumber} – {a.Name}", a.Id.ToString()))
|
||||
@@ -297,12 +290,8 @@ public class ExpensesController : Controller
|
||||
{
|
||||
if (id == null) return NotFound();
|
||||
|
||||
var expense = await _context.Expenses
|
||||
.Include(e => e.Vendor)
|
||||
.Include(e => e.ExpenseAccount)
|
||||
.Include(e => e.PaymentAccount)
|
||||
.Include(e => e.Job)
|
||||
.FirstOrDefaultAsync(e => e.Id == id && !e.IsDeleted);
|
||||
var expense = await _unitOfWork.Expenses.GetByIdAsync(
|
||||
id.Value, false, e => e.Vendor, e => e.ExpenseAccount, e => e.PaymentAccount, e => e.Job);
|
||||
|
||||
if (expense == null) return NotFound();
|
||||
return View(_mapper.Map<ExpenseDto>(expense));
|
||||
@@ -445,12 +434,11 @@ public class ExpensesController : Controller
|
||||
private async Task<string> GenerateExpenseNumberAsync()
|
||||
{
|
||||
var prefix = $"EXP-{DateTime.Now:yyMM}-";
|
||||
var last = await _context.Expenses
|
||||
.IgnoreQueryFilters()
|
||||
.Where(e => e.ExpenseNumber.StartsWith(prefix))
|
||||
var last = (await _unitOfWork.Expenses.FindAsync(
|
||||
e => e.ExpenseNumber.StartsWith(prefix), ignoreQueryFilters: true))
|
||||
.OrderByDescending(e => e.ExpenseNumber)
|
||||
.Select(e => e.ExpenseNumber)
|
||||
.FirstOrDefaultAsync();
|
||||
.FirstOrDefault();
|
||||
|
||||
int next = 1;
|
||||
if (last != null && int.TryParse(last[prefix.Length..], out int num))
|
||||
|
||||
Reference in New Issue
Block a user