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.3 KiB
C#
85 lines
3.3 KiB
C#
using Data.SeaHavenIndustries;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using SeaHaven.DataServices.Interfaces;
|
|
using SeaHaven.Services.DTOs;
|
|
using SeaHaven.Services.Interfaces;
|
|
|
|
namespace SeaHaven.Services.Implementation
|
|
{
|
|
public class CommonService : ICommonService
|
|
{
|
|
private readonly ICommonDataService _dataService;
|
|
private readonly UserManager<ApplicationUser> _userManager;
|
|
|
|
public CommonService(ICommonDataService dataService, UserManager<ApplicationUser> userManager)
|
|
{
|
|
_dataService = dataService;
|
|
_userManager = userManager;
|
|
}
|
|
|
|
public async Task<PagedUsersResult> GetUsersPagedAsync(string? search, int page, int pageSize, CancellationToken cancellationToken)
|
|
{
|
|
var (paginatedUsers, totalCount) = await _dataService.GetUsersPagedAsync(page, pageSize, search ?? "", cancellationToken);
|
|
|
|
var filteredUsers = new List<UserListItemDTO>();
|
|
|
|
foreach (var user in paginatedUsers)
|
|
{
|
|
var roles = await _userManager.GetRolesAsync(user);
|
|
if (!roles.Contains("Admin"))
|
|
{
|
|
filteredUsers.Add(new UserListItemDTO
|
|
{
|
|
RoleName = roles.Count() > 0 ? roles.First() : "",
|
|
Email = user.Email,
|
|
UserName = user.FirstName,
|
|
Date = user.CreatedDate?.Date.ToString(),
|
|
Status = user.UniqueName,
|
|
Id = user.Id
|
|
});
|
|
}
|
|
}
|
|
|
|
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
|
|
|
|
return new PagedUsersResult
|
|
{
|
|
Users = filteredUsers,
|
|
PageNumber = page,
|
|
PageSize = pageSize,
|
|
TotalCount = totalCount,
|
|
TotalPages = totalPages
|
|
};
|
|
}
|
|
|
|
public async Task<IEnumerable<RoleListItemDTO>> GetRolesAsync(CancellationToken cancellationToken)
|
|
{
|
|
var names = await _dataService.GetRoleNamesAsync(cancellationToken);
|
|
return names.Select(name => new RoleListItemDTO { Id = name, Name = name });
|
|
}
|
|
|
|
public async Task<IEnumerable<SiteNameDTO>> GetSiteNamesAsync(CancellationToken cancellationToken)
|
|
{
|
|
var sites = await _dataService.GetSiteNamesAsync(cancellationToken);
|
|
return sites.Select(n => new SiteNameDTO { Id = n.Id, Name = n.Name, Title = n.Title });
|
|
}
|
|
|
|
public async Task<IEnumerable<ContactListItemDTO>> GetContactsAsync(CancellationToken cancellationToken)
|
|
{
|
|
var contacts = await _dataService.GetContactsAsync(cancellationToken);
|
|
return contacts.Select(n => new ContactListItemDTO
|
|
{
|
|
Id = n.Id,
|
|
Name = (n.FirstName + " " + n.LastName).Trim(),
|
|
Email = n.Email,
|
|
Phone = n.PhoneNumber
|
|
});
|
|
}
|
|
|
|
public async Task<IEnumerable<CategoryListItemDTO>> GetCategoriesAsync(CancellationToken cancellationToken)
|
|
{
|
|
var categories = await _dataService.GetCategoriesAsync(cancellationToken);
|
|
return categories.Select(s => new CategoryListItemDTO { Id = s.Id, Name = s.Name });
|
|
}
|
|
}
|
|
}
|