mirror of
https://github.com/Sea-Haven-Industries/shoc-backend.git
synced 2026-09-30 08:23:12 +00:00
* refactor(api): enforce service and data-service boundaries * refactor(api): complete feature service boundaries * refactor(identity): enforce service and data boundaries * refactor(vendors): enforce service and data boundaries * refactor(workorders): enforce service and data boundaries * refactor(backend): enforce architecture and optimize dispatch * style(backend): format changed architecture files * fix(architecture): address backend review follow-ups * fix(backend): sanitize exception disclosure in changed API endpoints Replace raw exception-message disclosure (ex.Message) returned to API callers with a stable sanitized public message plus correlated structured internal logging, across the endpoints changed in this PR. - Add SanitizedErrors helper: logs the original exception at Error with a generated correlation id and returns a stable public message referencing it so support can trace without exposing internals. - Inject ILogger<T> into the 14 changed controllers and route every ex.Message/dbex.Message disclosure through the helper, preserving status codes, response shapes, and business data (e.g. OpenWorkOrders). - Leave FluentValidation (vex.Errors) and existing fixed-message catches untouched; out-of-scope controllers (Account/Contact/Employee/Asset/ PMSchedule) are unchanged. - Add focused tests proving internal exception text is not returned and that Error logging carrying the original exception is invoked. * fix(architecture): abstract job run state access * style: format board update service * test: use collection assertion idiom
85 lines
3.1 KiB
C#
85 lines
3.1 KiB
C#
using Data.SeaHavenIndustries;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using SeaHaven.DataServices.Interfaces;
|
|
|
|
namespace SeaHaven.DataServices.Implementation
|
|
{
|
|
public class CalendarDataService : ICalendarDataService
|
|
{
|
|
private readonly ApplicationDbContext _context;
|
|
|
|
public CalendarDataService(ApplicationDbContext context)
|
|
{
|
|
_context = context;
|
|
}
|
|
|
|
public async Task<Events?> GetEventByIdAsync(int id, CancellationToken cancellationToken)
|
|
{
|
|
return await _context.Events
|
|
.AsNoTracking()
|
|
.Where(e => e.Id == id && e.IsDeleted != true)
|
|
.FirstOrDefaultAsync(cancellationToken);
|
|
}
|
|
|
|
public async Task<Events?> GetEventForEditAsync(int id, CancellationToken cancellationToken)
|
|
{
|
|
return await _context.Events.FindAsync(new object[] { id }, cancellationToken);
|
|
}
|
|
|
|
public async Task<Events> AddEventAsync(Events ev, CancellationToken cancellationToken)
|
|
{
|
|
await _context.Events.AddAsync(ev, cancellationToken);
|
|
await _context.SaveChangesAsync(cancellationToken);
|
|
return ev;
|
|
}
|
|
|
|
public async Task UpdateEventAsync(Events ev, CancellationToken cancellationToken)
|
|
{
|
|
_context.Events.Update(ev);
|
|
await _context.SaveChangesAsync(cancellationToken);
|
|
}
|
|
|
|
public async Task<(IEnumerable<Events> Items, int TotalCount)> GetEventListPagedAsync(int page, int pageSize, string? search, CancellationToken cancellationToken)
|
|
{
|
|
var query = _context.Events.Where(e => e.IsDeleted != true);
|
|
|
|
if (!string.IsNullOrWhiteSpace(search))
|
|
{
|
|
var searchLower = search.ToLower();
|
|
query = query.Where(e =>
|
|
e.Title.ToLower().Contains(searchLower) ||
|
|
(e.Description != null && e.Description.ToLower().Contains(searchLower)) ||
|
|
(e.Location != null && e.Location.ToLower().Contains(searchLower)));
|
|
}
|
|
|
|
var totalCount = await query.CountAsync(cancellationToken);
|
|
|
|
var events = await query
|
|
.OrderByDescending(e => e.StartDate)
|
|
.ThenByDescending(e => e.CreatedDate)
|
|
.Skip((page - 1) * pageSize)
|
|
.Take(pageSize)
|
|
.AsNoTracking()
|
|
.ToListAsync(cancellationToken);
|
|
|
|
return (events, totalCount);
|
|
}
|
|
|
|
public async Task<IEnumerable<Events>> GetEventsForCalendarAsync(DateTime? start, DateTime? end, CancellationToken cancellationToken)
|
|
{
|
|
var query = _context.Events.Where(e => e.IsDeleted != true);
|
|
|
|
if (start.HasValue && end.HasValue)
|
|
{
|
|
query = query.Where(e =>
|
|
(e.StartDate >= start.Value && e.StartDate <= end.Value) ||
|
|
(e.EndDate >= start.Value && e.EndDate <= end.Value) ||
|
|
(e.StartDate <= start.Value && e.EndDate >= end.Value));
|
|
}
|
|
|
|
return await query
|
|
.AsNoTracking()
|
|
.ToListAsync(cancellationToken);
|
|
}
|
|
}
|
|
}
|