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:
@@ -1,12 +1,9 @@
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using PowderCoating.Shared.Constants;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.Rendering;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using PowderCoating.Core.Entities;
|
||||
using PowderCoating.Core.Interfaces;
|
||||
using PowderCoating.Infrastructure.Data;
|
||||
|
||||
namespace PowderCoating.Web.Controllers;
|
||||
|
||||
@@ -23,35 +20,28 @@ public class JobTemplatesController : Controller
|
||||
{
|
||||
private readonly IUnitOfWork _unitOfWork;
|
||||
private readonly ITenantContext _tenantContext;
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public JobTemplatesController(
|
||||
IUnitOfWork unitOfWork,
|
||||
ITenantContext tenantContext,
|
||||
ApplicationDbContext context)
|
||||
ITenantContext tenantContext)
|
||||
{
|
||||
_unitOfWork = unitOfWork;
|
||||
_tenantContext = tenantContext;
|
||||
_context = context;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Displays all non-deleted job templates for the current company, ordered by name, with their
|
||||
/// linked customer and item counts. Uses the direct <c>_context</c> query (bypassing
|
||||
/// <c>IUnitOfWork</c>) to leverage EF Core's filtered includes (<c>.Include(t => t.Items)</c>)
|
||||
/// which are not exposed through the generic repository pattern.
|
||||
/// linked customer and item counts. Multi-tenancy and soft-delete scoping are handled by global
|
||||
/// query filters; the typed repository provides the ThenInclude chain for items.
|
||||
/// </summary>
|
||||
public async Task<IActionResult> Index()
|
||||
{
|
||||
var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
|
||||
|
||||
var templates = await _context.JobTemplates
|
||||
.Include(t => t.Customer)
|
||||
.Include(t => t.Items)
|
||||
.Where(t => !t.IsDeleted && t.CompanyId == companyId)
|
||||
.OrderBy(t => t.Name)
|
||||
.ToListAsync();
|
||||
var templates = await _unitOfWork.JobTemplates.GetAllAsync(
|
||||
false,
|
||||
t => t.Customer,
|
||||
t => t.Items);
|
||||
|
||||
templates = templates.OrderBy(t => t.Name).ToList();
|
||||
return View(templates);
|
||||
}
|
||||
|
||||
@@ -59,22 +49,12 @@ public class JobTemplatesController : Controller
|
||||
/// Shows the full template detail including all non-deleted items, each with their coats
|
||||
/// (including the linked inventory item for color/powder info) and prep services (including the
|
||||
/// prep service entity for the service name). Soft-deleted items, coats, and prep services are
|
||||
/// excluded via EF filtered includes so the view reflects the current active configuration.
|
||||
/// excluded via filtered includes in the typed repository.
|
||||
/// </summary>
|
||||
public async Task<IActionResult> Details(int id)
|
||||
{
|
||||
var template = await _context.JobTemplates
|
||||
.Include(t => t.Customer)
|
||||
.Include(t => t.Items.Where(i => !i.IsDeleted))
|
||||
.ThenInclude(i => i.Coats.Where(c => !c.IsDeleted))
|
||||
.ThenInclude(c => c.InventoryItem)
|
||||
.Include(t => t.Items.Where(i => !i.IsDeleted))
|
||||
.ThenInclude(i => i.PrepServices.Where(p => !p.IsDeleted))
|
||||
.ThenInclude(p => p.PrepService)
|
||||
.FirstOrDefaultAsync(t => t.Id == id && !t.IsDeleted);
|
||||
|
||||
var template = await _unitOfWork.JobTemplates.LoadForDetailsAsync(id);
|
||||
if (template == null) return NotFound();
|
||||
|
||||
return View(template);
|
||||
}
|
||||
|
||||
@@ -85,9 +65,7 @@ public class JobTemplatesController : Controller
|
||||
/// </summary>
|
||||
public async Task<IActionResult> Edit(int id)
|
||||
{
|
||||
var template = await _context.JobTemplates
|
||||
.FirstOrDefaultAsync(t => t.Id == id && !t.IsDeleted);
|
||||
|
||||
var template = await _unitOfWork.JobTemplates.GetByIdAsync(id);
|
||||
if (template == null) return NotFound();
|
||||
|
||||
await PopulateCustomerDropdown(template.CustomerId);
|
||||
@@ -150,12 +128,7 @@ public class JobTemplatesController : Controller
|
||||
{
|
||||
var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
|
||||
|
||||
var job = await _context.Jobs
|
||||
.Include(j => j.JobItems.Where(i => !i.IsDeleted))
|
||||
.ThenInclude(i => i.Coats.Where(c => !c.IsDeleted))
|
||||
.Include(j => j.JobItems.Where(i => !i.IsDeleted))
|
||||
.ThenInclude(i => i.PrepServices.Where(p => !p.IsDeleted))
|
||||
.FirstOrDefaultAsync(j => j.Id == jobId && !j.IsDeleted);
|
||||
var job = await _unitOfWork.Jobs.LoadForTemplateSnapshotAsync(jobId);
|
||||
|
||||
if (job == null) return NotFound();
|
||||
|
||||
@@ -254,18 +227,7 @@ public class JobTemplatesController : Controller
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetTemplatesJson()
|
||||
{
|
||||
var companyId = _tenantContext.GetCurrentCompanyId() ?? 0;
|
||||
|
||||
var templates = await _context.JobTemplates
|
||||
.Include(t => t.Customer)
|
||||
.Include(t => t.Items.Where(i => !i.IsDeleted))
|
||||
.ThenInclude(i => i.Coats.Where(c => !c.IsDeleted))
|
||||
.Include(t => t.Items.Where(i => !i.IsDeleted))
|
||||
.ThenInclude(i => i.PrepServices.Where(p => !p.IsDeleted))
|
||||
.ThenInclude(p => p.PrepService)
|
||||
.Where(t => !t.IsDeleted && t.CompanyId == companyId && t.IsActive)
|
||||
.OrderBy(t => t.Name)
|
||||
.ToListAsync();
|
||||
var templates = await _unitOfWork.JobTemplates.GetAllActiveWithFullIncludesAsync();
|
||||
|
||||
var result = templates.Select(t => new
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user