mirror of
https://github.com/Sea-Haven-Industries/shoc-backend.git
synced 2026-09-30 06:03:12 +00:00
refactor: enforce backend boundaries and optimize dispatch (#30)
* 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
This commit is contained in:
parent
8be07a9c5f
commit
7d245eb717
215 changed files with 16658 additions and 6423 deletions
51
.github/workflows/architecture-quality.yml
vendored
Normal file
51
.github/workflows/architecture-quality.yml
vendored
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
name: Architecture and changed-file quality
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [main, dev]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
architecture:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up .NET
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: "8.0.x"
|
||||
|
||||
- name: Restore
|
||||
run: dotnet restore SeaHavenIndustries.sln
|
||||
|
||||
- name: Verify architecture boundaries
|
||||
run: >-
|
||||
dotnet test
|
||||
Api.SeaHavenIndustries.Tests/Api.SeaHavenIndustries.Tests.csproj
|
||||
--no-restore
|
||||
--filter FullyQualifiedName~ArchitectureTests
|
||||
|
||||
- name: Verify formatting of changed C# files
|
||||
shell: bash
|
||||
run: |
|
||||
mapfile -t files < <(
|
||||
git diff --name-only --diff-filter=ACMR \
|
||||
"${{ github.event.pull_request.base.sha }}" \
|
||||
"${{ github.event.pull_request.head.sha }}" \
|
||||
-- '*.cs'
|
||||
)
|
||||
|
||||
if (( ${#files[@]} == 0 )); then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
dotnet format SeaHavenIndustries.sln \
|
||||
--no-restore \
|
||||
--verify-no-changes \
|
||||
--include "${files[@]}"
|
||||
76
Api.SeaHavenIndustries.Tests/ArchitectureTests.cs
Normal file
76
Api.SeaHavenIndustries.Tests/ArchitectureTests.cs
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
using System.Reflection;
|
||||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class ArchitectureTests
|
||||
{
|
||||
private static readonly Assembly ApiAssembly = typeof(VendorPortalController).Assembly;
|
||||
private static readonly Assembly ServicesAssembly = typeof(VendorService).Assembly;
|
||||
private static readonly Assembly DataServicesAssembly = typeof(VendorDataService).Assembly;
|
||||
|
||||
private const string ServiceImplementationNamespace = "SeaHaven.Services.Implementation";
|
||||
private const string DataServiceImplementationNamespace = "SeaHaven.DataServices.Implementation";
|
||||
|
||||
private static IEnumerable<Type> ApiControllers =>
|
||||
ApiAssembly.GetTypes()
|
||||
.Where(t => t.IsClass && !t.IsAbstract && typeof(ControllerBase).IsAssignableFrom(t));
|
||||
|
||||
private static IEnumerable<Type> BusinessServiceImplementations =>
|
||||
ServicesAssembly.GetTypes()
|
||||
.Where(t => t.IsClass && !t.IsAbstract && !t.IsGenericType)
|
||||
.Where(t => t.GetInterfaces().Any(i => i.Name == "I" + t.Name));
|
||||
|
||||
private static bool IsConcrete(Type type) => type.IsClass && !type.IsAbstract && !type.IsInterface;
|
||||
|
||||
private static bool IsDbContext(Type type) => typeof(DbContext).IsAssignableFrom(type);
|
||||
|
||||
private static bool IsConcreteServiceImplementation(Type type) =>
|
||||
type.Namespace == ServiceImplementationNamespace && IsConcrete(type);
|
||||
|
||||
private static bool IsConcreteDataService(Type type) =>
|
||||
type.Namespace == DataServiceImplementationNamespace && IsConcrete(type);
|
||||
|
||||
private static IEnumerable<ParameterInfo> ParametersOf(IEnumerable<Type> types) =>
|
||||
types.SelectMany(t => t.GetConstructors().SelectMany(c => c.GetParameters()));
|
||||
|
||||
[Fact]
|
||||
public void Controllers_DoNotInject_DbContext_ConcreteDataServices_Or_ConcreteServiceImplementations()
|
||||
{
|
||||
ApiControllers.Should().NotBeEmpty("the API must expose controllers for this invariant to be meaningful");
|
||||
|
||||
var violations = ParametersOf(ApiControllers)
|
||||
.Where(p => IsDbContext(p.ParameterType)
|
||||
|| IsConcreteDataService(p.ParameterType)
|
||||
|| IsConcreteServiceImplementation(p.ParameterType))
|
||||
.Select(p => $"{p.Member.DeclaringType!.Name} depends on {p.ParameterType.FullName} ({p.Name})")
|
||||
.ToList();
|
||||
|
||||
violations.Should().BeEmpty(
|
||||
"controllers must depend only on interfaces/abstractions, never on DbContext, concrete data services, or concrete service implementations");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BusinessServices_DoNotInject_DbContext_Or_IConfiguration()
|
||||
{
|
||||
BusinessServiceImplementations.Should().NotBeEmpty(
|
||||
"business services must be discovered for this invariant to be meaningful");
|
||||
|
||||
var violations = ParametersOf(BusinessServiceImplementations)
|
||||
.Where(p => IsDbContext(p.ParameterType)
|
||||
|| typeof(IConfiguration).IsAssignableFrom(p.ParameterType))
|
||||
.Select(p => $"{p.Member.DeclaringType!.Name} depends on {p.ParameterType.FullName} ({p.Name})")
|
||||
.ToList();
|
||||
|
||||
violations.Should().BeEmpty(
|
||||
"business services must depend on data-service interfaces and typed options, never on DbContext or IConfiguration");
|
||||
}
|
||||
}
|
||||
261
Api.SeaHavenIndustries.Tests/AuthenticationControllerTests.cs
Normal file
261
Api.SeaHavenIndustries.Tests/AuthenticationControllerTests.cs
Normal file
|
|
@ -0,0 +1,261 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
using System.Text.Json;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class AuthenticationControllerTests
|
||||
{
|
||||
private static string Json(object? value) =>
|
||||
JsonSerializer.Serialize(value, value?.GetType() ?? typeof(object));
|
||||
|
||||
private static AuthenticationController NewController(Mock<IAuthenticationService> service, string? userId = null)
|
||||
{
|
||||
var controller = new AuthenticationController(service.Object, Mock.Of<ILogger<AuthenticationController>>());
|
||||
if (userId != null)
|
||||
{
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
{
|
||||
User = new ClaimsPrincipal(new ClaimsIdentity(new[]
|
||||
{
|
||||
new Claim(ClaimTypes.NameIdentifier, userId)
|
||||
}, "Test"))
|
||||
}
|
||||
};
|
||||
}
|
||||
return controller;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Login_WithSuccessfulResult_MapsLowercaseTokenPayload()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.LoginAsync("alice", "pw", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new LoginResultDTO
|
||||
{
|
||||
Token = "tok",
|
||||
Expiration = new DateTime(2026, 1, 2, 3, 4, 5, DateTimeKind.Utc),
|
||||
Email = "alice@example.com",
|
||||
UserRole = "Admin",
|
||||
PhoneNumber = "555",
|
||||
Fullname = "Alice Q",
|
||||
Id = "user-1"
|
||||
});
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Login(new LoginModel { Username = "alice", Password = "pw" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var json = Json(ok.Value);
|
||||
json.Should().Contain("\"token\":\"tok\"");
|
||||
json.Should().Contain("\"expiration\":\"");
|
||||
json.Should().Contain("\"email\":\"alice@example.com\"");
|
||||
json.Should().Contain("\"userRoles\":\"Admin\"");
|
||||
json.Should().Contain("\"phoneNumber\":\"555\"");
|
||||
json.Should().Contain("\"fullname\":\"Alice Q\"");
|
||||
json.Should().Contain("\"id\":\"user-1\"");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Login_WithNullResult_ReturnsUnauthorized()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.LoginAsync(It.IsAny<string?>(), It.IsAny<string?>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((LoginResultDTO?)null);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Login(new LoginModel(), CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<UnauthorizedResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Login_WhenServiceThrows_ReturnsSanitized500AndLogsInternally()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.LoginAsync(It.IsAny<string?>(), It.IsAny<string?>(), It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("SECRET-internal-stack-detail"));
|
||||
|
||||
var logger = new Mock<ILogger<AuthenticationController>>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
var controller = new AuthenticationController(service.Object, logger.Object);
|
||||
|
||||
var result = await controller.Login(new LoginModel { Username = "x", Password = "y" }, CancellationToken.None);
|
||||
|
||||
var status = result.Should().BeOfType<ObjectResult>().Subject;
|
||||
status.StatusCode.Should().Be(500);
|
||||
var message = (string)status.Value!;
|
||||
message.Should().NotContain("SECRET");
|
||||
message.Should().NotContain("internal-stack-detail");
|
||||
message.Should().Contain("reference");
|
||||
logger.Verify(
|
||||
x => x.Log(
|
||||
LogLevel.Error,
|
||||
It.IsAny<EventId>(),
|
||||
It.IsAny<It.IsAnyType>(),
|
||||
It.Is<Exception>(ex => ex.Message.Contains("SECRET")),
|
||||
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
|
||||
Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ChangePassword_Success_ReturnsSuccessMessageWithTrailingSpace()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.ChangePasswordAsync("42", "old", "new", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(true);
|
||||
|
||||
var controller = NewController(service, "42");
|
||||
|
||||
var result = await controller.ChangePassword(new ChangePasswords { Currentpassword = "old", Confirmpassword = "new" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Status.Should().Be("Success ");
|
||||
response.Message.Should().Be("Password successfully changed");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ChangePassword_Failure_ReturnsOldPasswordIncorrectStatus()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.ChangePasswordAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var controller = NewController(service, "42");
|
||||
|
||||
var result = await controller.ChangePassword(new ChangePasswords(), CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Status.Should().Be("Old Password is incorrect");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateProfile_MapsProfileDataIntoDataResponse()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.UpdateProfileAsync("42", It.IsAny<UpdateProfileRequestDTO>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new UserProfileDTO { FirstName = "Bob", Email = "bob@x.com", Contact = "111" });
|
||||
|
||||
var controller = NewController(service, "42");
|
||||
|
||||
var form = new User_DTO { Name = "Bob", Email = "bob@x.com", Contact = "111" };
|
||||
var result = await controller.UserProfileUpdate(form, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("200");
|
||||
response.Message.Should().Be("Introduction Updated Successfully");
|
||||
var json = Json((object?)response.Data);
|
||||
json.Should().Contain("\"FirstName\":\"Bob\"");
|
||||
json.Should().Contain("\"Email\":\"bob@x.com\"");
|
||||
json.Should().Contain("\"Contact\":\"111\"");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ForgetPassword_Found_ReturnsCheckEmailMessage()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.ForgetPasswordAsync("a@b.com", It.IsAny<CancellationToken>())).ReturnsAsync(true);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.ForgetPassword("a@b.com", CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Status.Should().Be("Success ");
|
||||
response.Message.Should().Be("Please check your email for code");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ForgetPassword_NotFound_ReturnsNoSuchEmailMessage()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.ForgetPasswordAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(false);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.ForgetPassword("x@y.com", CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Status.Should().Be("Error");
|
||||
response.Message.Should().Be("No such email is registered");
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(true, "Success ", "Code Matched")]
|
||||
[InlineData(false, "Error", "Code Not Matched")]
|
||||
public async Task VerificationCode_MapsServiceResult(bool matched, string expectedStatus, string expectedMessage)
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.VerifyCodeAsync("123456", It.IsAny<CancellationToken>())).ReturnsAsync(matched);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.VerificationCode("123456", CancellationToken.None);
|
||||
|
||||
if (matched)
|
||||
{
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var r = ok.Value.Should().BeOfType<Response>().Subject;
|
||||
r.Status.Should().Be(expectedStatus);
|
||||
r.Message.Should().Be(expectedMessage);
|
||||
}
|
||||
else
|
||||
{
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var r = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
r.Status.Should().Be(expectedStatus);
|
||||
r.Message.Should().Be(expectedMessage);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ResetPassword_Matched_ReturnsPasswordChangedMessage()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.ResetPasswordAsync("a@b.com", "123", "new", It.IsAny<CancellationToken>())).ReturnsAsync(true);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.ResetPassword(new ForgetPassword_Dto { Email = "a@b.com", Code = "123", Password = "new" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Status.Should().Be("Success ");
|
||||
response.Message.Should().Be("password changed");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ResetPassword_NotMatched_ReturnsEmailOrCodeNotFoundMessage()
|
||||
{
|
||||
var service = new Mock<IAuthenticationService>();
|
||||
service.Setup(s => s.ResetPasswordAsync(It.IsAny<string>(), It.IsAny<string?>(), It.IsAny<string?>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.ResetPassword(new ForgetPassword_Dto { Email = "a@b.com" }, CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Message.Should().Be("Your email or code not found please check");
|
||||
}
|
||||
}
|
||||
171
Api.SeaHavenIndustries.Tests/AuthenticationServiceTests.cs
Normal file
171
Api.SeaHavenIndustries.Tests/AuthenticationServiceTests.cs
Normal file
|
|
@ -0,0 +1,171 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.Configuration;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class AuthenticationServiceTests
|
||||
{
|
||||
private static AuthenticationService NewService(
|
||||
Mock<IUserDataService> userData,
|
||||
Mock<IForgetPasswordDataService> forget,
|
||||
Mock<IEmailSender> email,
|
||||
out Mock<IUserRoleStore<ApplicationUser>> store,
|
||||
out Mock<IPasswordHasher<ApplicationUser>> hasher)
|
||||
{
|
||||
var (manager, s, h) = IdentityTestHelpers.CreateUserManager();
|
||||
store = s;
|
||||
hasher = h;
|
||||
return new AuthenticationService(manager, Microsoft.Extensions.Options.Options.Create(JwtOptions), userData.Object, forget.Object, email.Object);
|
||||
}
|
||||
|
||||
private static JwtOptions JwtOptions => new()
|
||||
{
|
||||
Secret = new string('x', 64),
|
||||
ValidIssuer = "issuer",
|
||||
ValidAudience = "audience"
|
||||
};
|
||||
|
||||
[Fact]
|
||||
public async Task Login_UnknownUser_ReturnsNull()
|
||||
{
|
||||
var service = NewService(new Mock<IUserDataService>(), new Mock<IForgetPasswordDataService>(), new Mock<IEmailSender>(), out var store, out _);
|
||||
store.Setup(s => s.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync((ApplicationUser?)null);
|
||||
|
||||
var result = await service.LoginAsync("nobody", "pw", CancellationToken.None);
|
||||
|
||||
result.Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Login_DeletedUser_RejectedBeforePasswordCheck()
|
||||
{
|
||||
var deletedUser = IdentityTestHelpers.User(isDeleted: true);
|
||||
var service = NewService(new Mock<IUserDataService>(), new Mock<IForgetPasswordDataService>(), new Mock<IEmailSender>(), out var store, out var hasher);
|
||||
store.Setup(s => s.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(deletedUser);
|
||||
store.Setup(s => s.GetRolesAsync(deletedUser, It.IsAny<CancellationToken>())).ReturnsAsync(new List<string>());
|
||||
|
||||
var result = await service.LoginAsync("alice", "pw", CancellationToken.None);
|
||||
|
||||
result.Should().BeNull();
|
||||
hasher.Verify(h => h.VerifyHashedPassword(It.IsAny<ApplicationUser>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Login_ValidUser_ReturnsTokenFirstRoleAndIdentity()
|
||||
{
|
||||
var user = IdentityTestHelpers.User();
|
||||
var service = NewService(new Mock<IUserDataService>(), new Mock<IForgetPasswordDataService>(), new Mock<IEmailSender>(), out var store, out var hasher);
|
||||
store.Setup(s => s.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(user);
|
||||
store.Setup(s => s.GetRolesAsync(user, It.IsAny<CancellationToken>())).ReturnsAsync(new List<string> { "Admin", "Manager" });
|
||||
store.As<Microsoft.AspNetCore.Identity.IUserPasswordStore<ApplicationUser>>()
|
||||
.Setup(s => s.GetPasswordHashAsync(user, It.IsAny<CancellationToken>())).ReturnsAsync("hash");
|
||||
hasher.Setup(h => h.VerifyHashedPassword(user, "hash", "pw")).Returns(Microsoft.AspNetCore.Identity.PasswordVerificationResult.Success);
|
||||
|
||||
var result = await service.LoginAsync("alice", "pw", CancellationToken.None);
|
||||
|
||||
result.Should().NotBeNull();
|
||||
result!.Id.Should().Be(user.Id);
|
||||
result.Email.Should().Be(user.Email);
|
||||
result.PhoneNumber.Should().Be(user.PhoneNumber);
|
||||
result.Fullname.Should().Be("Alice Q");
|
||||
result.UserRole.Should().Be("Admin");
|
||||
result.Token.Should().NotBeNullOrEmpty();
|
||||
result.Expiration.Should().BeAfter(DateTime.Now.AddDays(9));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Login_BadPassword_ReturnsNull()
|
||||
{
|
||||
var user = IdentityTestHelpers.User();
|
||||
var service = NewService(new Mock<IUserDataService>(), new Mock<IForgetPasswordDataService>(), new Mock<IEmailSender>(), out var store, out var hasher);
|
||||
store.Setup(s => s.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(user);
|
||||
store.As<Microsoft.AspNetCore.Identity.IUserPasswordStore<ApplicationUser>>()
|
||||
.Setup(s => s.GetPasswordHashAsync(user, It.IsAny<CancellationToken>())).ReturnsAsync("hash");
|
||||
hasher.Setup(h => h.VerifyHashedPassword(user, "hash", "wrong")).Returns(Microsoft.AspNetCore.Identity.PasswordVerificationResult.Failed);
|
||||
|
||||
var result = await service.LoginAsync("alice", "wrong", CancellationToken.None);
|
||||
|
||||
result.Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ForgetPassword_RegisteredEmail_ReplacesCodeAndSendsEmail()
|
||||
{
|
||||
var user = IdentityTestHelpers.User();
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetByEmailNormalizedAsync("alice@example.com", It.IsAny<CancellationToken>())).ReturnsAsync(user);
|
||||
var forget = new Mock<IForgetPasswordDataService>();
|
||||
var email = new Mock<IEmailSender>();
|
||||
|
||||
var service = NewService(userData, forget, email, out _, out _);
|
||||
|
||||
var found = await service.ForgetPasswordAsync("alice@example.com", CancellationToken.None);
|
||||
|
||||
found.Should().BeTrue();
|
||||
forget.Verify(
|
||||
f => f.ReplaceCodeAsync(
|
||||
user.Email!,
|
||||
user.Id,
|
||||
It.Is<string>(code => code.Length == 6 && code.All(char.IsDigit)),
|
||||
It.IsAny<CancellationToken>()),
|
||||
Times.Once);
|
||||
email.Verify(e => e.SendEmailAsync(user.Email!, "Forget Password Request.", It.Is<string>(b => b.Contains("Your Password Reset Code is:"))), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ForgetPassword_UnknownEmail_DoesNotEmailOrStoreCode()
|
||||
{
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetByEmailNormalizedAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync((ApplicationUser?)null);
|
||||
var forget = new Mock<IForgetPasswordDataService>();
|
||||
var email = new Mock<IEmailSender>();
|
||||
|
||||
var service = NewService(userData, forget, email, out _, out _);
|
||||
|
||||
var found = await service.ForgetPasswordAsync("nope@example.com", CancellationToken.None);
|
||||
|
||||
found.Should().BeFalse();
|
||||
forget.Verify(f => f.ReplaceCodeAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
|
||||
email.Verify(e => e.SendEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(true)]
|
||||
[InlineData(false)]
|
||||
public async Task VerifyCode_ForwardsDataServiceResult(bool exists)
|
||||
{
|
||||
var forget = new Mock<IForgetPasswordDataService>();
|
||||
forget.Setup(f => f.CodeExistsAsync("abc", It.IsAny<CancellationToken>())).ReturnsAsync(exists);
|
||||
|
||||
var service = NewService(new Mock<IUserDataService>(), forget, new Mock<IEmailSender>(), out _, out _);
|
||||
|
||||
var result = await service.VerifyCodeAsync("abc", CancellationToken.None);
|
||||
|
||||
result.Should().Be(exists);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ResetPassword_NoMatchingCode_ReturnsFalseWithoutReset()
|
||||
{
|
||||
var forget = new Mock<IForgetPasswordDataService>();
|
||||
forget.Setup(f => f.ExistsByEmailAndCodeAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(false);
|
||||
|
||||
var service = NewService(new Mock<IUserDataService>(), forget, new Mock<IEmailSender>(), out var store, out _);
|
||||
|
||||
var result = await service.ResetPasswordAsync("a@b.com", "999", "new", CancellationToken.None);
|
||||
|
||||
result.Should().BeFalse();
|
||||
store.Verify(s => s.FindByIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
|
||||
forget.Verify(f => f.RemoveByEmailAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
|
||||
}
|
||||
}
|
||||
|
|
@ -3,34 +3,17 @@ using Api.SeaHavenIndustries.Controllers;
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class CalendarControllerTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static UserManager<ApplicationUser> MockUserManager()
|
||||
{
|
||||
var store = new Mock<IUserStore<ApplicationUser>>();
|
||||
return new Mock<UserManager<ApplicationUser>>(
|
||||
store.Object, null!, null!, null!, null!, null!, null!, null!, null!).Object;
|
||||
}
|
||||
|
||||
private static CalendarController NewController(ApplicationDbContext ctx) =>
|
||||
new(MockUserManager(), ctx);
|
||||
|
||||
private static EditEvent_DTO ValidDto(int? id = null, string title = "Standup") => new()
|
||||
{
|
||||
Id = id,
|
||||
|
|
@ -43,164 +26,181 @@ public class CalendarControllerTests
|
|||
EndTime = "08:30 AM"
|
||||
};
|
||||
|
||||
private static Events SeedEvent(ApplicationDbContext ctx, string title, DateTime startDate, bool? isDeleted = false)
|
||||
{
|
||||
var ev = new Events
|
||||
{
|
||||
Title = title,
|
||||
EventColor = "primary",
|
||||
ReminderMinutes = 15,
|
||||
StartDate = startDate,
|
||||
EndDate = startDate,
|
||||
IsDeleted = isDeleted,
|
||||
CreatedDate = DateTime.Now
|
||||
};
|
||||
ctx.Events.Add(ev);
|
||||
ctx.SaveChanges();
|
||||
return ev;
|
||||
}
|
||||
private static CalendarController NewController(Mock<ICalendarService> service) =>
|
||||
new(service.Object, Mock.Of<ILogger<CalendarController>>());
|
||||
|
||||
private static object Prop(object source, string name) =>
|
||||
source.GetType().GetProperty(name)!.GetValue(source)!;
|
||||
|
||||
[Fact]
|
||||
public async Task AddEvent_WhenValid_PersistsEventAndReturnsOk()
|
||||
public async Task AddEvent_WhenServiceSucceeds_ReturnsOkWithCreatedMessage()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewController(ctx).AddEvent(ValidDto());
|
||||
var service = new Mock<ICalendarService>();
|
||||
var result = await NewController(service).AddEvent(ValidDto(), CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().BeOfType<DataResponse>().Which.Status.Should().Be("200");
|
||||
|
||||
var saved = ctx.Events.Single();
|
||||
saved.Title.Should().Be("Standup");
|
||||
saved.IsDeleted.Should().Be(false);
|
||||
saved.CreatedDate.Should().NotBeNull();
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("200");
|
||||
response.Message.Should().Be("Event Created Successfully");
|
||||
service.Verify(s => s.CreateEventAsync(It.IsAny<EditEventInput>(), It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditEvent_WhenIdMissing_ReturnsBadRequest()
|
||||
public async Task AddEvent_WhenServiceThrows_ReturnsSanitizedMessageAndLogsInternally()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewController(ctx).EditEvent(ValidDto(id: null));
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.CreateEventAsync(It.IsAny<EditEventInput>(), It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("SECRET-internal-db-connection-leak"));
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
var logger = new Mock<ILogger<CalendarController>>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
var controller = new CalendarController(service.Object, logger.Object);
|
||||
|
||||
var result = await controller.AddEvent(ValidDto(), CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Status.Should().Be("Error");
|
||||
response.Message.Should().NotContain("SECRET");
|
||||
response.Message.Should().NotContain("internal-db-connection-leak");
|
||||
response.Message.Should().Contain("reference");
|
||||
logger.Verify(
|
||||
x => x.Log(
|
||||
LogLevel.Error,
|
||||
It.IsAny<EventId>(),
|
||||
It.IsAny<It.IsAnyType>(),
|
||||
It.Is<Exception>(ex => ex.Message.Contains("SECRET")),
|
||||
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
|
||||
Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditEvent_WhenEventNotFound_ReturnsNotFound()
|
||||
public async Task EditEvent_WhenIdMissing_ReturnsBadRequestWithoutCallingService()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewController(ctx).EditEvent(ValidDto(id: 999));
|
||||
var service = new Mock<ICalendarService>();
|
||||
var result = await NewController(service).EditEvent(ValidDto(id: null), CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Message.Should().Be("Event ID is required for editing");
|
||||
service.Verify(s => s.UpdateEventAsync(It.IsAny<EditEventInput>(), It.IsAny<CancellationToken>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditEvent_WhenServiceReturnsFalse_ReturnsNotFound()
|
||||
{
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.UpdateEventAsync(It.IsAny<EditEventInput>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var result = await NewController(service).EditEvent(ValidDto(id: 5), CancellationToken.None);
|
||||
|
||||
var nf = result.Should().BeOfType<NotFoundObjectResult>().Subject;
|
||||
var response = nf.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Message.Should().Be("Event not found");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditEvent_WhenServiceReturnsTrue_ReturnsOkWithUpdatedMessage()
|
||||
{
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.UpdateEventAsync(It.IsAny<EditEventInput>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(true);
|
||||
|
||||
var result = await NewController(service).EditEvent(ValidDto(id: 5, title: "New"), CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().BeOfType<DataResponse>().Which.Message.Should().Be("Event Updated Successfully");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventById_WhenServiceReturnsNull_ReturnsNotFound()
|
||||
{
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.GetEventByIdAsync(7, It.IsAny<CancellationToken>())).ReturnsAsync((EventDTO?)null);
|
||||
|
||||
var result = await NewController(service).GetEventById(7, CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<NotFoundObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditEvent_WhenEventExists_UpdatesFieldsAndStampsModified()
|
||||
public async Task GetEventById_WhenServiceReturnsDto_ReturnsOkWithEventDto()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedEvent(ctx, "Old", new DateTime(2026, 6, 1));
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.GetEventByIdAsync(7, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new EventDTO { Id = 7, Title = "Review", createdby = "abc" });
|
||||
|
||||
var result = await NewController(ctx).EditEvent(ValidDto(id: existing.Id, title: "New"));
|
||||
|
||||
result.Should().BeOfType<OkObjectResult>();
|
||||
var updated = ctx.Events.Single();
|
||||
updated.Title.Should().Be("New");
|
||||
updated.LastModificationTime.Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventById_WhenExists_ReturnsEventDto()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedEvent(ctx, "Review", new DateTime(2026, 6, 1));
|
||||
|
||||
var result = await NewController(ctx).GetEventById(existing.Id);
|
||||
var result = await NewController(service).GetEventById(7, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var dto = ok.Value.Should().BeOfType<DataResponse>().Subject.Data as Event_DTO;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
var dto = response.Data as Event_DTO;
|
||||
dto.Should().NotBeNull();
|
||||
dto!.Title.Should().Be("Review");
|
||||
dto!.createdby.Should().Be("abc");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventById_WhenSoftDeleted_ReturnsNotFound()
|
||||
public async Task DeleteEvent_WhenServiceReturnsFalse_ReturnsNotFound()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var deleted = SeedEvent(ctx, "Gone", new DateTime(2026, 6, 1), isDeleted: true);
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.DeleteEventAsync(9, It.IsAny<CancellationToken>())).ReturnsAsync(false);
|
||||
|
||||
var result = await NewController(ctx).GetEventById(deleted.Id);
|
||||
var result = await NewController(service).DeleteEvent(9, CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<NotFoundObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteEvent_WhenExists_SoftDeletesAndKeepsRow()
|
||||
public async Task DeleteEvent_WhenServiceReturnsTrue_ReturnsOkWithDeletedMessage()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedEvent(ctx, "Cancel", new DateTime(2026, 6, 1));
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.DeleteEventAsync(9, It.IsAny<CancellationToken>())).ReturnsAsync(true);
|
||||
|
||||
var result = await NewController(ctx).DeleteEvent(existing.Id);
|
||||
var result = await NewController(service).DeleteEvent(9, CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<OkObjectResult>();
|
||||
var row = ctx.Events.Single();
|
||||
row.IsDeleted.Should().Be(true);
|
||||
row.DeletionTime.Should().NotBeNull();
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().BeOfType<DataResponse>().Which.Message.Should().Be("Event Deleted Successfully");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteEvent_WhenNotFound_ReturnsNotFound()
|
||||
public async Task GetEventList_ReturnsOkWithRowsAndTotalCount()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewController(ctx).DeleteEvent(12345);
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.GetEventListAsync("alpha", 1, 10, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new PagedEventsResult
|
||||
{
|
||||
TotalCount = 2,
|
||||
Rows = new List<EventDTO>
|
||||
{
|
||||
new() { Id = 1, Title = "Alpha meeting" },
|
||||
new() { Id = 2, Title = "Alpha review" }
|
||||
}
|
||||
});
|
||||
|
||||
result.Should().BeOfType<NotFoundObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetEventList_ExcludesDeletedAndCountsAfterFilter()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedEvent(ctx, "Alpha meeting", new DateTime(2026, 6, 1));
|
||||
SeedEvent(ctx, "Beta meeting", new DateTime(2026, 6, 2));
|
||||
SeedEvent(ctx, "Alpha review", new DateTime(2026, 6, 3));
|
||||
SeedEvent(ctx, "Alpha archived", new DateTime(2026, 6, 4), isDeleted: true);
|
||||
|
||||
var result = NewController(ctx).GetEventList(search: "alpha", page: 1, pageSize: 10);
|
||||
var result = await NewController(service).GetEventList(search: "alpha", page: 1, pageSize: 10);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var data = ok.Value.Should().BeOfType<DataResponse>().Subject.Data!;
|
||||
((int)Prop(data, "totalCount")).Should().Be(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetEventList_OrdersByStartDateDescending()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedEvent(ctx, "Earliest", new DateTime(2026, 6, 1));
|
||||
SeedEvent(ctx, "Latest", new DateTime(2026, 6, 10));
|
||||
SeedEvent(ctx, "Middle", new DateTime(2026, 6, 5));
|
||||
|
||||
var result = NewController(ctx).GetEventList(page: 1, pageSize: 10);
|
||||
|
||||
var data = (result as OkObjectResult)!.Value.As<DataResponse>().Data!;
|
||||
var rows = ((IEnumerable)Prop(data, "rows")).Cast<Event_DTO>().ToList();
|
||||
rows.Select(r => r.Title).Should().ContainInOrder("Latest", "Middle", "Earliest");
|
||||
rows.Should().HaveCount(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetEventsForCalendar_ReturnsOnlyEventsOverlappingRange()
|
||||
public async Task GetEventsForCalendar_ReturnsOkWithEvents()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedEvent(ctx, "InRange", new DateTime(2026, 6, 15));
|
||||
SeedEvent(ctx, "BeforeRange", new DateTime(2026, 5, 1));
|
||||
SeedEvent(ctx, "AfterRange", new DateTime(2026, 7, 1));
|
||||
var service = new Mock<ICalendarService>();
|
||||
service.Setup(s => s.GetEventsForCalendarAsync(It.IsAny<DateTime?>(), It.IsAny<DateTime?>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new List<EventDTO> { new() { Id = 1, Title = "InRange" } });
|
||||
|
||||
var result = NewController(ctx).GetEventsForCalendar(
|
||||
start: new DateTime(2026, 6, 1), end: new DateTime(2026, 6, 30));
|
||||
var result = await NewController(service).GetEventsForCalendar(
|
||||
start: new DateTime(2026, 6, 1), end: new DateTime(2026, 6, 30), CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var events = ok.Value.As<DataResponse>().Data as IEnumerable<Event_DTO>;
|
||||
events!.Select(e => e.Title).Should().BeEquivalentTo(new[] { "InRange" });
|
||||
var data = ok.Value.Should().BeOfType<DataResponse>().Subject.Data;
|
||||
var events = ((IEnumerable)data!).Cast<Event_DTO>().ToList();
|
||||
events.Single().Title.Should().Be("InRange");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
188
Api.SeaHavenIndustries.Tests/CalendarServiceTests.cs
Normal file
188
Api.SeaHavenIndustries.Tests/CalendarServiceTests.cs
Normal file
|
|
@ -0,0 +1,188 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class CalendarServiceTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static CalendarService NewService(ApplicationDbContext ctx) =>
|
||||
new(new CalendarDataService(ctx));
|
||||
|
||||
private static EditEventInput ValidInput(int? id = null, string title = "Standup") => new()
|
||||
{
|
||||
Id = id,
|
||||
Title = title,
|
||||
ReminderMinutes = 15,
|
||||
EventColor = "primary",
|
||||
StartDate = new DateTime(2026, 6, 1),
|
||||
StartTime = "08:00 AM",
|
||||
EndDate = new DateTime(2026, 6, 1),
|
||||
EndTime = "08:30 AM"
|
||||
};
|
||||
|
||||
private static Events SeedEvent(ApplicationDbContext ctx, string title, DateTime startDate, bool? isDeleted = false)
|
||||
{
|
||||
var ev = new Events
|
||||
{
|
||||
Title = title,
|
||||
EventColor = "primary",
|
||||
ReminderMinutes = 15,
|
||||
StartDate = startDate,
|
||||
EndDate = startDate,
|
||||
IsDeleted = isDeleted,
|
||||
CreatedDate = DateTime.Now
|
||||
};
|
||||
ctx.Events.Add(ev);
|
||||
ctx.SaveChanges();
|
||||
return ev;
|
||||
}
|
||||
|
||||
private static object Prop(object source, string name) =>
|
||||
source.GetType().GetProperty(name)!.GetValue(source)!;
|
||||
|
||||
[Fact]
|
||||
public async Task CreateEventAsync_PersistsEventWithMappedFieldsAndCreatedDate()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
await NewService(ctx).CreateEventAsync(ValidInput(), CancellationToken.None);
|
||||
|
||||
var saved = ctx.Events.Single();
|
||||
saved.Title.Should().Be("Standup");
|
||||
saved.IsDeleted.Should().Be(false);
|
||||
saved.CreatedDate.Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateEventAsync_WhenNotFound_ReturnsFalse()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewService(ctx).UpdateEventAsync(ValidInput(id: 999), CancellationToken.None);
|
||||
result.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateEventAsync_WhenSoftDeleted_ReturnsFalse()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedEvent(ctx, "Old", new DateTime(2026, 6, 1), isDeleted: true);
|
||||
|
||||
var result = await NewService(ctx).UpdateEventAsync(ValidInput(id: existing.Id, title: "New"), CancellationToken.None);
|
||||
|
||||
result.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateEventAsync_WhenEventExists_UpdatesFieldsAndStampsModified()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedEvent(ctx, "Old", new DateTime(2026, 6, 1));
|
||||
|
||||
var result = await NewService(ctx).UpdateEventAsync(ValidInput(id: existing.Id, title: "New"), CancellationToken.None);
|
||||
|
||||
result.Should().BeTrue();
|
||||
var updated = ctx.Events.Single();
|
||||
updated.Title.Should().Be("New");
|
||||
updated.LastModificationTime.Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventByIdAsync_WhenExists_ReturnsMappedDto()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedEvent(ctx, "Review", new DateTime(2026, 6, 1));
|
||||
|
||||
var dto = await NewService(ctx).GetEventByIdAsync(existing.Id, CancellationToken.None);
|
||||
|
||||
dto.Should().NotBeNull();
|
||||
dto!.Title.Should().Be("Review");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventByIdAsync_WhenSoftDeleted_ReturnsNull()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var deleted = SeedEvent(ctx, "Gone", new DateTime(2026, 6, 1), isDeleted: true);
|
||||
|
||||
var dto = await NewService(ctx).GetEventByIdAsync(deleted.Id, CancellationToken.None);
|
||||
|
||||
dto.Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteEventAsync_WhenExists_SoftDeletesAndKeepsRow()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedEvent(ctx, "Cancel", new DateTime(2026, 6, 1));
|
||||
|
||||
var result = await NewService(ctx).DeleteEventAsync(existing.Id, CancellationToken.None);
|
||||
|
||||
result.Should().BeTrue();
|
||||
var row = ctx.Events.Single();
|
||||
row.IsDeleted.Should().Be(true);
|
||||
row.DeletionTime.Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteEventAsync_WhenNotFound_ReturnsFalse()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewService(ctx).DeleteEventAsync(12345, CancellationToken.None);
|
||||
result.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventListAsync_ExcludesDeletedAndCountsAfterFilter()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedEvent(ctx, "Alpha meeting", new DateTime(2026, 6, 1));
|
||||
SeedEvent(ctx, "Beta meeting", new DateTime(2026, 6, 2));
|
||||
SeedEvent(ctx, "Alpha review", new DateTime(2026, 6, 3));
|
||||
SeedEvent(ctx, "Alpha archived", new DateTime(2026, 6, 4), isDeleted: true);
|
||||
|
||||
var result = await NewService(ctx).GetEventListAsync("alpha", 1, 10, CancellationToken.None);
|
||||
|
||||
result.TotalCount.Should().Be(2);
|
||||
result.Rows.Should().HaveCount(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventListAsync_OrdersByStartDateDescending()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedEvent(ctx, "Earliest", new DateTime(2026, 6, 1));
|
||||
SeedEvent(ctx, "Latest", new DateTime(2026, 6, 10));
|
||||
SeedEvent(ctx, "Middle", new DateTime(2026, 6, 5));
|
||||
|
||||
var result = await NewService(ctx).GetEventListAsync(null, 1, 10, CancellationToken.None);
|
||||
|
||||
result.Rows.Select(r => r.Title).Should().ContainInOrder("Latest", "Middle", "Earliest");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetEventsForCalendarAsync_ReturnsOnlyEventsOverlappingRange()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedEvent(ctx, "InRange", new DateTime(2026, 6, 15));
|
||||
SeedEvent(ctx, "BeforeRange", new DateTime(2026, 5, 1));
|
||||
SeedEvent(ctx, "AfterRange", new DateTime(2026, 7, 1));
|
||||
|
||||
var events = await NewService(ctx).GetEventsForCalendarAsync(
|
||||
new DateTime(2026, 6, 1), new DateTime(2026, 6, 30), CancellationToken.None);
|
||||
|
||||
events.Select(e => e.Title).Should().BeEquivalentTo(new[] { "InRange" });
|
||||
}
|
||||
}
|
||||
49
Api.SeaHavenIndustries.Tests/DashboardServiceTests.cs
Normal file
49
Api.SeaHavenIndustries.Tests/DashboardServiceTests.cs
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class DashboardServiceTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static DashboardService NewService(ApplicationDbContext ctx) =>
|
||||
new(new DashboardDataService(ctx));
|
||||
|
||||
private static WorkOrder Wo(string? status, bool? isTemplate = false, string? assignTo = null) =>
|
||||
new() { Status = status, istemplate = isTemplate, AssignTo = assignTo };
|
||||
|
||||
[Fact]
|
||||
public async Task GetStatsAsync_CountsByStatusExcludingTemplates()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.workOrders.AddRange(
|
||||
Wo("Open", isTemplate: false),
|
||||
Wo("Open", isTemplate: false, assignTo: "u1"),
|
||||
Wo("In Progress"),
|
||||
Wo("On Hold"),
|
||||
Wo("Done"),
|
||||
Wo("Done"),
|
||||
Wo("Open", isTemplate: true),
|
||||
Wo("Cancelled", isTemplate: false)
|
||||
);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var stats = await NewService(ctx).GetStatsAsync(CancellationToken.None);
|
||||
|
||||
stats.Total.Should().Be(7);
|
||||
stats.Open.Should().Be(4);
|
||||
stats.NotDispatched.Should().Be(1);
|
||||
stats.Completed.Should().Be(2);
|
||||
}
|
||||
}
|
||||
223
Api.SeaHavenIndustries.Tests/DispatchBatchingBehaviorTests.cs
Normal file
223
Api.SeaHavenIndustries.Tests/DispatchBatchingBehaviorTests.cs
Normal file
|
|
@ -0,0 +1,223 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.DataServices.Models;
|
||||
using SeaHaven.Services.Configuration;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class DispatchBatchingBehaviorTests
|
||||
{
|
||||
private static WorkOrderDispatchService BuildService(
|
||||
Mock<IWorkOrderDataService>? woData = null,
|
||||
Mock<IVendorDataService>? vendorData = null,
|
||||
Mock<ITaskListTemplateDataService>? templateData = null,
|
||||
Mock<IDispatchDataService>? dispatchData = null)
|
||||
{
|
||||
var dd = dispatchData ?? new Mock<IDispatchDataService>();
|
||||
dd.Setup(d => d.GenerateNextPONumberAsync()).ReturnsAsync("1");
|
||||
dd.Setup(d => d.GenerateNextDispatchNumberAsync()).ReturnsAsync("DSP-1");
|
||||
dd.Setup(d => d.AddAsync(It.IsAny<Dispatch>()))
|
||||
.ReturnsAsync((Dispatch d) => d);
|
||||
|
||||
var emailPort = new Mock<IDispatchEmailPort>();
|
||||
emailPort.Setup(e => e.SendDispatchEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
|
||||
.ReturnsAsync(true);
|
||||
|
||||
var tokenPort = new Mock<IVendorTokenPort>();
|
||||
tokenPort.Setup(t => t.GetOrCreateActiveTokenAsync(It.IsAny<int>())).ReturnsAsync("token");
|
||||
|
||||
return new WorkOrderDispatchService(
|
||||
(woData ?? new Mock<IWorkOrderDataService>()).Object,
|
||||
dd.Object,
|
||||
(vendorData ?? new Mock<IVendorDataService>()).Object,
|
||||
Mock.Of<IUserDataService>(),
|
||||
(templateData ?? new Mock<ITaskListTemplateDataService>()).Object,
|
||||
Mock.Of<ICommentDataService>(),
|
||||
emailPort.Object,
|
||||
tokenPort.Object,
|
||||
Microsoft.Extensions.Options.Options.Create(new FrontendOptions()));
|
||||
}
|
||||
|
||||
private static Mock<IWorkOrderDataService> WorkOrderDataReturning(params WorkOrder[] workOrders) =>
|
||||
WorkOrderDataReturning(new Mock<IWorkOrderDataService>(), workOrders);
|
||||
|
||||
private static Mock<IWorkOrderDataService> WorkOrderDataReturning(Mock<IWorkOrderDataService> mock, params WorkOrder[] workOrders)
|
||||
{
|
||||
mock.Setup(d => d.GetByRequestedIdsWithDetailsAsync(
|
||||
It.IsAny<IReadOnlyCollection<int>>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(workOrders.ToList());
|
||||
return mock;
|
||||
}
|
||||
|
||||
private static Mock<IVendorDataService> VendorDataReturning(params Vendor[] vendors)
|
||||
{
|
||||
var mock = new Mock<IVendorDataService>();
|
||||
mock.Setup(d => d.GetByIdsOrderedAsync(It.IsAny<IReadOnlyCollection<int>>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(vendors.ToList());
|
||||
return mock;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Dispatch_PrimaryWorkOrderFollowsReturnedOrder()
|
||||
{
|
||||
var woData = WorkOrderDataReturning(
|
||||
new WorkOrder { Id = 30, InternalWONumber = "WO-30" },
|
||||
new WorkOrder { Id = 10, InternalWONumber = "WO-10" });
|
||||
var dispatchData = new Mock<IDispatchDataService>();
|
||||
var service = BuildService(woData, VendorDataReturning(new Vendor { Id = 1, CompanyName = "V", Email = "v@x.io" }), dispatchData: dispatchData);
|
||||
|
||||
Dispatch? saved = null;
|
||||
dispatchData.Setup(d => d.AddAsync(It.IsAny<Dispatch>()))
|
||||
.ReturnsAsync((Dispatch d) => { saved = d; return d; });
|
||||
|
||||
await service.DispatchToVendorAsync(new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = new() { 30, 10 },
|
||||
VendorIds = new() { 1 }
|
||||
}, CancellationToken.None);
|
||||
|
||||
saved.Should().NotBeNull();
|
||||
saved!.WorkOrderId.Should().Be(30);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Dispatch_DeduplicatesVendorsAndSkipsMissing()
|
||||
{
|
||||
var woData = WorkOrderDataReturning(new WorkOrder { Id = 10, InternalWONumber = "WO-10" });
|
||||
var vendorData = new Mock<IVendorDataService>();
|
||||
vendorData.Setup(d => d.GetByIdsOrderedAsync(It.IsAny<IReadOnlyCollection<int>>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new List<Vendor> { new() { Id = 2, CompanyName = "Only Co", Email = "v@x.io" } });
|
||||
|
||||
var service = BuildService(woData, vendorData);
|
||||
|
||||
var result = await service.DispatchToVendorAsync(new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = new() { 10 },
|
||||
VendorIds = new() { 2, 2, 999 }
|
||||
}, CancellationToken.None);
|
||||
|
||||
result.Dispatches.Should().HaveCount(1);
|
||||
result.Dispatches.Single().VendorName.Should().Be("Only Co");
|
||||
vendorData.Verify(d => d.GetByIdsOrderedAsync(
|
||||
It.Is<IReadOnlyCollection<int>>(ids => ids.SequenceEqual(new[] { 2, 999 })),
|
||||
It.IsAny<CancellationToken>()), Times.Once);
|
||||
vendorData.Verify(d => d.GetByIdAsync(It.IsAny<int>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Dispatch_FetchesTemplateOnceRegardlessOfVendorCount()
|
||||
{
|
||||
var woData = WorkOrderDataReturning(new WorkOrder { Id = 10, InternalWONumber = "WO-10" });
|
||||
var templateData = new Mock<ITaskListTemplateDataService>();
|
||||
templateData.Setup(d => d.GetByIdWithItemsAsync(7))
|
||||
.ReturnsAsync(new TaskListTemplate
|
||||
{
|
||||
Items = new List<TaskListTemplateItem>
|
||||
{
|
||||
new() { ItemText = "A", SortOrder = 0 },
|
||||
new() { ItemText = "B", SortOrder = 1 }
|
||||
}
|
||||
});
|
||||
var vendorData = VendorDataReturning(
|
||||
new Vendor { Id = 1, CompanyName = "V1", Email = "a@x.io" },
|
||||
new Vendor { Id = 2, CompanyName = "V2", Email = "b@x.io" });
|
||||
|
||||
var service = BuildService(woData, vendorData, templateData);
|
||||
|
||||
await service.DispatchToVendorAsync(new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = new() { 10 },
|
||||
VendorIds = new() { 1, 2 },
|
||||
TaskListTemplateId = 7
|
||||
}, CancellationToken.None);
|
||||
|
||||
templateData.Verify(d => d.GetByIdWithItemsAsync(7), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Dispatch_PerformsSingleBatchedVendorLookup()
|
||||
{
|
||||
var woData = WorkOrderDataReturning(new WorkOrder { Id = 10, InternalWONumber = "WO-10" });
|
||||
var vendorData = VendorDataReturning(new Vendor { Id = 1, CompanyName = "V1", Email = "a@x.io" });
|
||||
|
||||
var service = BuildService(woData, vendorData);
|
||||
|
||||
await service.DispatchToVendorAsync(new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = new() { 10 },
|
||||
VendorIds = new() { 1, 2, 3 }
|
||||
}, CancellationToken.None);
|
||||
|
||||
vendorData.Verify(d => d.GetByIdsOrderedAsync(It.IsAny<IReadOnlyCollection<int>>(), It.IsAny<CancellationToken>()), Times.Once);
|
||||
vendorData.Verify(d => d.GetByIdAsync(It.IsAny<int>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Dispatch_BatchesAuditLogsOncePerVendorAndNeverSingles()
|
||||
{
|
||||
var woData = WorkOrderDataReturning(
|
||||
new WorkOrder { Id = 10, InternalWONumber = "WO-10" },
|
||||
new WorkOrder { Id = 11, InternalWONumber = "WO-11" });
|
||||
var vendorData = VendorDataReturning(
|
||||
new Vendor { Id = 1, CompanyName = "V1", Email = "a@x.io" },
|
||||
new Vendor { Id = 2, CompanyName = "V2", Email = "b@x.io" });
|
||||
|
||||
var service = BuildService(woData, vendorData);
|
||||
|
||||
await service.DispatchToVendorAsync(new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = new() { 10, 11 },
|
||||
VendorIds = new() { 1, 2 }
|
||||
}, CancellationToken.None);
|
||||
|
||||
woData.Verify(d => d.AddAuditLogsAsync(It.Is<IReadOnlyCollection<WorkOrderAuditLog>>(logs => logs.Count == 2)), Times.Exactly(2));
|
||||
woData.Verify(d => d.AddAuditLogAsync(It.IsAny<WorkOrderAuditLog>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Dispatch_NoWorkOrders_Throws()
|
||||
{
|
||||
var woData = WorkOrderDataReturning();
|
||||
var service = BuildService(woData, VendorDataReturning());
|
||||
|
||||
var act = () => service.DispatchToVendorAsync(new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = new() { 404 },
|
||||
VendorIds = new() { 1 }
|
||||
}, CancellationToken.None);
|
||||
|
||||
await act.Should().ThrowAsync<InvalidOperationException>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Dispatch_ForwardsSameCancellationTokenToBothBatchDataServices()
|
||||
{
|
||||
var woData = WorkOrderDataReturning(new WorkOrder { Id = 10, InternalWONumber = "WO-10" });
|
||||
var vendorData = VendorDataReturning(new Vendor { Id = 1, CompanyName = "V1", Email = "a@x.io" });
|
||||
var service = BuildService(woData, vendorData);
|
||||
|
||||
using var cts = new CancellationTokenSource();
|
||||
var token = cts.Token;
|
||||
|
||||
await service.DispatchToVendorAsync(new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = new() { 10 },
|
||||
VendorIds = new() { 1 }
|
||||
}, token);
|
||||
|
||||
woData.Verify(d => d.GetByRequestedIdsWithDetailsAsync(
|
||||
It.IsAny<IReadOnlyCollection<int>>(),
|
||||
token), Times.Once);
|
||||
vendorData.Verify(d => d.GetByIdsOrderedAsync(
|
||||
It.IsAny<IReadOnlyCollection<int>>(),
|
||||
token), Times.Once);
|
||||
}
|
||||
}
|
||||
77
Api.SeaHavenIndustries.Tests/DispatchControllerTests.cs
Normal file
77
Api.SeaHavenIndustries.Tests/DispatchControllerTests.cs
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class DispatchControllerTests
|
||||
{
|
||||
private static DispatchController NewController(Mock<IDispatchService> service) =>
|
||||
new(service.Object);
|
||||
|
||||
private static object Prop(object source, string name) =>
|
||||
source.GetType().GetProperty(name)!.GetValue(source)!;
|
||||
|
||||
[Fact]
|
||||
public async Task List_ReturnsDataResponseWithPaginationShape()
|
||||
{
|
||||
var service = new Mock<IDispatchService>();
|
||||
service.Setup(s => s.GetDispatchListAsync("a", null, null, null, null, "dispatchedAt", "desc", 1, 25, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new DispatchListResultDTO
|
||||
{
|
||||
Total = 2,
|
||||
Page = 1,
|
||||
PageSize = 25,
|
||||
Items = new List<DispatchListEntryDTO>
|
||||
{
|
||||
new() { Id = 1, DispatchNumber = "D1" },
|
||||
new() { Id = 2, DispatchNumber = "D2" }
|
||||
}
|
||||
});
|
||||
|
||||
var result = await NewController(service).List("a", null, null, null, null, "dispatchedAt", "desc", 1, 25, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("Success");
|
||||
object data = response.Data!;
|
||||
Prop(data, "total").Should().Be(2);
|
||||
Prop(data, "page").Should().Be(1);
|
||||
Prop(data, "pageSize").Should().Be(25);
|
||||
((System.Collections.IEnumerable)Prop(data, "items")).Cast<object>().Count().Should().Be(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetById_WhenMissing_ReturnsNotFound()
|
||||
{
|
||||
var service = new Mock<IDispatchService>();
|
||||
service.Setup(s => s.GetDispatchDetailAsync(99, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((DispatchDetailResultDTO?)null);
|
||||
|
||||
var result = await NewController(service).GetById(99, CancellationToken.None);
|
||||
|
||||
var notFound = result.Should().BeOfType<NotFoundObjectResult>().Subject;
|
||||
notFound.Value.Should().BeOfType<Response>().Subject.Message.Should().Be("Dispatch not found");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetById_WhenFound_ReturnsDetailAsData()
|
||||
{
|
||||
var service = new Mock<IDispatchService>();
|
||||
var detail = new DispatchDetailResultDTO { Id = 5, DispatchNumber = "D5", Status = "Pending" };
|
||||
service.Setup(s => s.GetDispatchDetailAsync(5, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(detail);
|
||||
|
||||
var result = await NewController(service).GetById(5, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("Success");
|
||||
((object?)response.Data).Should().BeSameAs(detail);
|
||||
}
|
||||
}
|
||||
117
Api.SeaHavenIndustries.Tests/DispatchServiceTests.cs
Normal file
117
Api.SeaHavenIndustries.Tests/DispatchServiceTests.cs
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
using FluentAssertions;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Dto;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using SeaHaven.Services.Validation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class DispatchServiceTests
|
||||
{
|
||||
private static DispatchService NewService(Mock<IDispatchDataService> data) =>
|
||||
new(data.Object, new CreateDispatchValidation(), new UpdateDispatchValidation());
|
||||
|
||||
[Fact]
|
||||
public async Task GetDispatchListAsync_MapsDataReadModelToServiceDtoPreservingFields()
|
||||
{
|
||||
var data = new Mock<IDispatchDataService>();
|
||||
var source = new DispatchListResult
|
||||
{
|
||||
Total = 1,
|
||||
Page = 2,
|
||||
PageSize = 25,
|
||||
Items = new List<DispatchListItemDTO>
|
||||
{
|
||||
new()
|
||||
{
|
||||
Id = 7,
|
||||
DispatchNumber = "DISP-7",
|
||||
PONumber = "PO-1",
|
||||
NTEAmount = 200m,
|
||||
Status = "Pending",
|
||||
VendorId = 9,
|
||||
VendorName = "Acme",
|
||||
WorkOrderId = 3,
|
||||
PrimaryWOInternalNumber = "WO-3",
|
||||
PrimaryWOTitle = "Fix AC",
|
||||
LocationName = "Site A",
|
||||
WorkOrderCount = 2,
|
||||
PendingUpliftCount = 1
|
||||
}
|
||||
}
|
||||
};
|
||||
data.Setup(d => d.GetListAsync(It.IsAny<DispatchListQuery>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(source);
|
||||
|
||||
var result = await NewService(data).GetDispatchListAsync("a", "Pending", 9, null, null, "ponumber", "asc", 2, 25, CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<DispatchListResultDTO>();
|
||||
result.Total.Should().Be(1);
|
||||
result.Page.Should().Be(2);
|
||||
result.PageSize.Should().Be(25);
|
||||
var row = result.Items.Single();
|
||||
row.Id.Should().Be(7);
|
||||
row.DispatchNumber.Should().Be("DISP-7");
|
||||
row.PONumber.Should().Be("PO-1");
|
||||
row.NTEAmount.Should().Be(200m);
|
||||
row.Status.Should().Be("Pending");
|
||||
row.VendorId.Should().Be(9);
|
||||
row.VendorName.Should().Be("Acme");
|
||||
row.WorkOrderId.Should().Be(3);
|
||||
row.PrimaryWOInternalNumber.Should().Be("WO-3");
|
||||
row.PrimaryWOTitle.Should().Be("Fix AC");
|
||||
row.LocationName.Should().Be("Site A");
|
||||
row.WorkOrderCount.Should().Be(2);
|
||||
row.PendingUpliftCount.Should().Be(1);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetDispatchDetailAsync_MapsNestedCollectionsPreservingShape()
|
||||
{
|
||||
var data = new Mock<IDispatchDataService>();
|
||||
var detail = new DispatchDetailDTO
|
||||
{
|
||||
Id = 42,
|
||||
DispatchNumber = "DISP-42",
|
||||
PONumber = "PO-9",
|
||||
NTEAmount = 500m,
|
||||
Status = "Dispatched",
|
||||
Description = "desc",
|
||||
WorkOrderId = 11,
|
||||
EmailSent = true,
|
||||
Vendor = new DispatchDetailVendorDTO { Id = 1, CompanyName = "VendorCo", Email = "v@x.com" },
|
||||
PrimaryLocation = new DispatchPrimaryLocationDTO { Id = 5, Name = "Loc", City = "Austin" },
|
||||
WorkOrders = new List<DispatchLinkedWorkOrderDTO> { new() { WorkOrderId = 11, Title = "T", Priority = "High" } },
|
||||
Checklist = new List<DispatchChecklistDTO> { new() { Id = 1, ItemText = "Check", IsCompleted = true, SortOrder = 1 } },
|
||||
Signoffs = new List<DispatchSignoffDTO> { new() { Id = 1, SignoffType = "Vendor", Name = "J" } },
|
||||
Comments = new List<DispatchCommentDTO> { new() { Id = 1, Commenttext = "Hi", UserName = "Sara" } },
|
||||
UpliftRequests = new List<DispatchUpliftRequestDTO> { new() { Id = 1, RequestedNTE = 600m, CurrentNTE = 500m, Delta = 100m, Status = "Pending" } },
|
||||
AuditLog = new List<DispatchAuditLogDTO> { new() { Id = 1, Action = "Updated", FieldName = "DISP-42:Status" } }
|
||||
};
|
||||
data.Setup(d => d.GetDetailAsync(42, It.IsAny<CancellationToken>())).ReturnsAsync(detail);
|
||||
data.Setup(d => d.GetDetailAsync(999, It.IsAny<CancellationToken>())).ReturnsAsync((DispatchDetailDTO?)null);
|
||||
|
||||
var service = NewService(data);
|
||||
|
||||
var found = await service.GetDispatchDetailAsync(42, CancellationToken.None);
|
||||
var missing = await service.GetDispatchDetailAsync(999, CancellationToken.None);
|
||||
|
||||
missing.Should().BeNull();
|
||||
found.Should().BeOfType<DispatchDetailResultDTO>();
|
||||
found!.Id.Should().Be(42);
|
||||
found.DispatchNumber.Should().Be("DISP-42");
|
||||
found.EmailSent.Should().BeTrue();
|
||||
found.Vendor!.CompanyName.Should().Be("VendorCo");
|
||||
found.PrimaryLocation!.Name.Should().Be("Loc");
|
||||
found.WorkOrders.Single().Title.Should().Be("T");
|
||||
found.Checklist.Single().IsCompleted.Should().BeTrue();
|
||||
found.Signoffs.Single().Name.Should().Be("J");
|
||||
found.Comments.Single().UserName.Should().Be("Sara");
|
||||
found.UpliftRequests.Single().Delta.Should().Be(100m);
|
||||
found.AuditLog.Single().Action.Should().Be("Updated");
|
||||
}
|
||||
}
|
||||
146
Api.SeaHavenIndustries.Tests/DropdownOptionsServiceTests.cs
Normal file
146
Api.SeaHavenIndustries.Tests/DropdownOptionsServiceTests.cs
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class DropdownOptionsServiceTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static DropdownOptionsService NewService(ApplicationDbContext ctx) =>
|
||||
new(new DropdownOptionsDataService(ctx));
|
||||
|
||||
private static DropdownOption Option(string category, string value, string? parent = null, int sort = 0, bool active = true) =>
|
||||
new() { Category = category, Value = value, ParentValue = parent, SortOrder = sort, IsActive = active };
|
||||
|
||||
[Fact]
|
||||
public async Task GetAllAsync_FiltersActiveAndOrdersBySortThenValue()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.DropdownOptions.AddRange(
|
||||
Option("Color", "Red", sort: 2),
|
||||
Option("Color", "Blue", sort: 1),
|
||||
Option("Color", "Green", sort: 1, active: false),
|
||||
Option("Shape", "Circle")
|
||||
);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var result = (await NewService(ctx).GetAllAsync(null, CancellationToken.None)).ToList();
|
||||
|
||||
result.Should().HaveCount(3);
|
||||
result.Select(d => d.Value).Should().ContainInOrder("Blue", "Red", "Circle");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByCategoryAsync_FiltersByCategoryAndParent()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.DropdownOptions.AddRange(
|
||||
Option("State", "TX", parent: "US"),
|
||||
Option("State", "CA", parent: "US"),
|
||||
Option("State", "ON", parent: "CA")
|
||||
);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var result = (await NewService(ctx).GetByCategoryAsync("State", "US", CancellationToken.None)).ToList();
|
||||
|
||||
result.Select(d => d.Value).Should().BeEquivalentTo(new[] { "TX", "CA" });
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateAsync_WhenCategoryOrValueMissing_Throws()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var act = () => NewService(ctx).CreateAsync(new DropdownOptionDTO { Category = "", Value = "X" }, CancellationToken.None);
|
||||
await act.Should().ThrowAsync<InvalidOperationException>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateAsync_WhenDuplicate_Throws()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.DropdownOptions.Add(Option("Color", "Red", parent: "Primary"));
|
||||
ctx.SaveChanges();
|
||||
|
||||
var act = () => NewService(ctx).CreateAsync(new DropdownOptionDTO { Category = "Color", Value = "Red", ParentValue = "Primary" }, CancellationToken.None);
|
||||
|
||||
await act.Should().ThrowAsync<InvalidOperationException>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateAsync_ForcesActiveTrueAndReturnsDtoWithId()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var dto = await NewService(ctx).CreateAsync(
|
||||
new DropdownOptionDTO { Category = "Color", Value = "Red", IsActive = false }, CancellationToken.None);
|
||||
|
||||
dto.Id.Should().BeGreaterThan(0);
|
||||
dto.IsActive.Should().BeTrue();
|
||||
ctx.DropdownOptions.Single().IsActive.Should().BeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateAsync_WhenNotFound_ThrowsKeyNotFound()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var act = () => NewService(ctx).UpdateAsync(404, new DropdownOptionDTO { Category = "Color", Value = "Red" }, CancellationToken.None);
|
||||
await act.Should().ThrowAsync<KeyNotFoundException>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateAsync_UpdatesValueParentSortActiveButNotCategory()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = Option("Color", "Red");
|
||||
ctx.DropdownOptions.Add(existing);
|
||||
ctx.SaveChanges();
|
||||
|
||||
await NewService(ctx).UpdateAsync(existing.Id, new DropdownOptionDTO
|
||||
{
|
||||
Category = "Ignored",
|
||||
Value = "Crimson",
|
||||
ParentValue = "Warm",
|
||||
SortOrder = 5,
|
||||
IsActive = false
|
||||
}, CancellationToken.None);
|
||||
|
||||
var row = ctx.DropdownOptions.Single();
|
||||
row.Category.Should().Be("Color");
|
||||
row.Value.Should().Be("Crimson");
|
||||
row.ParentValue.Should().Be("Warm");
|
||||
row.SortOrder.Should().Be(5);
|
||||
row.IsActive.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteAsync_WhenNotFound_ThrowsKeyNotFound()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var act = () => NewService(ctx).DeleteAsync(404, CancellationToken.None);
|
||||
await act.Should().ThrowAsync<KeyNotFoundException>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteAsync_RemovesOption()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = Option("Color", "Red");
|
||||
ctx.DropdownOptions.Add(existing);
|
||||
ctx.SaveChanges();
|
||||
|
||||
await NewService(ctx).DeleteAsync(existing.Id, CancellationToken.None);
|
||||
|
||||
ctx.DropdownOptions.Should().BeEmpty();
|
||||
}
|
||||
}
|
||||
135
Api.SeaHavenIndustries.Tests/FollowUpControllerTests.cs
Normal file
135
Api.SeaHavenIndustries.Tests/FollowUpControllerTests.cs
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
using System.Security.Claims;
|
||||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class FollowUpControllerTests
|
||||
{
|
||||
private static FollowUpController NewController(Mock<IFollowUpService> service)
|
||||
{
|
||||
var controller = new FollowUpController(service.Object, Mock.Of<ILogger<FollowUpController>>())
|
||||
{
|
||||
ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
{
|
||||
User = new ClaimsPrincipal(new ClaimsIdentity(new[]
|
||||
{
|
||||
new Claim(ClaimTypes.NameIdentifier, "user-1")
|
||||
}, "Test"))
|
||||
}
|
||||
}
|
||||
};
|
||||
return controller;
|
||||
}
|
||||
|
||||
private static FollowUpController NewControllerNoUser(Mock<IFollowUpService> service) =>
|
||||
new(service.Object, Mock.Of<ILogger<FollowUpController>>())
|
||||
{
|
||||
ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
{
|
||||
User = new ClaimsPrincipal(new ClaimsIdentity())
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private static object Prop(object source, string name) =>
|
||||
source.GetType().GetProperty(name)!.GetValue(source)!;
|
||||
|
||||
[Fact]
|
||||
public async Task GetFollowUps_ReturnsPaginationEnvelopeWithMappedRows()
|
||||
{
|
||||
var service = new Mock<IFollowUpService>();
|
||||
service.Setup(s => s.GetFollowUpListAsync(1, 12, "", "Open", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new PagedResult<FollowUpListRowDTO>
|
||||
{
|
||||
Items = new List<FollowUpListRowDTO> { new() { Id = 1, Reason = "R", CreatedByName = "Me" } },
|
||||
TotalCount = 1,
|
||||
Page = 1,
|
||||
PageSize = 12
|
||||
});
|
||||
|
||||
var result = await NewController(service).GetFollowUps();
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<Pagination_DTO>().Subject;
|
||||
envelope.PageSize.Should().Be(12);
|
||||
envelope.TotalCount.Should().Be(1);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetById_WhenMissing_ReturnsNotFound()
|
||||
{
|
||||
var service = new Mock<IFollowUpService>();
|
||||
service.Setup(s => s.GetFollowUpDetailAsync(9, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((FollowUpDetailDTO?)null);
|
||||
|
||||
var result = await NewController(service).GetById(9, CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<NotFoundResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Create_WhenNoUser_ReturnsUnauthorized()
|
||||
{
|
||||
var service = new Mock<IFollowUpService>();
|
||||
var result = await NewControllerNoUser(service).Create(new FollowUp_DTO { Reason = "x" }, CancellationToken.None);
|
||||
|
||||
var unauthorized = result.Should().BeOfType<UnauthorizedObjectResult>().Subject;
|
||||
unauthorized.Value.Should().BeOfType<Response>().Subject.Message.Should().Be("User not authenticated");
|
||||
service.Verify(s => s.CreateOpenFollowUpAsync(It.IsAny<FollowUpCreateRequestDTO>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Create_WhenAuthenticated_ReturnsCreatedWithId()
|
||||
{
|
||||
var service = new Mock<IFollowUpService>();
|
||||
service.Setup(s => s.CreateOpenFollowUpAsync(It.IsAny<FollowUpCreateRequestDTO>(), "user-1", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(42);
|
||||
|
||||
var result = await NewController(service).Create(new FollowUp_DTO { Reason = "x" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("200");
|
||||
response.Message.Should().Be("Follow Up created");
|
||||
((object?)response.Data).Should().Be(42);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Complete_WhenMissing_ReturnsNotFound()
|
||||
{
|
||||
var service = new Mock<IFollowUpService>();
|
||||
service.Setup(s => s.SetFollowUpStatusAsync(3, "Completed", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var result = await NewController(service).Complete(3, CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<NotFoundResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Delete_WhenMissing_ReturnsNotFoundEnvelope()
|
||||
{
|
||||
var service = new Mock<IFollowUpService>();
|
||||
service.Setup(s => s.RemoveFollowUpAsync(8, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var result = await NewController(service).Delete(8, CancellationToken.None);
|
||||
|
||||
var notFound = result.Should().BeOfType<NotFoundObjectResult>().Subject;
|
||||
notFound.Value.Should().BeOfType<Response>().Subject.Message.Should().Be("Follow Up not found");
|
||||
}
|
||||
}
|
||||
162
Api.SeaHavenIndustries.Tests/FollowUpServiceTests.cs
Normal file
162
Api.SeaHavenIndustries.Tests/FollowUpServiceTests.cs
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Validation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class FollowUpServiceTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static FollowUpService NewService(ApplicationDbContext ctx) =>
|
||||
new(new FollowUpDataService(ctx), new CreateFollowUpValidation(), new UpdateFollowUpValidation());
|
||||
|
||||
private static FollowUps SeedFollowUp(ApplicationDbContext ctx, string reason, string status = "Open")
|
||||
{
|
||||
var f = new FollowUps
|
||||
{
|
||||
Reason = reason,
|
||||
ScheduleDate = new DateTime(2026, 8, 1),
|
||||
ScheduleStartTime = new TimeSpan(9, 0, 0),
|
||||
Status = status,
|
||||
createdby = "user-1",
|
||||
CreatedDate = DateTime.Now
|
||||
};
|
||||
ctx.FollowUps.Add(f);
|
||||
ctx.SaveChanges();
|
||||
return f;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateOpenFollowUpAsync_ForcesOpenStatusAndPersistsFields()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var service = NewService(ctx);
|
||||
|
||||
var id = await service.CreateOpenFollowUpAsync(new FollowUpCreateRequestDTO
|
||||
{
|
||||
Reason = "Call back",
|
||||
ScheduleDate = new DateTime(2026, 9, 1),
|
||||
ScheduleStartTime = new TimeSpan(10, 30, 0),
|
||||
EmployeeId = 5,
|
||||
WorkOrderId = 7,
|
||||
AccountId = 9,
|
||||
LocationId = 11
|
||||
}, "user-9", CancellationToken.None);
|
||||
|
||||
var entity = ctx.FollowUps.Single();
|
||||
entity.Id.Should().Be(id);
|
||||
entity.Status.Should().Be("Open");
|
||||
entity.Reason.Should().Be("Call back");
|
||||
entity.createdby.Should().Be("user-9");
|
||||
entity.EmployeeId.Should().Be(5);
|
||||
entity.WorkOrderId.Should().Be(7);
|
||||
entity.CreatedDate.Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetFollowUpListAsync_DefaultsToOpenAndMapsShape()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedFollowUp(ctx, "Open one", "Open");
|
||||
SeedFollowUp(ctx, "Done one", "Completed");
|
||||
|
||||
var page = await NewService(ctx).GetFollowUpListAsync(1, 12, "", null, CancellationToken.None);
|
||||
|
||||
page.Items.Should().HaveCount(1);
|
||||
page.Items.Single().Reason.Should().Be("Open one");
|
||||
page.Items.Single().Status.Should().Be("Open");
|
||||
page.PageSize.Should().Be(12);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetFollowUpDetailAsync_MapsRelatedNamesAndResolvesCreator()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var employee = new Employee { FirstName = "Sara", LastName = "Lee" };
|
||||
ctx.Employees.Add(employee);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var account = new Accounts { Name = "Acme" };
|
||||
ctx.Accounts.Add(account);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var user = new ApplicationUser { Id = "user-1", FirstName = "Creator", LastName = "One", UserName = "cone" };
|
||||
var fu = new FollowUps
|
||||
{
|
||||
Reason = "Detail",
|
||||
ScheduleDate = new DateTime(2026, 8, 2),
|
||||
ScheduleStartTime = new TimeSpan(8, 0, 0),
|
||||
Status = "Open",
|
||||
EmployeeId = employee.Id,
|
||||
AccountId = account.Id,
|
||||
createdby = "user-1",
|
||||
CreatedDate = DateTime.Now
|
||||
};
|
||||
ctx.Users.Add(user);
|
||||
ctx.FollowUps.Add(fu);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var detail = await NewService(ctx).GetFollowUpDetailAsync(fu.Id, CancellationToken.None);
|
||||
|
||||
detail.Should().NotBeNull();
|
||||
detail!.AssignedTo.Should().Be("Sara Lee");
|
||||
detail.AccountName.Should().Be("Acme");
|
||||
detail.CreatedById.Should().Be("user-1");
|
||||
detail.CreatedByName.Should().Be("Creator One");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateFollowUpFieldsAsync_UpdatesAndThrowsWhenMissing()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedFollowUp(ctx, "Old reason");
|
||||
|
||||
await NewService(ctx).UpdateFollowUpFieldsAsync(existing.Id, new FollowUpUpdateRequestDTO
|
||||
{
|
||||
Id = existing.Id,
|
||||
Reason = "New reason",
|
||||
ScheduleDate = new DateTime(2026, 10, 1),
|
||||
ScheduleStartTime = new TimeSpan(11, 0, 0)
|
||||
}, CancellationToken.None);
|
||||
|
||||
var row = ctx.FollowUps.Single();
|
||||
row.Reason.Should().Be("New reason");
|
||||
|
||||
var act = () => NewService(ctx).UpdateFollowUpFieldsAsync(existing.Id + 999, new FollowUpUpdateRequestDTO { Id = existing.Id + 999 }, CancellationToken.None);
|
||||
await act.Should().ThrowAsync<KeyNotFoundException>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SetFollowUpStatusAsync_TogglesStatusAndReturnsFalseWhenMissing()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedFollowUp(ctx, "To complete");
|
||||
|
||||
(await NewService(ctx).SetFollowUpStatusAsync(existing.Id, "Completed", CancellationToken.None)).Should().BeTrue();
|
||||
ctx.FollowUps.Single().Status.Should().Be("Completed");
|
||||
(await NewService(ctx).SetFollowUpStatusAsync(existing.Id + 999, "Completed", CancellationToken.None)).Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RemoveFollowUpAsync_RemovesAndReturnsFalseWhenMissing()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedFollowUp(ctx, "Gone");
|
||||
|
||||
(await NewService(ctx).RemoveFollowUpAsync(existing.Id, CancellationToken.None)).Should().BeTrue();
|
||||
(await NewService(ctx).RemoveFollowUpAsync(existing.Id, CancellationToken.None)).Should().BeFalse();
|
||||
ctx.FollowUps.Should().BeEmpty();
|
||||
}
|
||||
}
|
||||
42
Api.SeaHavenIndustries.Tests/IdentityTestHelpers.cs
Normal file
42
Api.SeaHavenIndustries.Tests/IdentityTestHelpers.cs
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Moq;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
internal static class IdentityTestHelpers
|
||||
{
|
||||
public static (UserManager<ApplicationUser> manager, Mock<IUserRoleStore<ApplicationUser>> store, Mock<IPasswordHasher<ApplicationUser>> hasher) CreateUserManager()
|
||||
{
|
||||
var store = new Mock<IUserRoleStore<ApplicationUser>>();
|
||||
var hasher = new Mock<IPasswordHasher<ApplicationUser>>();
|
||||
|
||||
store.As<IUserPasswordStore<ApplicationUser>>();
|
||||
|
||||
var manager = new UserManager<ApplicationUser>(
|
||||
store.Object,
|
||||
Microsoft.Extensions.Options.Options.Create(new IdentityOptions()),
|
||||
hasher.Object,
|
||||
new List<IUserValidator<ApplicationUser>>(),
|
||||
new List<IPasswordValidator<ApplicationUser>>(),
|
||||
new Mock<ILookupNormalizer>().Object,
|
||||
new IdentityErrorDescriber(),
|
||||
new Mock<IServiceProvider>().Object,
|
||||
new Mock<ILogger<UserManager<ApplicationUser>>>().Object);
|
||||
|
||||
return (manager, store, hasher);
|
||||
}
|
||||
|
||||
public static ApplicationUser User(string id = "u1", string? userName = "alice", bool? isDeleted = false) => new()
|
||||
{
|
||||
Id = id,
|
||||
UserName = userName,
|
||||
Email = userName + "@example.com",
|
||||
FirstName = "Alice",
|
||||
LastName = "Q",
|
||||
PhoneNumber = "555",
|
||||
IsDeleted = isDeleted
|
||||
};
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ using FluentAssertions;
|
|||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
|
|
@ -31,7 +32,7 @@ public class LocationControllerSitesTests
|
|||
Mock.Of<ICreateLocationValidation>(),
|
||||
Mock.Of<IUpdateLocationValidation>());
|
||||
|
||||
var controller = new LocationController(service, dataService)
|
||||
var controller = new LocationController(service, Mock.Of<ILogger<LocationController>>())
|
||||
{
|
||||
ControllerContext = new ControllerContext
|
||||
{
|
||||
|
|
|
|||
105
Api.SeaHavenIndustries.Tests/LocationControllerTests.cs
Normal file
105
Api.SeaHavenIndustries.Tests/LocationControllerTests.cs
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using FluentValidation;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class LocationControllerTests
|
||||
{
|
||||
private static LocationController NewController(Mock<ILocationService> service) =>
|
||||
new(service.Object, Mock.Of<ILogger<LocationController>>());
|
||||
|
||||
private static object Prop(object source, string name) =>
|
||||
source.GetType().GetProperty(name)!.GetValue(source)!;
|
||||
|
||||
[Fact]
|
||||
public async Task GetLocationList_ReturnsPaginationEnvelopeWithServiceData()
|
||||
{
|
||||
var service = new Mock<ILocationService>();
|
||||
service.Setup(s => s.GetLocationListPagedAsync(1, 10, "a", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new PagedResult<LocationDTO>
|
||||
{
|
||||
Items = new List<LocationDTO> { new() { Id = 1, Name = "Site" } },
|
||||
TotalCount = 1,
|
||||
Page = 1,
|
||||
PageSize = 10
|
||||
});
|
||||
|
||||
var result = await NewController(service).GetLocationList("a", 1, 10, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<Pagination_DTO>().Subject;
|
||||
envelope.PageNumber.Should().Be(1);
|
||||
envelope.PageSize.Should().Be(10);
|
||||
envelope.TotalCount.Should().Be(1);
|
||||
envelope.TotalPages.Should().Be(1);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetLocationById_WhenMissing_ReturnsNotFoundAndDoesNotLeakEntity()
|
||||
{
|
||||
var service = new Mock<ILocationService>();
|
||||
service.Setup(s => s.GetLocationDetailAsync(5, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((LocationDTO?)null);
|
||||
|
||||
var result = await NewController(service).GetLocationById(5, CancellationToken.None);
|
||||
|
||||
var notFound = result.Should().BeOfType<NotFoundObjectResult>().Subject;
|
||||
var response = notFound.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Message.Should().Be("Location not found");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetLocationById_WhenFound_MapsServiceDtoToAliasedShape()
|
||||
{
|
||||
var service = new Mock<ILocationService>();
|
||||
service.Setup(s => s.GetLocationDetailAsync(7, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new LocationDTO { Id = 7, Name = "N", Address1 = "A", Zip = "Z", PhoneNumber = "P", Email = "E", Status = "Active" });
|
||||
|
||||
var result = await NewController(service).GetLocationById(7, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var body = ok.Value!;
|
||||
Prop(body, "Id").Should().Be(7);
|
||||
Prop(body, "Name").Should().Be("N");
|
||||
Prop(body, "Address").Should().Be("A");
|
||||
Prop(body, "ZipCode").Should().Be("Z");
|
||||
Prop(body, "Phone").Should().Be("P");
|
||||
Prop(body, "ContactEmail").Should().Be("E");
|
||||
Prop(body, "Status").Should().Be("Active");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddLocation_WhenServiceSucceeds_ReturnsCreatedResponse()
|
||||
{
|
||||
var service = new Mock<ILocationService>();
|
||||
var result = await NewController(service).AddLocation(new Location_DTO { Name = "X" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("200");
|
||||
response.Message.Should().Be("Location Created Successfully");
|
||||
service.Verify(s => s.CreateLocationFromRequestAsync(It.IsAny<LocationCreateRequestDTO>(), It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditLocation_WhenMissing_ReturnsNotFound()
|
||||
{
|
||||
var service = new Mock<ILocationService>();
|
||||
service.Setup(s => s.UpdateLocationFromRequestAsync(99, It.IsAny<LocationUpdateRequestDTO>(), It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new KeyNotFoundException());
|
||||
|
||||
var result = await NewController(service).EditLocation(99, new EditLocation_DTO { Name = "X" }, CancellationToken.None);
|
||||
|
||||
var notFound = result.Should().BeOfType<NotFoundObjectResult>().Subject;
|
||||
notFound.Value.Should().BeOfType<Response>().Subject.Message.Should().Be("Location not found");
|
||||
}
|
||||
}
|
||||
133
Api.SeaHavenIndustries.Tests/LocationServiceTests.cs
Normal file
133
Api.SeaHavenIndustries.Tests/LocationServiceTests.cs
Normal file
|
|
@ -0,0 +1,133 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Validation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class LocationServiceTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static LocationService NewService(ApplicationDbContext ctx) =>
|
||||
new(new LocationDataService(ctx), new CreateLocationValidation(), new UpdateLocationValidation());
|
||||
|
||||
private static Locations SeedLocation(ApplicationDbContext ctx, string name, string? city = null, string? status = "Active")
|
||||
{
|
||||
var loc = new Locations { Name = name, City = city, Status = status, CreatedDate = DateTime.Now };
|
||||
ctx.Locations.Add(loc);
|
||||
ctx.SaveChanges();
|
||||
return loc;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateLocationFromRequestAsync_PersistsMappedFields()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var service = NewService(ctx);
|
||||
|
||||
await service.CreateLocationFromRequestAsync(new LocationCreateRequestDTO
|
||||
{
|
||||
Name = "Warehouse",
|
||||
Title = "Main WH",
|
||||
Address = "1 Depot Rd",
|
||||
City = "Austin",
|
||||
State = "TX",
|
||||
ZipCode = "73301",
|
||||
Phone = "555-1000",
|
||||
ContactEmail = "wh@example.com",
|
||||
Status = "Active"
|
||||
}, CancellationToken.None);
|
||||
|
||||
var entity = ctx.Locations.Single();
|
||||
entity.Name.Should().Be("Warehouse");
|
||||
entity.Title.Should().Be("Main WH");
|
||||
entity.Address1.Should().Be("1 Depot Rd");
|
||||
entity.City.Should().Be("Austin");
|
||||
entity.State.Should().Be("TX");
|
||||
entity.Zip.Should().Be("73301");
|
||||
entity.PhoneNumber.Should().Be("555-1000");
|
||||
entity.Email.Should().Be("wh@example.com");
|
||||
entity.Status.Should().Be("Active");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetLocationListPagedAsync_FiltersBySearchAndMapsShape()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
SeedLocation(ctx, "Alpha Site", "Austin");
|
||||
SeedLocation(ctx, "Beta Site", "Dallas");
|
||||
SeedLocation(ctx, "Gamma Yard", "Austin");
|
||||
|
||||
var page = await NewService(ctx).GetLocationListPagedAsync(1, 10, "Austin", CancellationToken.None);
|
||||
|
||||
page.Items.Should().HaveCount(2);
|
||||
page.TotalCount.Should().Be(2);
|
||||
page.Items.All(l => l.City == "Austin").Should().BeTrue();
|
||||
page.Items.Select(l => l.Name).Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetLocationDetailAsync_ReturnsMappedDtoOrNull()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedLocation(ctx, "Depot", "Houston");
|
||||
|
||||
var service = NewService(ctx);
|
||||
var found = await service.GetLocationDetailAsync(existing.Id, CancellationToken.None);
|
||||
var missing = await service.GetLocationDetailAsync(existing.Id + 999, CancellationToken.None);
|
||||
|
||||
missing.Should().BeNull();
|
||||
found.Should().NotBeNull();
|
||||
found!.Name.Should().Be("Depot");
|
||||
found.City.Should().Be("Houston");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateLocationFromRequestAsync_UpdatesFieldsAndThrowsWhenMissing()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedLocation(ctx, "Old", "Round Rock");
|
||||
|
||||
await NewService(ctx).UpdateLocationFromRequestAsync(existing.Id, new LocationUpdateRequestDTO
|
||||
{
|
||||
Name = "New",
|
||||
Address = "9 New St",
|
||||
City = "Plano",
|
||||
Status = "Inactive"
|
||||
}, CancellationToken.None);
|
||||
|
||||
var row = ctx.Locations.Single();
|
||||
row.Name.Should().Be("New");
|
||||
row.Address1.Should().Be("9 New St");
|
||||
row.City.Should().Be("Plano");
|
||||
row.Status.Should().Be("Inactive");
|
||||
|
||||
var act = () => NewService(ctx).UpdateLocationFromRequestAsync(existing.Id + 999, new LocationUpdateRequestDTO { Name = "X" }, CancellationToken.None);
|
||||
await act.Should().ThrowAsync<KeyNotFoundException>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteLocationByIdAsync_RemovesAndReturnsFalseWhenMissing()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var existing = SeedLocation(ctx, "Gone", "Cedar Park");
|
||||
|
||||
var removed = await NewService(ctx).DeleteLocationByIdAsync(existing.Id, CancellationToken.None);
|
||||
var again = await NewService(ctx).DeleteLocationByIdAsync(existing.Id, CancellationToken.None);
|
||||
|
||||
removed.Should().BeTrue();
|
||||
again.Should().BeFalse();
|
||||
ctx.Locations.Should().BeEmpty();
|
||||
}
|
||||
}
|
||||
71
Api.SeaHavenIndustries.Tests/SanitizedErrorsTests.cs
Normal file
71
Api.SeaHavenIndustries.Tests/SanitizedErrorsTests.cs
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
using Api.SeaHavenIndustries.Helper;
|
||||
using FluentAssertions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class SanitizedErrorsTests
|
||||
{
|
||||
[Fact]
|
||||
public void Sanitize_ReturnsStableMessageAndNeverExposesExceptionText()
|
||||
{
|
||||
var logger = new Mock<ILogger>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
|
||||
var message = logger.Object.Sanitize(new InvalidOperationException("SUPER-SECRET-internal-detail"));
|
||||
|
||||
message.Should().NotContain("SUPER-SECRET");
|
||||
message.Should().NotContain("internal-detail");
|
||||
message.Should().StartWith("An unexpected error occurred");
|
||||
message.Should().Contain("reference");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Sanitize_UsesProvidedPublicMessageInsteadOfExceptionText()
|
||||
{
|
||||
var logger = new Mock<ILogger>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
|
||||
var message = logger.Object.Sanitize(
|
||||
new InvalidOperationException("SUPER-SECRET-internal-detail"),
|
||||
"Vendor not found");
|
||||
|
||||
message.Should().Contain("Vendor not found");
|
||||
message.Should().NotContain("SUPER-SECRET");
|
||||
message.Should().Contain("reference");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Sanitize_LogsOriginalExceptionAtErrorLevel()
|
||||
{
|
||||
var logger = new Mock<ILogger>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
var exception = new InvalidOperationException("SUPER-SECRET-internal-detail");
|
||||
|
||||
logger.Object.Sanitize(exception);
|
||||
|
||||
logger.Verify(
|
||||
x => x.Log(
|
||||
LogLevel.Error,
|
||||
It.IsAny<EventId>(),
|
||||
It.IsAny<It.IsAnyType>(),
|
||||
It.Is<Exception>(ex => ex == exception),
|
||||
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
|
||||
Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Sanitize_ProducesUniqueCorrelationReferencesAcrossCalls()
|
||||
{
|
||||
var logger = new Mock<ILogger>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
var exception = new InvalidOperationException("detail");
|
||||
|
||||
var first = logger.Object.Sanitize(exception);
|
||||
var second = logger.Object.Sanitize(exception);
|
||||
|
||||
first.Should().NotBe(second);
|
||||
}
|
||||
}
|
||||
281
Api.SeaHavenIndustries.Tests/ServiceBehaviorTests.cs
Normal file
281
Api.SeaHavenIndustries.Tests/ServiceBehaviorTests.cs
Normal file
|
|
@ -0,0 +1,281 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Data.SeaHavenIndustries.Enums;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.Configuration;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using SeaHaven.Services.Validation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
internal static class TestAsyncEnumerableHelper
|
||||
{
|
||||
public static async IAsyncEnumerable<T> ToAsyncEnumerable<T>(this IEnumerable<T> source)
|
||||
{
|
||||
foreach (var item in source)
|
||||
yield return item;
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
public class SyncServiceBehaviorTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task SyncWorkOrders_CreatesNewAndUpdatesExisting()
|
||||
{
|
||||
var data = new Mock<ISyncDataService>();
|
||||
var external = new Mock<ISyncExternalSource>();
|
||||
|
||||
var existingWO = new WorkOrder { Id = 5, ExternalWorkOrderId = "EXT-1", WorkerOrderTitle = "Old" };
|
||||
|
||||
data.Setup(d => d.GetLastInternalWONumberAsync(It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync("10000005");
|
||||
data.Setup(d => d.GetWorkOrderByExternalIdAsync("EXT-1", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(existingWO);
|
||||
data.Setup(d => d.GetWorkOrderByExternalIdAsync("EXT-2", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((WorkOrder?)null);
|
||||
data.Setup(d => d.ResolveLocationAsync(It.IsAny<string?>(), It.IsAny<string?>(), It.IsAny<string?>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((int?)null);
|
||||
data.Setup(d => d.GetLocationCountAsync(It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(3);
|
||||
|
||||
var items = new List<Dictionary<string, string?>>
|
||||
{
|
||||
new() { ["work_order_id"] = "EXT-1", ["description"] = "Updated Title", ["wo_status"] = "in_progress" },
|
||||
new() { ["work_order_id"] = "EXT-2", ["description"] = "New WO", ["wo_status"] = "new", ["severity"] = "3" }
|
||||
};
|
||||
|
||||
external.Setup(e => e.ScanWorkOrdersAsync(It.IsAny<CancellationToken>()))
|
||||
.Returns(items.ToAsyncEnumerable());
|
||||
|
||||
var service = new SyncService(data.Object, external.Object);
|
||||
var result = await service.SyncWorkOrdersAsync(CancellationToken.None);
|
||||
|
||||
Assert.Equal(2, result.Synced);
|
||||
Assert.Equal(1, result.Created);
|
||||
Assert.Equal(1, result.Updated);
|
||||
Assert.Equal(3, result.LocationsCreated);
|
||||
Assert.Equal("Updated Title", existingWO.WorkerOrderTitle);
|
||||
Assert.Equal("In Progress", existingWO.Status);
|
||||
data.Verify(d => d.EnqueueWorkOrder(It.Is<WorkOrder>(w => w.ExternalWorkOrderId == "EXT-2")), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SyncWorkOrders_MapsStatusAndSeverity()
|
||||
{
|
||||
var data = new Mock<ISyncDataService>();
|
||||
var external = new Mock<ISyncExternalSource>();
|
||||
|
||||
data.Setup(d => d.GetLastInternalWONumberAsync(It.IsAny<CancellationToken>())).ReturnsAsync((string?)null);
|
||||
data.Setup(d => d.GetWorkOrderByExternalIdAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync((WorkOrder?)null);
|
||||
data.Setup(d => d.ResolveLocationAsync(It.IsAny<string?>(), It.IsAny<string?>(), It.IsAny<string?>(), It.IsAny<CancellationToken>())).ReturnsAsync((int?)null);
|
||||
data.Setup(d => d.GetLocationCountAsync(It.IsAny<CancellationToken>())).ReturnsAsync(0);
|
||||
|
||||
var items = new List<Dictionary<string, string?>>
|
||||
{
|
||||
new() { ["work_order_id"] = "W1", ["wo_status"] = "completed", ["severity"] = "2" }
|
||||
};
|
||||
external.Setup(e => e.ScanWorkOrdersAsync(It.IsAny<CancellationToken>())).Returns(items.ToAsyncEnumerable());
|
||||
|
||||
await new SyncService(data.Object, external.Object).SyncWorkOrdersAsync(CancellationToken.None);
|
||||
|
||||
data.Verify(d => d.EnqueueWorkOrder(It.Is<WorkOrder>(w => w.Status == "Done" && w.Priority == "Sev 2" && w.Severity == "2")), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task SyncComments_SkipsExistingAndOrphans()
|
||||
{
|
||||
var data = new Mock<ISyncDataService>();
|
||||
var external = new Mock<ISyncExternalSource>();
|
||||
var wo = new WorkOrder { Id = 10, ExternalWorkOrderId = "WO-1" };
|
||||
|
||||
data.Setup(d => d.CommentExistsByExternalIdAsync("C-EXISTS", It.IsAny<CancellationToken>())).ReturnsAsync(true);
|
||||
data.Setup(d => d.CommentExistsByExternalIdAsync("C-NEW", It.IsAny<CancellationToken>())).ReturnsAsync(false);
|
||||
data.Setup(d => d.CommentExistsByExternalIdAsync("C-ORPHAN", It.IsAny<CancellationToken>())).ReturnsAsync(false);
|
||||
data.Setup(d => d.GetWorkOrderByExternalIdAsync("WO-1", It.IsAny<CancellationToken>())).ReturnsAsync(wo);
|
||||
data.Setup(d => d.GetWorkOrderByExternalIdAsync("WO-MISSING", It.IsAny<CancellationToken>())).ReturnsAsync((WorkOrder?)null);
|
||||
|
||||
var items = new List<Dictionary<string, string?>>
|
||||
{
|
||||
new() { ["comment_id"] = "C-EXISTS", ["work_order_id"] = "WO-1" },
|
||||
new() { ["comment_id"] = "C-NEW", ["work_order_id"] = "WO-1", ["text"] = "Hello" },
|
||||
new() { ["comment_id"] = "C-ORPHAN", ["work_order_id"] = "WO-MISSING" }
|
||||
};
|
||||
external.Setup(e => e.ScanCommentsAsync(It.IsAny<CancellationToken>())).Returns(items.ToAsyncEnumerable());
|
||||
|
||||
var result = await new SyncService(data.Object, external.Object).SyncCommentsAsync(CancellationToken.None);
|
||||
|
||||
Assert.Equal(2, result.Synced);
|
||||
Assert.Equal(1, result.Created);
|
||||
Assert.Equal(2, result.Skipped);
|
||||
data.Verify(d => d.EnqueueComment(It.Is<Comments>(c => c.ExternalCommentId == "C-NEW")), Times.Once);
|
||||
}
|
||||
}
|
||||
|
||||
public class WorkOrderDispatchServiceBehaviorTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task VerifyDispatch_ThrowsWhenChecklistIncomplete()
|
||||
{
|
||||
var dispatchData = CreateVerifyDispatchMocks(
|
||||
out var dispatch,
|
||||
incompleteCount: 1,
|
||||
checklistComplete: false,
|
||||
hasCustomerSignoff: true,
|
||||
hasVendorSignoff: true);
|
||||
dispatch.Id = 1;
|
||||
|
||||
var service = CreateDispatchService(dispatchData);
|
||||
var ex = await Assert.ThrowsAsync<DispatchVerificationException>(() => service.VerifyDispatchAsync(1, "user1"));
|
||||
Assert.Contains("1 checklist item(s) incomplete", ex.Missing);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task VerifyDispatch_ThrowsWhenVendorSignoffMissing()
|
||||
{
|
||||
var dispatchData = CreateVerifyDispatchMocks(
|
||||
out var dispatch,
|
||||
incompleteCount: 0,
|
||||
checklistComplete: true,
|
||||
hasCustomerSignoff: true,
|
||||
hasVendorSignoff: false);
|
||||
dispatch.Id = 1;
|
||||
|
||||
var service = CreateDispatchService(dispatchData);
|
||||
var ex = await Assert.ThrowsAsync<DispatchVerificationException>(() => service.VerifyDispatchAsync(1, "user1"));
|
||||
Assert.Contains("Missing Vendor sign-off", ex.Missing);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task VerifyDispatch_SucceedsWhenAllComplete()
|
||||
{
|
||||
var dispatchData = CreateVerifyDispatchMocks(
|
||||
out var dispatch,
|
||||
incompleteCount: 0,
|
||||
checklistComplete: true,
|
||||
hasCustomerSignoff: true,
|
||||
hasVendorSignoff: true);
|
||||
dispatch.Id = 1;
|
||||
|
||||
var userMock = new Mock<IUserDataService>();
|
||||
userMock.Setup(u => u.GetByIdAsync("user1")).ReturnsAsync(new ApplicationUser { FirstName = "Jane", LastName = "Doe" });
|
||||
|
||||
var service = CreateDispatchService(dispatchData, userMock: userMock);
|
||||
var result = await service.VerifyDispatchAsync(1, "user1");
|
||||
|
||||
Assert.NotNull(result);
|
||||
Assert.Equal("Dispatch verified", result!.Message);
|
||||
Assert.Equal("Verified", dispatch.Status);
|
||||
Assert.Equal("Jane Doe", dispatch.VerifiedBy);
|
||||
}
|
||||
|
||||
private static Mock<IDispatchDataService> CreateVerifyDispatchMocks(
|
||||
out Dispatch dispatch,
|
||||
int incompleteCount,
|
||||
bool checklistComplete,
|
||||
bool hasCustomerSignoff,
|
||||
bool hasVendorSignoff)
|
||||
{
|
||||
dispatch = new Dispatch { Id = 1, DispatchNumber = "DSP-00001", WorkOrderId = 10 };
|
||||
var mock = new Mock<IDispatchDataService>();
|
||||
mock.Setup(d => d.GetByIdAsync(1)).ReturnsAsync(dispatch);
|
||||
|
||||
var checklist = checklistComplete
|
||||
? new List<DispatchChecklistItem> { new() { IsCompleted = true } }
|
||||
: new List<DispatchChecklistItem> { new() { IsCompleted = false } };
|
||||
mock.Setup(d => d.GetChecklistItemsAsync(1)).ReturnsAsync(checklist);
|
||||
|
||||
var signoffs = new List<DispatchSignoff>();
|
||||
if (hasCustomerSignoff) signoffs.Add(new DispatchSignoff { SignoffType = "Customer" });
|
||||
if (hasVendorSignoff) signoffs.Add(new DispatchSignoff { SignoffType = "Vendor" });
|
||||
mock.Setup(d => d.GetSignoffsAsync(1)).ReturnsAsync(signoffs);
|
||||
|
||||
return mock;
|
||||
}
|
||||
|
||||
private static WorkOrderDispatchService CreateDispatchService(
|
||||
Mock<IDispatchDataService>? dispatchDataMock = null,
|
||||
Mock<IUserDataService>? userMock = null)
|
||||
{
|
||||
return new WorkOrderDispatchService(
|
||||
Mock.Of<IWorkOrderDataService>(),
|
||||
(dispatchDataMock ?? new Mock<IDispatchDataService>()).Object,
|
||||
Mock.Of<IVendorDataService>(),
|
||||
(userMock ?? new Mock<IUserDataService>()).Object,
|
||||
Mock.Of<ITaskListTemplateDataService>(),
|
||||
Mock.Of<ICommentDataService>(),
|
||||
Mock.Of<IDispatchEmailPort>(),
|
||||
Mock.Of<IVendorTokenPort>(),
|
||||
Microsoft.Extensions.Options.Options.Create(new FrontendOptions()));
|
||||
}
|
||||
}
|
||||
|
||||
public class WorkOrderServiceBehaviorTests
|
||||
{
|
||||
[Fact]
|
||||
public async Task ChangeStatus_AddsAuditWhenStatusDiffers()
|
||||
{
|
||||
var wo = new WorkOrder { Id = 5, Status = "Open" };
|
||||
var woData = new Mock<IWorkOrderDataService>();
|
||||
woData.Setup(d => d.GetByIdAsync(5)).ReturnsAsync(wo);
|
||||
|
||||
var service = CreateWorkOrderService(woData);
|
||||
var result = await service.ChangeStatusAsync(5, "In Progress", "user1");
|
||||
|
||||
Assert.NotNull(result);
|
||||
Assert.Equal("In Progress", wo.Status);
|
||||
woData.Verify(d => d.AddAuditLogAsync(It.Is<WorkOrderAuditLog>(a =>
|
||||
a.FieldName == "Status" && a.OldValue == "Open" && a.NewValue == "In Progress")), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ChangeStatus_DoesNotAuditWhenStatusSame()
|
||||
{
|
||||
var wo = new WorkOrder { Id = 5, Status = "Open" };
|
||||
var woData = new Mock<IWorkOrderDataService>();
|
||||
woData.Setup(d => d.GetByIdAsync(5)).ReturnsAsync(wo);
|
||||
|
||||
await CreateWorkOrderService(woData).ChangeStatusAsync(5, "Open", "user1");
|
||||
|
||||
woData.Verify(d => d.AddAuditLogAsync(It.IsAny<WorkOrderAuditLog>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteWorkOrderCascade_UnlinksQuotesAndDeletesComments()
|
||||
{
|
||||
var woData = new Mock<IWorkOrderDataService>();
|
||||
woData.Setup(d => d.ExistsAsync(5)).ReturnsAsync(true);
|
||||
|
||||
var commentData = new Mock<ICommentDataService>();
|
||||
commentData.Setup(c => c.GetByWorkOrderIdAsync(5))
|
||||
.ReturnsAsync(new List<Comments> { new() { Id = 1 }, new() { Id = 2 } });
|
||||
|
||||
var quotesData = new Mock<IQuotesDataService>();
|
||||
|
||||
var result = await CreateWorkOrderService(woData, commentData, quotesData).DeleteWorkOrderCascadeAsync(5, "user1");
|
||||
|
||||
Assert.True(result);
|
||||
quotesData.Verify(q => q.UnlinkFromWorkOrderAsync(5), Times.Once);
|
||||
commentData.Verify(c => c.DeleteAsync(1), Times.Once);
|
||||
commentData.Verify(c => c.DeleteAsync(2), Times.Once);
|
||||
}
|
||||
|
||||
private static WorkOrderService CreateWorkOrderService(
|
||||
Mock<IWorkOrderDataService>? woData = null,
|
||||
Mock<ICommentDataService>? commentData = null,
|
||||
Mock<IQuotesDataService>? quotesData = null)
|
||||
{
|
||||
return new WorkOrderService(
|
||||
(woData ?? new Mock<IWorkOrderDataService>()).Object,
|
||||
(commentData ?? new Mock<ICommentDataService>()).Object,
|
||||
Mock.Of<IUserDataService>(),
|
||||
(quotesData ?? new Mock<IQuotesDataService>()).Object,
|
||||
Mock.Of<IFileStoragePort>(),
|
||||
Mock.Of<ICreateWorkOrderValidation>(),
|
||||
Mock.Of<IUpdateWorkOrderValidation>());
|
||||
}
|
||||
}
|
||||
75
Api.SeaHavenIndustries.Tests/ServiceRegistrationTests.cs
Normal file
75
Api.SeaHavenIndustries.Tests/ServiceRegistrationTests.cs
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
using System.Reflection;
|
||||
using FluentAssertions;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SeaHaven.DataServices.DependencyInjection;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DependencyInjection;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class ServiceRegistrationTests
|
||||
{
|
||||
private static IServiceCollection BuildConventionServices()
|
||||
{
|
||||
var configuration = new ConfigurationBuilder().Build();
|
||||
var services = new ServiceCollection();
|
||||
services.AddLogging();
|
||||
services.AddSingleton<IConfiguration>(configuration);
|
||||
services.AddDataServices();
|
||||
services.AddBusinessServices(configuration);
|
||||
return services;
|
||||
}
|
||||
|
||||
private static IEnumerable<(Type Implementation, Type Interface)> ConventionCandidates(Assembly assembly)
|
||||
{
|
||||
return assembly.GetTypes()
|
||||
.Where(t => t.IsClass && !t.IsAbstract && !t.IsGenericType)
|
||||
.Select(t => (
|
||||
Implementation: t,
|
||||
Interface: t.GetInterfaces().FirstOrDefault(i => i.Name == $"I{t.Name}")))
|
||||
.Where(pair => pair.Interface is not null)!;
|
||||
}
|
||||
|
||||
private static void AssertScopedConventionRegistrations(
|
||||
IServiceCollection services,
|
||||
IEnumerable<(Type Implementation, Type Interface)> candidates,
|
||||
string assemblyLabel)
|
||||
{
|
||||
var candidateList = candidates.ToList();
|
||||
candidateList.Should().NotBeEmpty(
|
||||
"expected at least one convention candidate in {0}", assemblyLabel);
|
||||
|
||||
var missing = candidateList
|
||||
.Where(pair => !services.Any(d =>
|
||||
d.Lifetime == ServiceLifetime.Scoped &&
|
||||
d.ServiceType == pair.Interface &&
|
||||
d.ImplementationType == pair.Implementation))
|
||||
.ToList();
|
||||
|
||||
missing.Should().BeEmpty(
|
||||
"expected a scoped descriptor mapping each convention candidate interface to its implementation in {0}, missing: {1}",
|
||||
assemblyLabel,
|
||||
string.Join("; ", missing.Select(p => $"{p.Interface!.FullName} -> {p.Implementation.FullName}")));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ConventionDi_RegistersEveryServicesImplementationClassAsScoped()
|
||||
{
|
||||
var services = BuildConventionServices();
|
||||
var candidates = ConventionCandidates(typeof(WorkOrderDispatchService).Assembly);
|
||||
|
||||
AssertScopedConventionRegistrations(services, candidates, "SeaHaven.Services");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ConventionDi_RegistersEveryDataServicesImplementationClassAsScoped()
|
||||
{
|
||||
var services = BuildConventionServices();
|
||||
var candidates = ConventionCandidates(typeof(VendorDataService).Assembly);
|
||||
|
||||
AssertScopedConventionRegistrations(services, candidates, "SeaHaven.DataServices");
|
||||
}
|
||||
}
|
||||
120
Api.SeaHavenIndustries.Tests/SettingsControllerTests.cs
Normal file
120
Api.SeaHavenIndustries.Tests/SettingsControllerTests.cs
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper.ViewModel;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class SettingsControllerTests
|
||||
{
|
||||
private static SettingsController NewController(Mock<ISettingsService> service) =>
|
||||
new(service.Object, Mock.Of<ILogger<SettingsController>>());
|
||||
|
||||
[Fact]
|
||||
public async Task GetCategoryList_ReturnsPaginationEnvelopeWithServiceItems()
|
||||
{
|
||||
var service = new Mock<ISettingsService>();
|
||||
service.Setup(s => s.GetCategoryListAsync(1, 10, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((new List<SettingsCategoryDTO> { new() { Id = 1, Name = "A" } }, 1));
|
||||
|
||||
var result = await NewController(service).GetCategoryList(1, 10, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<Pagination_DTO>().Subject;
|
||||
envelope.TotalCount.Should().Be(1);
|
||||
envelope.TotalPages.Should().Be(1);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetTemplates_ReturnsTypedServiceDtosInEnvelope()
|
||||
{
|
||||
var service = new Mock<ISettingsService>();
|
||||
service.Setup(s => s.GetTemplatesAsync(1, 10, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((new List<SettingsTemplateDTO> { new() { Id = 1, WorkerOrderTitle = "T" } }, 1));
|
||||
|
||||
var result = await NewController(service).GetTemplates(1, 10, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<Pagination_DTO>().Subject;
|
||||
envelope.TotalCount.Should().Be(1);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddCategory_WhenServiceSucceeds_ReturnsSaved()
|
||||
{
|
||||
var service = new Mock<ISettingsService>();
|
||||
var result = await NewController(service).AddCategory(new Category_DTO { Name = "X" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("200");
|
||||
response.Message.Should().Be("Successfully Saved Data");
|
||||
service.Verify(s => s.AddCategoryAsync("X", It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditCategory_WhenMissing_ReturnsBadRequest()
|
||||
{
|
||||
var service = new Mock<ISettingsService>();
|
||||
service.Setup(s => s.UpdateCategoryAsync(9, "X", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var result = await NewController(service).EditCategory(new EditCategory_DTO { Id = 9, Name = "X" }, CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
bad.Value.Should().BeOfType<Response>().Subject.Message.Should().Be("Category not found");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteCategory_WhenMissing_ReturnsIdNotMatched()
|
||||
{
|
||||
var service = new Mock<ISettingsService>();
|
||||
service.Setup(s => s.DeleteCategoryAsync(9, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var result = await NewController(service).DeleteCategory(9, CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
bad.Value.Should().BeOfType<Response>().Subject.Message.Should().Be("ID not matched!");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetUsers_MapsServiceUsersToUserRoleViewModel()
|
||||
{
|
||||
var service = new Mock<ISettingsService>();
|
||||
service.Setup(s => s.GetUsersAsync("", 1, 10, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((new List<SettingsUserDTO>
|
||||
{
|
||||
new() { Id = "u1", UserName = "Sara", Email = "s@x.com", RoleName = "User", Status = "Active", Date = "2026-01-01" }
|
||||
}, 1));
|
||||
|
||||
var result = await NewController(service).GetUsers("", 1, 10, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<Pagination_DTO>().Subject;
|
||||
object data = envelope.Data!;
|
||||
var rows = ((System.Collections.IEnumerable)data).Cast<UserRoleViewModel>().ToList();
|
||||
rows.Should().ContainSingle(u => u.UserName == "Sara" && u.RoleName == "User" && u.Email == "s@x.com");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetRoles_MapsServiceRolesToRolesDto()
|
||||
{
|
||||
var service = new Mock<ISettingsService>();
|
||||
service.Setup(s => s.GetRolesAsync(It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new List<RoleDTO> { new() { Name = "Admin", Description = "Full Access" } });
|
||||
|
||||
var result = await NewController(service).GetRoles(CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var roles = ((System.Collections.IEnumerable)ok.Value!).Cast<Roles_DTO>().ToList();
|
||||
roles.Should().ContainSingle(r => r.Name == "Admin" && r.Description == "Full Access");
|
||||
}
|
||||
}
|
||||
168
Api.SeaHavenIndustries.Tests/SettingsServiceTests.cs
Normal file
168
Api.SeaHavenIndustries.Tests/SettingsServiceTests.cs
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class SettingsServiceTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static SettingsService NewService(ApplicationDbContext ctx) =>
|
||||
new(new SettingsDataService(ctx), null!);
|
||||
|
||||
private static (ApplicationDbContext ctx, UserManager<ApplicationUser> userManager, RoleManager<IdentityRole> roleManager) NewIdentityContext()
|
||||
{
|
||||
var services = new ServiceCollection();
|
||||
services.AddLogging();
|
||||
services.AddDbContext<ApplicationDbContext>(o => o.UseInMemoryDatabase(Guid.NewGuid().ToString()));
|
||||
services.AddIdentity<ApplicationUser, IdentityRole>().AddEntityFrameworkStores<ApplicationDbContext>();
|
||||
var provider = services.BuildServiceProvider();
|
||||
var scope = provider.CreateScope();
|
||||
var ctx = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
|
||||
var userManager = scope.ServiceProvider.GetRequiredService<UserManager<ApplicationUser>>();
|
||||
var roleManager = scope.ServiceProvider.GetRequiredService<RoleManager<IdentityRole>>();
|
||||
return (ctx, userManager, roleManager);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddCategoryAsync_PersistsName()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
await NewService(ctx).AddCategoryAsync("Plumbing", CancellationToken.None);
|
||||
ctx.Categories.Single().Name.Should().Be("Plumbing");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateCategoryAsync_UpdatesNameAndReturnsFalseWhenMissing()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.Categories.Add(new Category { Name = "Old" });
|
||||
ctx.SaveChanges();
|
||||
|
||||
var service = NewService(ctx);
|
||||
(await service.UpdateCategoryAsync(1, "New", CancellationToken.None)).Should().BeTrue();
|
||||
ctx.Categories.Single().Name.Should().Be("New");
|
||||
(await service.UpdateCategoryAsync(999, "X", CancellationToken.None)).Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteCategoryAsync_CascadesTemplatesAndWorkOrderCategories()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.Categories.Add(new Category { Id = 1, Name = "C1" });
|
||||
ctx.Templates.Add(new Template { CategoryId = 1, WorkerOrderTitle = "T" });
|
||||
ctx.workOrderCategories.Add(new WorkOrderCategories { CategoryId = 1 });
|
||||
ctx.SaveChanges();
|
||||
|
||||
var service = NewService(ctx);
|
||||
(await service.DeleteCategoryAsync(1, CancellationToken.None)).Should().BeTrue();
|
||||
(await service.DeleteCategoryAsync(1, CancellationToken.None)).Should().BeFalse();
|
||||
|
||||
ctx.Categories.Should().BeEmpty();
|
||||
ctx.Templates.Should().BeEmpty();
|
||||
ctx.workOrderCategories.Should().BeEmpty();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetCategoryListAsync_MapsToServiceDtoAndPages()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.Categories.Add(new Category { Name = "A" });
|
||||
ctx.Categories.Add(new Category { Name = "B" });
|
||||
ctx.SaveChanges();
|
||||
|
||||
var (items, total) = await NewService(ctx).GetCategoryListAsync(1, 10, CancellationToken.None);
|
||||
|
||||
total.Should().Be(2);
|
||||
items.Should().OnlyContain(c => c is SettingsCategoryDTO);
|
||||
items.Select(c => c.Name).Should().Contain(new[] { "A", "B" });
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetTemplatesAsync_MapsWorkOrderScalarsToTypedDto()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var wo = new WorkOrder
|
||||
{
|
||||
istemplate = true,
|
||||
InternalWONumber = "WO-100",
|
||||
WorkerOrderTitle = "Template A",
|
||||
Status = "Active",
|
||||
Priority = "High",
|
||||
Trade = "HVAC",
|
||||
VendorNTE = 1500m,
|
||||
Customer = "Cust"
|
||||
};
|
||||
ctx.workOrders.Add(wo);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var (items, total) = await NewService(ctx).GetTemplatesAsync(1, 10, CancellationToken.None);
|
||||
|
||||
total.Should().Be(1);
|
||||
var dto = items.Single();
|
||||
dto.Should().BeOfType<SettingsTemplateDTO>();
|
||||
dto.InternalWONumber.Should().Be("WO-100");
|
||||
dto.WorkerOrderTitle.Should().Be("Template A");
|
||||
dto.Status.Should().Be("Active");
|
||||
dto.Priority.Should().Be("High");
|
||||
dto.Trade.Should().Be("HVAC");
|
||||
dto.VendorNTE.Should().Be(1500m);
|
||||
dto.Customer.Should().Be("Cust");
|
||||
dto.istemplate.Should().BeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetUsersAsync_ExcludesAdminsAndResolvesRole()
|
||||
{
|
||||
var (ctx, userManager, roleManager) = NewIdentityContext();
|
||||
var t1 = roleManager.CreateAsync(new IdentityRole("Admin"));
|
||||
var t2 = roleManager.CreateAsync(new IdentityRole("User"));
|
||||
await Task.WhenAll(t1, t2);
|
||||
|
||||
var admin = new ApplicationUser { UserName = "admin1", Email = "a@x.com", FirstName = "Boss" };
|
||||
var worker = new ApplicationUser { UserName = "worker1", Email = "w@x.com", FirstName = "Hand" };
|
||||
await userManager.CreateAsync(admin);
|
||||
await userManager.CreateAsync(worker);
|
||||
await userManager.AddToRoleAsync(admin, "Admin");
|
||||
await userManager.AddToRoleAsync(worker, "User");
|
||||
|
||||
ctx.SaveChanges();
|
||||
|
||||
var service = new SettingsService(new SettingsDataService(ctx), userManager);
|
||||
var (users, total) = await service.GetUsersAsync("", 1, 10, CancellationToken.None);
|
||||
|
||||
total.Should().BeGreaterThanOrEqualTo(2);
|
||||
users.Should().NotContain(u => u.RoleName == "Admin");
|
||||
users.Should().Contain(u => u.UserName == "Hand" && u.RoleName == "User");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetRolesAsync_MapsKnownRoleNamesToDescriptions()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.Roles.Add(new IdentityRole("Admin"));
|
||||
ctx.Roles.Add(new IdentityRole("Manager"));
|
||||
ctx.Roles.Add(new IdentityRole("Unknown"));
|
||||
ctx.SaveChanges();
|
||||
|
||||
var roles = await NewService(ctx).GetRolesAsync(CancellationToken.None);
|
||||
|
||||
var byName = roles.ToDictionary(r => r.Name!, r => r.Description);
|
||||
byName["Admin"].Should().Be("Full Access");
|
||||
byName["Manager"].Should().Be("Full access accept quotes");
|
||||
roles.Should().NotContain(r => r.Name == "Unknown");
|
||||
}
|
||||
}
|
||||
146
Api.SeaHavenIndustries.Tests/TaskListTemplateServiceTests.cs
Normal file
146
Api.SeaHavenIndustries.Tests/TaskListTemplateServiceTests.cs
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class TaskListTemplateServiceTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(databaseName: Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static TaskListTemplateService NewService(ApplicationDbContext ctx) =>
|
||||
new(new TaskListTemplateDataService(ctx));
|
||||
|
||||
private static TaskListTemplate Template(string name, bool active, params (string text, int sort)[] items)
|
||||
{
|
||||
var t = new TaskListTemplate { Name = name, IsActive = active };
|
||||
t.Items = items.Select(i => new TaskListTemplateItem { ItemText = i.text, SortOrder = i.sort }).ToList();
|
||||
return t;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetAllAsync_ReturnsOnlyActiveOrderedByNameWithOrderedItems()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
ctx.TaskListTemplates.AddRange(
|
||||
Template("Zeta", true, ("b", 2), ("a", 1)),
|
||||
Template("Alpha", true, ("first", 0)),
|
||||
Template("Hidden", false)
|
||||
);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var result = (await NewService(ctx).GetAllAsync(CancellationToken.None)).ToList();
|
||||
|
||||
result.Select(t => t.Name).Should().ContainInOrder("Alpha", "Zeta");
|
||||
result.Single(t => t.Name == "Zeta").Items.Select(i => i.ItemText).Should().ContainInOrder("a", "b");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByIdAsync_WhenMissing_ReturnsNull()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewService(ctx).GetByIdAsync(99, CancellationToken.None);
|
||||
result.Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByIdAsync_ReturnsTemplateWithOrderedItems()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var t = Template("Alpha", true, ("b", 2), ("a", 1));
|
||||
ctx.TaskListTemplates.Add(t);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var result = await NewService(ctx).GetByIdAsync(t.Id, CancellationToken.None);
|
||||
|
||||
result.Should().NotBeNull();
|
||||
result!.Items.Select(i => i.ItemText).Should().ContainInOrder("a", "b");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CreateAsync_PersistsTemplateAndItemsAndReturnsId()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var input = new TaskListTemplateInput
|
||||
{
|
||||
Name = "New",
|
||||
Description = "desc",
|
||||
IsActive = true,
|
||||
Items = new()
|
||||
{
|
||||
new() { ItemText = "two", SortOrder = 0 },
|
||||
new() { ItemText = "one", SortOrder = 0 }
|
||||
}
|
||||
};
|
||||
|
||||
var id = await NewService(ctx).CreateAsync(input, CancellationToken.None);
|
||||
|
||||
id.Should().BeGreaterThan(0);
|
||||
var row = ctx.TaskListTemplates.Include(t => t.Items).Single();
|
||||
row.Name.Should().Be("New");
|
||||
row.Items.Should().HaveCount(2);
|
||||
row.Items!.Select(i => i.SortOrder).Should().ContainInOrder(0, 1);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateAsync_WhenNotFound_ReturnsFalse()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewService(ctx).UpdateAsync(404, new TaskListTemplateInput { Name = "x" }, CancellationToken.None);
|
||||
result.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateAsync_ReplacesItems()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var t = Template("Alpha", true, ("old", 0));
|
||||
ctx.TaskListTemplates.Add(t);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var updated = await NewService(ctx).UpdateAsync(t.Id, new TaskListTemplateInput
|
||||
{
|
||||
Name = "Renamed",
|
||||
IsActive = false,
|
||||
Items = new() { new() { ItemText = "new1", SortOrder = 1 }, new() { ItemText = "new2", SortOrder = 2 } }
|
||||
}, CancellationToken.None);
|
||||
|
||||
updated.Should().BeTrue();
|
||||
var row = ctx.TaskListTemplates.Include(x => x.Items).Single();
|
||||
row.Name.Should().Be("Renamed");
|
||||
row.IsActive.Should().BeFalse();
|
||||
row.Items!.Select(i => i.ItemText).Should().BeEquivalentTo(new[] { "new1", "new2" });
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteAsync_SoftDeletesByDeactivating()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var t = Template("Alpha", true);
|
||||
ctx.TaskListTemplates.Add(t);
|
||||
ctx.SaveChanges();
|
||||
|
||||
var result = await NewService(ctx).DeleteAsync(t.Id, CancellationToken.None);
|
||||
|
||||
result.Should().BeTrue();
|
||||
ctx.TaskListTemplates.Single().IsActive.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteAsync_WhenNotFound_ReturnsFalse()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var result = await NewService(ctx).DeleteAsync(404, CancellationToken.None);
|
||||
result.Should().BeFalse();
|
||||
}
|
||||
}
|
||||
213
Api.SeaHavenIndustries.Tests/UpliftControllerTests.cs
Normal file
213
Api.SeaHavenIndustries.Tests/UpliftControllerTests.cs
Normal file
|
|
@ -0,0 +1,213 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class UpliftControllerTests
|
||||
{
|
||||
private static UpliftController NewController(Mock<IUpliftService> service, params string[] roles)
|
||||
{
|
||||
var controller = new UpliftController(service.Object, Mock.Of<ILogger<UpliftController>>());
|
||||
var claims = new List<Claim> { new(ClaimTypes.NameIdentifier, "42") };
|
||||
claims.AddRange(roles.Select(r => new Claim(ClaimTypes.Role, r)));
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
{
|
||||
User = new ClaimsPrincipal(new ClaimsIdentity(claims, "Test"))
|
||||
}
|
||||
};
|
||||
return controller;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task List_ReturnsPagedResult()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
var dto = new UpliftListResultDTO
|
||||
{
|
||||
Total = 1,
|
||||
Page = 1,
|
||||
PageSize = 25,
|
||||
Items = new[] { new UpliftListItemDTO { Id = 5, Status = "Pending" } }
|
||||
};
|
||||
service.Setup(x => x.ListAsync(It.IsAny<ClaimsPrincipal>(), "Pending", null, 1, 25, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(dto);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.List();
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
envelope.Status.Should().Be("Success");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Approve_NotFound_Returns404()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
service.Setup(x => x.ApproveAsync(It.IsAny<ClaimsPrincipal>(), 99, null, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new KeyNotFoundException("not found"));
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Approve(99, null);
|
||||
|
||||
var nf = result.Should().BeOfType<NotFoundObjectResult>().Subject;
|
||||
nf.Value.Should().BeOfType<Response>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Approve_Forbidden_ReturnsSanitized403AndLogsInternally()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
service.Setup(x => x.ApproveAsync(It.IsAny<ClaimsPrincipal>(), 5, null, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new UpliftForbiddenException("SECRET-tier-restriction-detail"));
|
||||
|
||||
var logger = new Mock<ILogger<UpliftController>>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
var controller = new UpliftController(service.Object, logger.Object);
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
{
|
||||
User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, "42") }, "Test"))
|
||||
}
|
||||
};
|
||||
|
||||
var result = await controller.Approve(5, null);
|
||||
|
||||
var status = result.Should().BeOfType<ObjectResult>().Subject;
|
||||
status.StatusCode.Should().Be(403);
|
||||
var response = status.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Message.Should().NotContain("SECRET");
|
||||
response.Message.Should().Contain("reference");
|
||||
logger.Verify(
|
||||
x => x.Log(
|
||||
LogLevel.Error,
|
||||
It.IsAny<EventId>(),
|
||||
It.IsAny<It.IsAnyType>(),
|
||||
It.Is<Exception>(ex => ex.Message.Contains("SECRET")),
|
||||
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
|
||||
Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Approve_ForbiddenTier_Returns403()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
service.Setup(x => x.ApproveAsync(It.IsAny<ClaimsPrincipal>(), 5, null, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new UpliftForbiddenException("requires Tier 2"));
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Approve(5, null);
|
||||
|
||||
var status = result.Should().BeOfType<ObjectResult>().Subject;
|
||||
status.StatusCode.Should().Be(403);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Approve_AlreadyDecided_Returns400()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
service.Setup(x => x.ApproveAsync(It.IsAny<ClaimsPrincipal>(), 5, null, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("already decided"));
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Approve(5, null);
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Approve_Success_ReturnsApprovedResult()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
var approved = new UpliftApproveResultDTO { Id = 5, Status = "Approved", NTEAmount = 750m };
|
||||
service.Setup(x => x.ApproveAsync(It.IsAny<ClaimsPrincipal>(), 5, "ok", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(approved);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Approve(5, new UpliftController.DecisionRequest { Note = "ok" });
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
var approveData = envelope.Data as UpliftApproveResultDTO;
|
||||
approveData.Should().Be(approved);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Deny_WithoutNote_Returns400()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
service.Setup(x => x.DenyAsync(It.IsAny<ClaimsPrincipal>(), 5, null, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("A note is required when denying"));
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Deny(5, null);
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Deny_Success_ReturnsDeniedResult()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
var denied = new UpliftDenyResultDTO { Id = 5, Status = "Denied" };
|
||||
service.Setup(x => x.DenyAsync(It.IsAny<ClaimsPrincipal>(), 5, "too high", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(denied);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Deny(5, new UpliftController.DecisionRequest { Note = "too high" });
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
service.Verify(x => x.DenyAsync(It.IsAny<ClaimsPrincipal>(), 5, "too high", It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CanApprove_DelegatesToService()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
service.Setup(x => x.CanApprove(It.IsAny<ClaimsPrincipal>(), 2))
|
||||
.Returns(true);
|
||||
|
||||
var controller = NewController(service, "Manager");
|
||||
|
||||
var result = controller.CanApprove(2);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
service.Verify(x => x.CanApprove(It.Is<ClaimsPrincipal>(p => p.IsInRole("Manager")), 2), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ListForDispatch_ReturnsItems()
|
||||
{
|
||||
var service = new Mock<IUpliftService>();
|
||||
var items = new[] { new UpliftForDispatchDTO { Id = 1, DispatchId = 10 } };
|
||||
service.Setup(x => x.ListForDispatchAsync(It.IsAny<ClaimsPrincipal>(), 10, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(items);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.ListForDispatch(10);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
envelope.Status.Should().Be("Success");
|
||||
}
|
||||
}
|
||||
191
Api.SeaHavenIndustries.Tests/UserControllerTests.cs
Normal file
191
Api.SeaHavenIndustries.Tests/UserControllerTests.cs
Normal file
|
|
@ -0,0 +1,191 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
using System.Text.Json;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class UserControllerTests
|
||||
{
|
||||
private static string Json(object? value) =>
|
||||
JsonSerializer.Serialize(value, value?.GetType() ?? typeof(object));
|
||||
|
||||
private static UserController NewController(Mock<IUserService> service, string? userId = null)
|
||||
{
|
||||
var controller = new UserController(service.Object, Mock.Of<ILogger<UserController>>());
|
||||
if (userId != null)
|
||||
{
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
{
|
||||
User = new ClaimsPrincipal(new ClaimsIdentity(new[]
|
||||
{
|
||||
new Claim(ClaimTypes.NameIdentifier, userId)
|
||||
}, "Test"))
|
||||
}
|
||||
};
|
||||
}
|
||||
return controller;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetUsers_ReturnsServiceList()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.GetUsersAsync(It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new List<UserListRowDTO>
|
||||
{
|
||||
new() { Id = "1", Name = "A", Email = "a@x.com", RoleName = "Admin", Status = "Active", Date = "Jan 01 2026" }
|
||||
});
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.GetUsers(CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().BeAssignableTo<IEnumerable<UserListRowDTO>>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddUser_Success_ReturnsUpdatedSuccessfully()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.AddUserAsync(It.IsAny<AddUserRequestDTO>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new AddUserOutcomeDTO { Success = true });
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.AddUser(new User_DTO { Name = "N", Email = "n@x.com", Role = "Admin" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var response = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
response.Status.Should().Be("200");
|
||||
response.Message.Should().Be("Updated Successfully");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddUser_Failure_ReturnsBadRequestWithServiceError()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.AddUserAsync(It.IsAny<AddUserRequestDTO>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new AddUserOutcomeDTO { Success = false, Error = "boom" });
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.AddUser(new User_DTO(), CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Status.Should().Be("Error");
|
||||
response.Message.Should().Be("boom");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditUser_NotFound_ReturnsUserNotFoundMessage()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.EditUserAsync(It.IsAny<EditUserRequestDTO>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.EditUser(new EditUser_DTO { Id = "9" }, CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Message.Should().Be("User not found");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditUser_Found_ReturnsUpdatedSuccessfully()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.EditUserAsync(It.IsAny<EditUserRequestDTO>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(true);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.EditUser(new EditUser_DTO { Id = "9" }, CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().BeOfType<DataResponse>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteUser_NotFound_ReturnsIdNotMatchedMessage()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.DeleteUserAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.DeleteUser(new EditUser_DTO { Id = "missing" }, CancellationToken.None);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var response = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
response.Message.Should().Be("ID not matched!");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteUser_Found_DelegatesAndReturnsOk()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.DeleteUserAsync("5", It.IsAny<CancellationToken>())).ReturnsAsync(true);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.DeleteUser(new EditUser_DTO { Id = "5" }, CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<OkObjectResult>();
|
||||
service.Verify(s => s.DeleteUserAsync("5", It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteCurrentUser_UsesClaimUserId()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.DeleteCurrentUserAsync("77", It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
|
||||
|
||||
var controller = NewController(service, "77");
|
||||
|
||||
var result = await controller.DeleteCurrentUser(CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().BeOfType<DataResponse>();
|
||||
service.Verify(s => s.DeleteCurrentUserAsync("77", It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UserProfile_PreservesLowercaseAddedDateKey()
|
||||
{
|
||||
var service = new Mock<IUserService>();
|
||||
service.Setup(s => s.GetUserProfileAsync("77", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new List<UserProfileRowDTO>
|
||||
{
|
||||
new() { Id = "77", Name = "Me", AddedDate = new DateTime(2026, 1, 1), Email = "me@x.com", Contact = "321" }
|
||||
});
|
||||
|
||||
var controller = NewController(service, "77");
|
||||
|
||||
var result = await controller.UserProfile(CancellationToken.None);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var json = Json(ok.Value);
|
||||
json.Should().Contain("\"Id\":\"77\"");
|
||||
json.Should().Contain("\"Name\":\"Me\"");
|
||||
json.Should().Contain("\"addeddate\":\"");
|
||||
json.Should().Contain("\"Email\":\"me@x.com\"");
|
||||
json.Should().Contain("\"Contact\":\"321\"");
|
||||
}
|
||||
}
|
||||
195
Api.SeaHavenIndustries.Tests/UserServiceTests.cs
Normal file
195
Api.SeaHavenIndustries.Tests/UserServiceTests.cs
Normal file
|
|
@ -0,0 +1,195 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Dto;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class UserServiceTests
|
||||
{
|
||||
private static UserService NewService(
|
||||
Mock<IUserDataService> userData,
|
||||
Mock<IEmailSender> email,
|
||||
out Mock<IUserRoleStore<ApplicationUser>> store)
|
||||
{
|
||||
var (manager, s, _) = IdentityTestHelpers.CreateUserManager();
|
||||
store = s;
|
||||
return new UserService(manager, userData.Object, email.Object);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetUsers_FormatsCreatedDate_AndHandlesNullDate()
|
||||
{
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetAllForListAsync(It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(new List<UserListRowData>
|
||||
{
|
||||
new() { Id = "1", Name = "A", Email = "a@x.com", RoleName = "Admin", Status = "Active", CreatedDate = new DateTime(2026, 1, 5) },
|
||||
new() { Id = "2", Name = "B", Email = "b@x.com", RoleName = "Tech", Status = "Active", CreatedDate = null }
|
||||
});
|
||||
|
||||
var service = NewService(userData, new Mock<IEmailSender>(), out _);
|
||||
|
||||
var users = (await service.GetUsersAsync(CancellationToken.None)).ToList();
|
||||
|
||||
users.Should().HaveCount(2);
|
||||
users[0].Date.Should().Be("Jan 05 2026");
|
||||
users[0].RoleName.Should().Be("Admin");
|
||||
users[0].Status.Should().Be("Active");
|
||||
users[1].Date.Should().Be("");
|
||||
users[1].Name.Should().Be("B");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteUser_NotFound_ReturnsFalseWithoutCascade()
|
||||
{
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetForEditAsync("missing", It.IsAny<CancellationToken>())).ReturnsAsync((ApplicationUser?)null);
|
||||
|
||||
var service = NewService(userData, new Mock<IEmailSender>(), out _);
|
||||
|
||||
var found = await service.DeleteUserAsync("missing", CancellationToken.None);
|
||||
|
||||
found.Should().BeFalse();
|
||||
userData.Verify(u => u.DeleteUserWithCascadeAsync(It.IsAny<ApplicationUser>(), It.IsAny<CancellationToken>()), Times.Never);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteUser_Found_PerformsCascade()
|
||||
{
|
||||
var user = IdentityTestHelpers.User();
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetForEditAsync("u1", It.IsAny<CancellationToken>())).ReturnsAsync(user);
|
||||
|
||||
var service = NewService(userData, new Mock<IEmailSender>(), out _);
|
||||
|
||||
var found = await service.DeleteUserAsync("u1", CancellationToken.None);
|
||||
|
||||
found.Should().BeTrue();
|
||||
userData.Verify(u => u.DeleteUserWithCascadeAsync(user, It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task DeleteCurrentUser_SetsIsDeletedFlag()
|
||||
{
|
||||
var user = IdentityTestHelpers.User();
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetForEditAsync("u1", It.IsAny<CancellationToken>())).ReturnsAsync(user);
|
||||
|
||||
var service = NewService(userData, new Mock<IEmailSender>(), out _);
|
||||
|
||||
await service.DeleteCurrentUserAsync("u1", CancellationToken.None);
|
||||
|
||||
user.IsDeleted.Should().BeTrue();
|
||||
userData.Verify(u => u.UpdateUserAsync(user, It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task EditUser_NotFound_ReturnsFalse()
|
||||
{
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetForEditAsync("x", It.IsAny<CancellationToken>())).ReturnsAsync((ApplicationUser?)null);
|
||||
|
||||
var service = NewService(userData, new Mock<IEmailSender>(), out _);
|
||||
|
||||
var succeeded = await service.EditUserAsync(new EditUserRequestDTO { Id = "x", Email = "e@x.com", Name = "n", Role = "Admin" }, CancellationToken.None);
|
||||
|
||||
succeeded.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetUserProfile_MapsCreatedDateToAddedDate()
|
||||
{
|
||||
var user = new UserProfileData
|
||||
{
|
||||
Id = "u1",
|
||||
FirstName = "Alice",
|
||||
CreatedDate = new DateTime(2026, 3, 4)
|
||||
};
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetProfileAsync("u1", It.IsAny<CancellationToken>())).ReturnsAsync(user);
|
||||
|
||||
var service = NewService(userData, new Mock<IEmailSender>(), out _);
|
||||
|
||||
var rows = await service.GetUserProfileAsync("u1", CancellationToken.None);
|
||||
|
||||
rows.Should().HaveCount(1);
|
||||
rows[0].AddedDate.Should().Be(new DateTime(2026, 3, 4));
|
||||
rows[0].Name.Should().Be("Alice");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddUser_CreateSuccess_PersistsRoleAndEmailsLoginInformation()
|
||||
{
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetByIdAsync(It.IsAny<string>())).ReturnsAsync((ApplicationUser?)null);
|
||||
var email = new Mock<IEmailSender>();
|
||||
|
||||
var service = NewService(userData, email, out var store);
|
||||
store.As<IUserPasswordStore<ApplicationUser>>()
|
||||
.Setup(s => s.SetPasswordHashAsync(It.IsAny<ApplicationUser>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(Task.CompletedTask);
|
||||
store.Setup(s => s.CreateAsync(It.IsAny<ApplicationUser>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(IdentityResult.Success);
|
||||
store.Setup(s => s.AddToRoleAsync(It.IsAny<ApplicationUser>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(Task.CompletedTask);
|
||||
|
||||
var outcome = await service.AddUserAsync(new AddUserRequestDTO { Name = "N", Email = "n@x.com", Role = "Admin" }, CancellationToken.None);
|
||||
|
||||
outcome.Success.Should().BeTrue();
|
||||
store.Verify(s => s.CreateAsync(It.IsAny<ApplicationUser>(), It.IsAny<CancellationToken>()), Times.Once);
|
||||
store.Verify(s => s.AddToRoleAsync(It.IsAny<ApplicationUser>(), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Once);
|
||||
email.Verify(
|
||||
e => e.SendEmailAsync(
|
||||
"n@x.com",
|
||||
"Login Information",
|
||||
It.Is<string>(body => ContainsStrongGeneratedPassword(body))),
|
||||
Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddUser_CreateFails_ReturnsFirstError()
|
||||
{
|
||||
var userData = new Mock<IUserDataService>();
|
||||
userData.Setup(u => u.GetByIdAsync(It.IsAny<string>())).ReturnsAsync((ApplicationUser?)null);
|
||||
|
||||
var service = NewService(userData, new Mock<IEmailSender>(), out var store);
|
||||
store.As<IUserPasswordStore<ApplicationUser>>()
|
||||
.Setup(s => s.SetPasswordHashAsync(It.IsAny<ApplicationUser>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(Task.CompletedTask);
|
||||
store.Setup(s => s.CreateAsync(It.IsAny<ApplicationUser>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(IdentityResult.Failed(new IdentityError { Description = "duplicate" }));
|
||||
|
||||
var outcome = await service.AddUserAsync(new AddUserRequestDTO { Name = "N", Email = "n@x.com", Role = "Admin" }, CancellationToken.None);
|
||||
|
||||
outcome.Success.Should().BeFalse();
|
||||
outcome.Error.Should().Be("duplicate");
|
||||
}
|
||||
|
||||
private static bool ContainsStrongGeneratedPassword(string body)
|
||||
{
|
||||
const string marker = "Your password is: ";
|
||||
var start = body.IndexOf(marker, StringComparison.Ordinal);
|
||||
if (start < 0)
|
||||
return false;
|
||||
|
||||
var password = body[(start + marker.Length)..]
|
||||
.Split('\n', StringSplitOptions.RemoveEmptyEntries)
|
||||
.FirstOrDefault();
|
||||
|
||||
return password is
|
||||
{
|
||||
Length: 8
|
||||
}
|
||||
&& password.Any(char.IsUpper)
|
||||
&& password.Any(char.IsLower)
|
||||
&& password.Any(char.IsDigit)
|
||||
&& password.Any(character => !char.IsLetterOrDigit(character));
|
||||
}
|
||||
}
|
||||
|
|
@ -4,12 +4,11 @@ using Data.SeaHavenIndustries;
|
|||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
using System.Text.Json;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
|
@ -18,12 +17,7 @@ public class VendorControllerTests
|
|||
{
|
||||
private static VendorController NewController(Mock<IVendorService> service)
|
||||
{
|
||||
var controller = new VendorController(
|
||||
service.Object,
|
||||
db: null!,
|
||||
zipDistance: null!,
|
||||
vendorTokens: null!,
|
||||
config: null!);
|
||||
var controller = new VendorController(service.Object, Mock.Of<ILogger<VendorController>>());
|
||||
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
|
|
@ -108,62 +102,216 @@ public class VendorControllerTests
|
|||
"42"), Times.Once);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(true, "Active Co", "Inactive Co")]
|
||||
[InlineData(false, "Inactive Co", "Active Co")]
|
||||
public async Task GetFacets_WithStatus_ReturnsOnlyMatchingVendors(
|
||||
bool isActive,
|
||||
string expected,
|
||||
string excluded)
|
||||
[Fact]
|
||||
public async Task GetFacets_DelegatesToServiceAndReturnsOk()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
await using var context = new ApplicationDbContext(options);
|
||||
context.Vendors.AddRange(
|
||||
new Vendor { CompanyName = "Active Co", IsActive = true, IsDeleted = false },
|
||||
new Vendor { CompanyName = "Inactive Co", IsActive = false, IsDeleted = false });
|
||||
await context.SaveChangesAsync();
|
||||
var service = new Mock<IVendorService>();
|
||||
var facets = new VendorFacetsDTO
|
||||
{
|
||||
Companies = new[] { new VendorFacetCompanyDTO { Name = "Active Co" } },
|
||||
Trades = new[] { "Plumbing" },
|
||||
Locations = new[] { new VendorFacetLocationDTO { Label = "Chicago, IL" } },
|
||||
JobBuckets = new[] { new VendorJobBucketDTO { Id = "under-50", Label = "Under 50" } }
|
||||
};
|
||||
service.Setup(x => x.GetFacetsAsync(true, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(facets);
|
||||
|
||||
var controller = new VendorController(
|
||||
Mock.Of<IVendorService>(),
|
||||
context,
|
||||
zipDistance: null!,
|
||||
vendorTokens: null!,
|
||||
config: null!);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.GetFacets(isActive);
|
||||
var payload = JsonSerializer.Serialize(
|
||||
result.Should().BeOfType<OkObjectResult>().Subject.Value);
|
||||
var result = await controller.GetFacets(true);
|
||||
|
||||
payload.Should().Contain(expected);
|
||||
payload.Should().NotContain(excluded);
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().Be(facets);
|
||||
service.Verify(x => x.GetFacetsAsync(true, It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetFacets_WithoutStatus_PreservesGlobalFacetLookup()
|
||||
public async Task GetDropdown_DelegatesToServiceAndReturnsOk()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
await using var context = new ApplicationDbContext(options);
|
||||
context.Vendors.AddRange(
|
||||
new Vendor { CompanyName = "Active Co", IsActive = true, IsDeleted = false },
|
||||
new Vendor { CompanyName = "Inactive Co", IsActive = false, IsDeleted = false });
|
||||
await context.SaveChangesAsync();
|
||||
var service = new Mock<IVendorService>();
|
||||
var items = new[]
|
||||
{
|
||||
new VendorDropdownItemDTO { Id = 1, CompanyName = "Vendor A", DistanceMiles = 5.2 }
|
||||
};
|
||||
service.Setup(x => x.GetDropdownAsync("Plumbing", "60601", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(items);
|
||||
|
||||
var controller = new VendorController(
|
||||
Mock.Of<IVendorService>(),
|
||||
context,
|
||||
zipDistance: null!,
|
||||
vendorTokens: null!,
|
||||
config: null!);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.GetFacets();
|
||||
var payload = JsonSerializer.Serialize(
|
||||
result.Should().BeOfType<OkObjectResult>().Subject.Value);
|
||||
var result = await controller.GetDropdown("Plumbing", "60601");
|
||||
|
||||
payload.Should().Contain("Active Co");
|
||||
payload.Should().Contain("Inactive Co");
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().Be(items);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetPortalToken_ReturnsTokenDtoFromService()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
var token = new VendorPortalTokenDTO { Token = "abc", PortalUrl = "https://example.com/v/abc/dashboard" };
|
||||
service.Setup(x => x.GetPortalTokenAsync(5, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(token);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.GetPortalToken(5);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().Be(token);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetPortalToken_ReturnsNotFound_WhenVendorDoesNotExist()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
service.Setup(x => x.GetPortalTokenAsync(99, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((VendorPortalTokenDTO?)null);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.GetPortalToken(99);
|
||||
|
||||
result.Should().BeOfType<NotFoundResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RotatePortalToken_ReturnsRotatedToken()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
var token = new VendorPortalTokenDTO { Token = "new-token" };
|
||||
service.Setup(x => x.RotatePortalTokenAsync(5, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(token);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.RotatePortalToken(5);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().Be(token);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RevokePortalToken_ReturnsRevokedTrue_OnSuccess()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
service.Setup(x => x.RevokePortalTokenAsync(5, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(true);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.RevokePortalToken(5);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.Value.Should().NotBeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RevokePortalToken_ReturnsNotFound_WhenVendorDoesNotExist()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
service.Setup(x => x.RevokePortalTokenAsync(99, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(false);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.RevokePortalToken(99);
|
||||
|
||||
result.Should().BeOfType<NotFoundResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Delete_WhenDeactivationBlocked_ReturnsSanitizedConflictWithOpenWorkOrdersAndLogs()
|
||||
{
|
||||
var openWorkOrders = new List<LinkedWorkOrderDTO> { new() { WorkOrderId = 7 } };
|
||||
var service = new Mock<IVendorService>();
|
||||
service.Setup(x => x.DeleteVendorAsync(It.IsAny<int>(), It.IsAny<string>()))
|
||||
.ThrowsAsync(new VendorDeactivationBlockedException("SECRET-internal-reason", openWorkOrders));
|
||||
|
||||
var logger = new Mock<ILogger<VendorController>>();
|
||||
logger.Setup(x => x.IsEnabled(It.IsAny<LogLevel>())).Returns(true);
|
||||
var controller = new VendorController(service.Object, logger.Object);
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
{
|
||||
User = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.NameIdentifier, "42") }, "Test"))
|
||||
}
|
||||
};
|
||||
|
||||
var result = await controller.Delete(5);
|
||||
|
||||
var conflict = result.Should().BeOfType<ConflictObjectResult>().Subject;
|
||||
var value = conflict.Value!;
|
||||
var message = (string)value.GetType().GetProperty("Message")!.GetValue(value)!;
|
||||
message.Should().NotContain("SECRET");
|
||||
message.Should().Contain("reference");
|
||||
var returnedOpenWorkOrders = (List<LinkedWorkOrderDTO>)value.GetType().GetProperty("OpenWorkOrders")!.GetValue(value)!;
|
||||
returnedOpenWorkOrders.Should().HaveCount(1);
|
||||
logger.Verify(
|
||||
x => x.Log(
|
||||
LogLevel.Error,
|
||||
It.IsAny<EventId>(),
|
||||
It.IsAny<It.IsAnyType>(),
|
||||
It.Is<Exception>(ex => ex.Message.Contains("SECRET")),
|
||||
It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
|
||||
Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Delete_MapsDeactivationBlocked_ToConflict()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
service.Setup(x => x.DeleteVendorAsync(It.IsAny<int>(), It.IsAny<string>()))
|
||||
.ThrowsAsync(new VendorDeactivationBlockedException("blocked", new List<LinkedWorkOrderDTO>()));
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Delete(5);
|
||||
|
||||
result.Should().BeOfType<ConflictObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Delete_MapsNotFoundInvalidOperation_ToNotFound()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
service.Setup(x => x.DeleteVendorAsync(It.IsAny<int>(), It.IsAny<string>()))
|
||||
.ThrowsAsync(new InvalidOperationException());
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Delete(5);
|
||||
|
||||
var nf = result.Should().BeOfType<NotFoundObjectResult>().Subject;
|
||||
nf.Value.Should().BeOfType<Response>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetVendorById_ReturnsNotFound_WhenVendorIsNull()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
service.Setup(x => x.GetVendorByIdAsync(99))
|
||||
.ReturnsAsync((VendorDTO?)null);
|
||||
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.GetVendorById(99, null);
|
||||
|
||||
result.Should().BeOfType<NotFoundObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Update_UnauthenticatedUser_ReturnsUnauthorized()
|
||||
{
|
||||
var service = new Mock<IVendorService>();
|
||||
var controller = new VendorController(service.Object, Mock.Of<ILogger<VendorController>>());
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext { User = new ClaimsPrincipal() }
|
||||
};
|
||||
|
||||
var result = await controller.Update(5, new EditVendor_DTO { Id = 5, CompanyName = "X" });
|
||||
|
||||
result.Should().BeOfType<UnauthorizedObjectResult>();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ using Microsoft.AspNetCore.Http;
|
|||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
|
@ -23,10 +25,9 @@ public class VendorOperationsControllerTests
|
|||
|
||||
private static VendorOperationsController NewController(ApplicationDbContext context)
|
||||
{
|
||||
var controller = new VendorOperationsController(
|
||||
context,
|
||||
new DispatchDataService(context),
|
||||
TimeProvider.System);
|
||||
var dataService = new VendorOperationsDataService(context, new DispatchDataService(context));
|
||||
var service = new VendorOperationsService(dataService, TimeProvider.System);
|
||||
var controller = new VendorOperationsController(service);
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext
|
||||
|
|
@ -53,7 +54,7 @@ public class VendorOperationsControllerTests
|
|||
});
|
||||
await context.SaveChangesAsync();
|
||||
|
||||
var result = await NewController(context).GetNotifications();
|
||||
var result = await NewController(context).GetNotifications(CancellationToken.None);
|
||||
|
||||
var value = ((OkObjectResult)result).Value!;
|
||||
var items = ((IEnumerable)Prop(value, "Items")).Cast<object>().ToList();
|
||||
|
|
@ -83,7 +84,7 @@ public class VendorOperationsControllerTests
|
|||
});
|
||||
await context.SaveChangesAsync();
|
||||
|
||||
var result = await NewController(context).GetNotifications();
|
||||
var result = await NewController(context).GetNotifications(CancellationToken.None);
|
||||
|
||||
var items = ((IEnumerable)Prop(((OkObjectResult)result).Value!, "Items")).Cast<object>();
|
||||
items.Should().BeEmpty();
|
||||
|
|
@ -132,7 +133,8 @@ public class VendorOperationsControllerTests
|
|||
DateTime.UtcNow.AddHours(2),
|
||||
DateTime.UtcNow.AddHours(4),
|
||||
site.Id,
|
||||
"HVAC");
|
||||
"HVAC",
|
||||
CancellationToken.None);
|
||||
|
||||
var rows = ((IEnumerable)Prop(((OkObjectResult)result).Value!, "Data")).Cast<object>().ToList();
|
||||
Prop(rows[0], "CompanyName").Should().Be("Preferred");
|
||||
|
|
@ -151,10 +153,11 @@ public class VendorOperationsControllerTests
|
|||
await context.SaveChangesAsync();
|
||||
|
||||
var result = await NewController(context).ReplaceSitePreferences(site.Id,
|
||||
new List<VendorOperationsController.SitePreferenceRequest>
|
||||
new List<SitePreferenceRequest>
|
||||
{
|
||||
new() { VendorId = inactive.Id }
|
||||
});
|
||||
},
|
||||
CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
context.SitePreferredVendors.Should().BeEmpty();
|
||||
|
|
@ -181,8 +184,8 @@ public class VendorOperationsControllerTests
|
|||
await context.SaveChangesAsync();
|
||||
var controller = NewController(context);
|
||||
|
||||
var csv = (FileContentResult)await controller.ExportInsightsCsv(null, null, null, null, null);
|
||||
var pdf = (FileContentResult)await controller.ExportInsightsPdf(null, null, null, null, null);
|
||||
var csv = (FileContentResult)await controller.ExportInsightsCsv(null, null, null, null, null, CancellationToken.None);
|
||||
var pdf = (FileContentResult)await controller.ExportInsightsPdf(null, null, null, null, null, CancellationToken.None);
|
||||
|
||||
csv.ContentType.Should().Be("text/csv");
|
||||
var csvText = System.Text.Encoding.UTF8.GetString(csv.FileContents);
|
||||
|
|
@ -203,7 +206,8 @@ public class VendorOperationsControllerTests
|
|||
|
||||
var result = await NewController(context).AssignVendor(
|
||||
workOrder.Id,
|
||||
new VendorOperationsController.VendorAssignmentRequest { VendorId = vendor.Id });
|
||||
new VendorAssignmentRequest { VendorId = vendor.Id },
|
||||
CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
context.Dispatches.Should().BeEmpty();
|
||||
|
|
@ -247,14 +251,15 @@ public class VendorOperationsControllerTests
|
|||
|
||||
var result = await NewController(context).AssignVendor(
|
||||
assignedWorkOrder.Id,
|
||||
new VendorOperationsController.VendorAssignmentRequest
|
||||
new VendorAssignmentRequest
|
||||
{
|
||||
VendorId = vendor.Id,
|
||||
ScheduledStart = assignedWorkOrder.ScheduledStart,
|
||||
ScheduledEnd = assignedWorkOrder.ScheduledEnd,
|
||||
EstimatedArrivalAt = eta,
|
||||
EtaManualOverride = true
|
||||
});
|
||||
},
|
||||
CancellationToken.None);
|
||||
|
||||
var value = ((OkObjectResult)result).Value!;
|
||||
Prop(value, "AvailabilityStatus").Should().Be("Unavailable");
|
||||
|
|
@ -299,12 +304,13 @@ public class VendorOperationsControllerTests
|
|||
|
||||
var result = await NewController(context).AssignVendor(
|
||||
workOrder.Id,
|
||||
new VendorOperationsController.VendorAssignmentRequest
|
||||
new VendorAssignmentRequest
|
||||
{
|
||||
VendorId = replacementVendor.Id,
|
||||
ScheduledStart = workOrder.ScheduledStart,
|
||||
ScheduledEnd = workOrder.ScheduledEnd
|
||||
});
|
||||
},
|
||||
CancellationToken.None);
|
||||
|
||||
result.Should().BeOfType<OkObjectResult>();
|
||||
context.Dispatches.Should().ContainSingle();
|
||||
|
|
|
|||
317
Api.SeaHavenIndustries.Tests/VendorPortalControllerTests.cs
Normal file
317
Api.SeaHavenIndustries.Tests/VendorPortalControllerTests.cs
Normal file
|
|
@ -0,0 +1,317 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Moq;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class VendorPortalControllerTests
|
||||
{
|
||||
private static VendorPortalController NewController(Mock<IVendorPortalService> service, string? token = "valid-token")
|
||||
{
|
||||
var controller = new VendorPortalController(service.Object, Mock.Of<ILogger<VendorPortalController>>());
|
||||
var context = new DefaultHttpContext();
|
||||
if (token != null)
|
||||
context.Request.Headers["X-Vendor-Token"] = token;
|
||||
controller.ControllerContext = new ControllerContext { HttpContext = context };
|
||||
return controller;
|
||||
}
|
||||
|
||||
private static readonly VendorPortalSession Session = new()
|
||||
{
|
||||
Id = 1,
|
||||
CompanyName = "Test Co",
|
||||
ContactName = "Sam",
|
||||
Email = "sam@test.co",
|
||||
Phone = "555-0100"
|
||||
};
|
||||
|
||||
[Fact]
|
||||
public async Task Session_MissingToken_ReturnsUnauthorized()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
var controller = NewController(service, token: null);
|
||||
|
||||
var result = await controller.Session();
|
||||
|
||||
result.Should().BeOfType<UnauthorizedObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Session_InvalidToken_ReturnsUnauthorized()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync("bad", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((VendorPortalSession?)null);
|
||||
var controller = NewController(service, token: "bad");
|
||||
|
||||
var result = await controller.Session();
|
||||
|
||||
result.Should().BeOfType<UnauthorizedObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Session_ValidToken_ReturnsSessionData()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync("valid-token", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Session();
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
envelope.Status.Should().Be("Success");
|
||||
var sessionData = envelope.Data as VendorPortalSession;
|
||||
sessionData.Should().Be(Session);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ListDispatches_DelegatesToServiceWithStatus()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
var dispatches = new[] { new VendorDispatchSummaryDTO { Id = 10, Status = "Sent" } };
|
||||
service.Setup(x => x.ListDispatchesAsync(Session, "Sent", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(dispatches);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.ListDispatches("Sent");
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
service.Verify(x => x.ListDispatchesAsync(Session, "Sent", It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetDispatch_NotFound_Returns404()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.GetDispatchDetailAsync(Session, 99, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync((VendorDispatchDetailDTO?)null);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.GetDispatch(99);
|
||||
|
||||
result.Should().BeOfType<NotFoundObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Accept_KeyNotFound_Returns404()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.AcceptDispatchAsync(Session, 99, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new KeyNotFoundException());
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Accept(99);
|
||||
|
||||
result.Should().BeOfType<NotFoundObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Accept_InvalidOperation_Returns400()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.AcceptDispatchAsync(Session, 10, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("Cannot accept"));
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Accept(10);
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var resp = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
resp.Message.Should().NotContain("Cannot accept");
|
||||
resp.Message.Should().Contain("reference");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Accept_Success_ReturnsAcknowledgedResult()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
var acceptResult = new AcceptDispatchResultDTO { Id = 10, Status = "Acknowledged" };
|
||||
service.Setup(x => x.AcceptDispatchAsync(Session, 10, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(acceptResult);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.Accept(10);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
var acceptData = envelope.Data as AcceptDispatchResultDTO;
|
||||
acceptData.Should().Be(acceptResult);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ChangeStatus_ForbiddenTransition_Returns400()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.ChangeStatusAsync(Session, 10, "Completed", It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("Transition not allowed"));
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.ChangeStatus(10, new VendorPortalController.ChangeStatusRequest { Status = "Completed" });
|
||||
|
||||
var bad = result.Should().BeOfType<BadRequestObjectResult>().Subject;
|
||||
var resp = bad.Value.Should().BeOfType<Response>().Subject;
|
||||
resp.Message.Should().NotContain("Transition");
|
||||
resp.Message.Should().Contain("reference");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RequestCancel_Success_ReturnsSuccessWithMessage()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.RequestCancel(10, new VendorPortalController.RequestCancelRequest { Reason = "Parts delay" });
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
envelope.Status.Should().Be("Success");
|
||||
envelope.Message.Should().Be("Cancel request sent to dispatcher");
|
||||
service.Verify(x => x.RequestCancelAsync(Session, 10, "Parts delay", It.IsAny<CancellationToken>()), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateChecklistItem_LockedDispatch_Returns400()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.UpdateChecklistItemAsync(Session, 10, 5, true, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("Dispatch is locked"));
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.UpdateChecklistItem(10, 5, new VendorPortalController.ChecklistUpdateRequest { IsCompleted = true });
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddSignoff_DuplicateSignoff_Returns400()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.AddSignoffAsync(Session, 10, "vendor", "Name", "sig", "drawn", It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("A vendor signoff already exists"));
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.AddSignoff(10, new VendorPortalController.SignoffRequest
|
||||
{
|
||||
SignoffType = "vendor",
|
||||
Name = "Name",
|
||||
Signature = "sig",
|
||||
SignatureMethod = "drawn"
|
||||
});
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RequestUplift_NTEBelowCurrent_Returns400()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.RequestUpliftAsync(Session, 10, 100m, null, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("Requested NTE must be greater than the current NTE"));
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.RequestUplift(10, new VendorPortalController.UpliftRequestBody { RequestedNTE = 100m });
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task RequestUplift_Success_ReturnsResult()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
var upliftResult = new UpliftRequestResultDTO { Id = 77, Status = "Pending", RequiredTier = 1 };
|
||||
service.Setup(x => x.RequestUpliftAsync(Session, 10, 500m, "Need more parts", It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(upliftResult);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.RequestUplift(10, new VendorPortalController.UpliftRequestBody
|
||||
{
|
||||
RequestedNTE = 500m,
|
||||
Reason = "Need more parts"
|
||||
});
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
var upliftData = envelope.Data as UpliftRequestResultDTO;
|
||||
upliftData.Should().Be(upliftResult);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CancelUpliftRequest_NonPending_Returns400()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.CancelUpliftRequestAsync(Session, 10, 77, It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("Cannot cancel a 'Approved' uplift request"));
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.CancelUpliftRequest(10, 77);
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task CancelUpliftRequest_Success_ReturnsCancelledStatus()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
var cancelResult = new CancelUpliftResultDTO { Id = 77, Status = "Cancelled" };
|
||||
service.Setup(x => x.CancelUpliftRequestAsync(Session, 10, 77, It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(cancelResult);
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.CancelUpliftRequest(10, 77);
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
var envelope = ok.Value.Should().BeOfType<DataResponse>().Subject;
|
||||
var cancelData = envelope.Data as CancelUpliftResultDTO;
|
||||
cancelData.Should().Be(cancelResult);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddComment_EmptyText_Returns400()
|
||||
{
|
||||
var service = new Mock<IVendorPortalService>();
|
||||
service.Setup(x => x.ResolveSessionAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(Session);
|
||||
service.Setup(x => x.AddCommentAsync(Session, 10, "", It.IsAny<CancellationToken>()))
|
||||
.ThrowsAsync(new InvalidOperationException("Comment cannot be empty"));
|
||||
var controller = NewController(service);
|
||||
|
||||
var result = await controller.AddComment(10, new VendorPortalController.CommentRequest { CommentText = "" });
|
||||
|
||||
result.Should().BeOfType<BadRequestObjectResult>();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +1,20 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Api.SeaHavenIndustries.Infrastructure;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.Configuration;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
|
@ -29,21 +36,29 @@ public sealed class VendorPortalDocumentTests : IDisposable
|
|||
|
||||
private VendorPortalController NewController(ApplicationDbContext context)
|
||||
{
|
||||
var configuration = new ConfigurationBuilder()
|
||||
.AddInMemoryCollection(new Dictionary<string, string?>
|
||||
{
|
||||
["VendorPortal:TokenLifetimeDays"] = "365",
|
||||
["SendGrid:ApiKey"] = "not-used"
|
||||
})
|
||||
.Build();
|
||||
var environment = new Mock<IWebHostEnvironment>();
|
||||
environment.SetupGet(item => item.ContentRootPath).Returns(_contentRoot);
|
||||
var controller = new VendorPortalController(
|
||||
context,
|
||||
new VendorPortalTokenService(context, configuration),
|
||||
configuration,
|
||||
new SendMessage(configuration),
|
||||
environment.Object);
|
||||
var vendorData = new VendorDataService(context);
|
||||
var tokenService = new VendorPortalTokenService(
|
||||
vendorData,
|
||||
Microsoft.Extensions.Options.Options.Create(new VendorPortalOptions()));
|
||||
var documentData = new VendorDocumentDataService(context);
|
||||
var storageEnvironment = new Mock<IWebHostEnvironment>();
|
||||
storageEnvironment.SetupGet(item => item.ContentRootPath).Returns(_contentRoot);
|
||||
var storage = new VendorDocumentStorageAdapter(storageEnvironment.Object);
|
||||
|
||||
var service = new VendorPortalService(
|
||||
tokenService,
|
||||
new DispatchDataService(context),
|
||||
Mock.Of<IUpliftDataService>(),
|
||||
Mock.Of<ICommentDataService>(),
|
||||
Mock.Of<IUserDataService>(),
|
||||
Mock.Of<IEmailSender>(),
|
||||
documentData,
|
||||
storage,
|
||||
Microsoft.Extensions.Options.Options.Create(new FrontendOptions()),
|
||||
Microsoft.Extensions.Options.Options.Create(new ApprovalsOptions()),
|
||||
Microsoft.Extensions.Options.Options.Create(new VendorDocumentsOptions()));
|
||||
|
||||
var controller = new VendorPortalController(service, Mock.Of<ILogger<VendorPortalController>>());
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext()
|
||||
|
|
|
|||
|
|
@ -2,10 +2,13 @@ using Data.SeaHavenIndustries;
|
|||
using Data.SeaHavenIndustries.Enums;
|
||||
using FluentAssertions;
|
||||
using FluentValidation;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.Configuration;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using SeaHaven.Services.Validation;
|
||||
using Xunit;
|
||||
|
||||
|
|
@ -14,7 +17,14 @@ namespace Api.SeaHavenIndustries.Tests;
|
|||
public class VendorServiceTests
|
||||
{
|
||||
private static VendorService NewService(Mock<IVendorDataService> data) =>
|
||||
new(data.Object, new CreateVendorValidation(), new UpdateVendorValidation(), new WorkOrderVendorUpdateValidation());
|
||||
new(
|
||||
data.Object,
|
||||
Mock.Of<IVendorPortalTokenService>(),
|
||||
Mock.Of<IZipCodeDistance>(),
|
||||
Microsoft.Extensions.Options.Options.Create(new FrontendOptions()),
|
||||
new CreateVendorValidation(),
|
||||
new UpdateVendorValidation(),
|
||||
new WorkOrderVendorUpdateValidation());
|
||||
|
||||
[Fact]
|
||||
public async Task CreateVendor_PersistsCompleteProfile()
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Moq;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.DTOs;
|
||||
|
|
@ -20,51 +15,14 @@ namespace Api.SeaHavenIndustries.Tests;
|
|||
|
||||
public class WorkOrderControllerSearchTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
private static WorkOrderBoardController NewController(IWorkOrderAdvancedSearchService advancedSearch)
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static UserManager<ApplicationUser> MockUserManager()
|
||||
{
|
||||
var store = new Mock<IUserStore<ApplicationUser>>();
|
||||
return new Mock<UserManager<ApplicationUser>>(
|
||||
store.Object, null!, null!, null!, null!, null!, null!, null!, null!).Object;
|
||||
}
|
||||
|
||||
private static WorkOrderController NewController(
|
||||
ApplicationDbContext ctx,
|
||||
IWorkOrderAdvancedSearchService advancedSearch)
|
||||
{
|
||||
var controller = new WorkOrderController(
|
||||
MockUserManager(),
|
||||
Mock.Of<IWorkOrderService>(),
|
||||
Mock.Of<IWorkOrderDataService>(),
|
||||
Mock.Of<ICommentDataService>(),
|
||||
Mock.Of<IQuotesDataService>(),
|
||||
Mock.Of<IUserDataService>(),
|
||||
Mock.Of<IDispatchDataService>(),
|
||||
Mock.Of<IVendorDataService>(),
|
||||
Mock.Of<ITaskListTemplateDataService>(),
|
||||
ctx,
|
||||
Mock.Of<IWebHostEnvironment>(),
|
||||
Mock.Of<IHttpContextAccessor>(),
|
||||
null!,
|
||||
null!,
|
||||
Mock.Of<IConfiguration>(),
|
||||
var controller = new WorkOrderBoardController(
|
||||
Mock.Of<IWorkOrderBoardService>(),
|
||||
Mock.Of<IWorkOrderBoardUpdateService>(),
|
||||
Mock.Of<IWorkOrderBoardCreateService>(),
|
||||
Mock.Of<IWorkOrderBoardCancelService>(),
|
||||
advancedSearch,
|
||||
Mock.Of<IWorkOrderDetailService>(),
|
||||
Mock.Of<IWorkOrderCommentService>(),
|
||||
Mock.Of<IWorkOrderCompletionService>(),
|
||||
Mock.Of<IWorkOrderMediaService>());
|
||||
|
||||
advancedSearch);
|
||||
|
||||
controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
|
|
@ -88,10 +46,9 @@ public class WorkOrderControllerSearchTests
|
|||
[Fact]
|
||||
public async Task SearchBoard_WhenCustomPresetMissingDates_ReturnsBadRequest()
|
||||
{
|
||||
using var ctx = NewContext();
|
||||
var advancedSearch = new WorkOrderAdvancedSearchService(
|
||||
Mock.Of<IWorkOrderAdvancedSearchDataService>());
|
||||
var controller = NewController(ctx, advancedSearch);
|
||||
var controller = NewController(advancedSearch);
|
||||
|
||||
var result = await controller.SearchBoard(new WorkOrderAdvancedSearchQueryDto
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,104 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using FluentAssertions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Implementation;
|
||||
using Xunit;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
public class WorkOrderDataServiceBatchingTests
|
||||
{
|
||||
private static ApplicationDbContext NewContext()
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<ApplicationDbContext>()
|
||||
.UseInMemoryDatabase(Guid.NewGuid().ToString())
|
||||
.Options;
|
||||
return new ApplicationDbContext(options);
|
||||
}
|
||||
|
||||
private static async Task SeedAsync(ApplicationDbContext context)
|
||||
{
|
||||
context.Locations.Add(new Locations { Id = 100, Name = "Site A", Address1 = "1 Main St" });
|
||||
context.workOrders.AddRange(
|
||||
new WorkOrder { Id = 1, InternalWONumber = "WO-1", WorkerOrderTitle = "First", LocationId = 100 },
|
||||
new WorkOrder { Id = 2, InternalWONumber = "WO-2", WorkerOrderTitle = "Second", LocationId = 100 },
|
||||
new WorkOrder { Id = 3, InternalWONumber = "WO-3", WorkerOrderTitle = "Third", LocationId = 100 },
|
||||
new WorkOrder { Id = 4, InternalWONumber = "WO-T", WorkerOrderTitle = "Template", LocationId = 100, istemplate = true });
|
||||
await context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByRequestedIdsWithDetailsAsync_ReturnsResultsInInputOrder()
|
||||
{
|
||||
await using var context = NewContext();
|
||||
await SeedAsync(context);
|
||||
var service = new WorkOrderDataService(context);
|
||||
|
||||
var result = await service.GetByRequestedIdsWithDetailsAsync(
|
||||
new[] { 3, 1, 2 },
|
||||
CancellationToken.None);
|
||||
|
||||
result.Select(w => w.Id).Should().Equal(new[] { 3, 1, 2 });
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByRequestedIdsWithDetailsAsync_DeduplicatesIdsAndSkipsMissing()
|
||||
{
|
||||
await using var context = NewContext();
|
||||
await SeedAsync(context);
|
||||
var service = new WorkOrderDataService(context);
|
||||
|
||||
var result = await service.GetByRequestedIdsWithDetailsAsync(
|
||||
new[] { 2, 2, 999, 1 },
|
||||
CancellationToken.None);
|
||||
|
||||
result.Select(w => w.Id).Should().Equal(new[] { 2, 1 });
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByRequestedIdsWithDetailsAsync_ExcludesTemplatesAndEagerLoadsLocation()
|
||||
{
|
||||
await using var context = NewContext();
|
||||
await SeedAsync(context);
|
||||
var service = new WorkOrderDataService(context);
|
||||
|
||||
var result = await service.GetByRequestedIdsWithDetailsAsync(
|
||||
new[] { 1, 4 },
|
||||
CancellationToken.None);
|
||||
|
||||
result.Select(w => w.Id).Should().Equal(new[] { 1 });
|
||||
result.Single().Locations.Should().NotBeNull();
|
||||
result.Single().Locations!.Name.Should().Be("Site A");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task AddAuditLogsAsync_PersistsAllRowsInSingleSave()
|
||||
{
|
||||
await using var context = NewContext();
|
||||
await SeedAsync(context);
|
||||
var service = new WorkOrderDataService(context);
|
||||
|
||||
await service.AddAuditLogsAsync(new[]
|
||||
{
|
||||
new WorkOrderAuditLog { WorkOrderId = 1, FieldName = "Dispatch", Action = "Dispatch" },
|
||||
new WorkOrderAuditLog { WorkOrderId = 2, FieldName = "Dispatch", Action = "Dispatch" }
|
||||
});
|
||||
|
||||
context.WorkOrderAuditLogs.Should().HaveCount(2);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetByIdsOrderedAsync_PreservesInputOrderDeduplicatesAndSkipsMissing()
|
||||
{
|
||||
await using var context = NewContext();
|
||||
context.Vendors.AddRange(
|
||||
new Vendor { Id = 7, CompanyName = "V7", Email = "v7@x.io" },
|
||||
new Vendor { Id = 8, CompanyName = "V8", Email = "v8@x.io" });
|
||||
await context.SaveChangesAsync();
|
||||
var service = new VendorDataService(context);
|
||||
|
||||
var result = await service.GetByIdsOrderedAsync(new[] { 8, 8, 7, 999 }, CancellationToken.None);
|
||||
|
||||
result.Select(v => v.Id).Should().Equal(new[] { 8, 7 });
|
||||
}
|
||||
}
|
||||
206
Api.SeaHavenIndustries.Tests/WorkOrderRouteContractTests.cs
Normal file
206
Api.SeaHavenIndustries.Tests/WorkOrderRouteContractTests.cs
Normal file
|
|
@ -0,0 +1,206 @@
|
|||
using Api.SeaHavenIndustries.Controllers;
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Mvc.Abstractions;
|
||||
using Microsoft.AspNetCore.Mvc.ActionConstraints;
|
||||
using Microsoft.AspNetCore.Mvc.Controllers;
|
||||
using Microsoft.AspNetCore.Mvc.Infrastructure;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Xunit;
|
||||
using Xunit.Abstractions;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Tests;
|
||||
|
||||
/// <summary>
|
||||
/// Framework-backed route contract tests that prove the public endpoint set exposed by the
|
||||
/// WorkOrder URL space (api/WorkOrder, api/workorders) is preserved exactly after splitting the
|
||||
/// original godfile WorkOrderController into cohesive controllers, and that no verb+route
|
||||
/// combination is registered more than once by different actions.
|
||||
///
|
||||
/// Routes are read from the ASP.NET Core action descriptor provider so the EXACT templates the
|
||||
/// framework will dispatch are compared, including multi-attribute actions (e.g. Editworkorder,
|
||||
/// GetWorkorderById) and the two shared controller-level base routes.
|
||||
/// </summary>
|
||||
public class WorkOrderRouteContractTests
|
||||
{
|
||||
private readonly ITestOutputHelper _output;
|
||||
|
||||
private static readonly HashSet<Type> WorkOrderFamilyControllerTypes = new()
|
||||
{
|
||||
typeof(WorkOrderController),
|
||||
typeof(WorkOrderBoardController),
|
||||
typeof(WorkOrderDetailController),
|
||||
typeof(WorkOrderCompletionController),
|
||||
typeof(WorkOrderMediaController),
|
||||
typeof(WorkOrderDispatchController),
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// Baseline public endpoint set (verb + action-relative route) that the original single
|
||||
/// WorkOrderController exposed. Every action is reachable under both api/WorkOrder and
|
||||
/// api/workorders; that base-route duplication is collapsed here, so this is the distinct
|
||||
/// action-relative contract. 45 routes come from 43 actions (Editworkorder and
|
||||
/// GetWorkorderById each bind two routes).
|
||||
/// </summary>
|
||||
private static readonly HashSet<string> ExpectedWorkOrderEndpoints = new(StringComparer.Ordinal)
|
||||
{
|
||||
"DELETE DeleteWorkorder",
|
||||
"DELETE completion-templates/{id:int}",
|
||||
"DELETE {id:int}/media/{mediaId:int}",
|
||||
"GET GetComments",
|
||||
"GET GetCommentsByWorkorderId",
|
||||
"GET GetDispatch/{id}",
|
||||
"GET GetDispatches/{workOrderId}",
|
||||
"GET GetFilteredWorkorder",
|
||||
"GET GetFilteredWorkorder2",
|
||||
"GET GetWorkOrderList",
|
||||
"GET GetWorkorderById",
|
||||
"GET Getworkorders",
|
||||
"GET GetworkordersDD",
|
||||
"GET board",
|
||||
"GET board/search",
|
||||
"GET completion-templates",
|
||||
"GET completion-templates/{id:int}",
|
||||
"GET lookups/dispatchers",
|
||||
"GET {id:int}",
|
||||
"GET {id:int}/audit",
|
||||
"GET {id:int}/comments",
|
||||
"GET {id:int}/detail",
|
||||
"GET {id:int}/media",
|
||||
"PATCH {id:int}/board",
|
||||
"POST AddChecklistItem",
|
||||
"POST AddComment",
|
||||
"POST AddCommentJson",
|
||||
"POST AddDispatchComment",
|
||||
"POST AddDispatchSignoff",
|
||||
"POST AddWorkorder",
|
||||
"POST ChangeAssignment",
|
||||
"POST ChangeStatus",
|
||||
"POST DispatchToVendor",
|
||||
"POST EditWorkorder",
|
||||
"POST UpdateChecklistItem",
|
||||
"POST UpdateDispatch",
|
||||
"POST VerifyDispatch",
|
||||
"POST board",
|
||||
"POST completion-templates",
|
||||
"POST {id:int}/cancel",
|
||||
"POST {id:int}/comments",
|
||||
"POST {id:int}/completion-doc",
|
||||
"POST {id:int}/media",
|
||||
"PUT completion-templates/{id:int}",
|
||||
"PUT {id:int}",
|
||||
};
|
||||
|
||||
public WorkOrderRouteContractTests(ITestOutputHelper output)
|
||||
{
|
||||
_output = output;
|
||||
}
|
||||
|
||||
private static IReadOnlyList<ActionDescriptor> BuildActionDescriptors()
|
||||
{
|
||||
var services = new ServiceCollection();
|
||||
services.AddLogging();
|
||||
services.AddMvcCore()
|
||||
.AddApplicationPart(typeof(WorkOrderController).Assembly);
|
||||
|
||||
using var provider = services.BuildServiceProvider();
|
||||
var actionProvider = provider.GetRequiredService<IActionDescriptorCollectionProvider>();
|
||||
return actionProvider.ActionDescriptors.Items;
|
||||
}
|
||||
|
||||
private static IReadOnlyList<(string Verb, string FullTemplate, string Controller, string Action)> FullRoutesFor(
|
||||
Func<ActionDescriptor, bool> predicate)
|
||||
{
|
||||
var tuples = new List<(string Verb, string FullTemplate, string Controller, string Action)>();
|
||||
foreach (var action in BuildActionDescriptors().Where(predicate))
|
||||
{
|
||||
var cad = action as ControllerActionDescriptor;
|
||||
var template = cad?.AttributeRouteInfo?.Template?.Trim('/');
|
||||
if (string.IsNullOrEmpty(template))
|
||||
continue;
|
||||
|
||||
var methods = action.ActionConstraints
|
||||
.OfType<HttpMethodActionConstraint>()
|
||||
.SelectMany(c => c.HttpMethods)
|
||||
.Distinct(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
foreach (var method in methods)
|
||||
tuples.Add((method.ToUpperInvariant(), template, cad!.ControllerName, cad.ActionName));
|
||||
}
|
||||
|
||||
return tuples;
|
||||
}
|
||||
|
||||
private static string Normalize(string fullTemplate)
|
||||
{
|
||||
foreach (var prefix in new[] { "api/WorkOrder/", "api/workorders/" })
|
||||
{
|
||||
if (fullTemplate.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
|
||||
return fullTemplate[prefix.Length..];
|
||||
}
|
||||
foreach (var exact in new[] { "api/WorkOrder", "api/workorders" })
|
||||
{
|
||||
if (fullTemplate.Equals(exact, StringComparison.OrdinalIgnoreCase))
|
||||
return string.Empty;
|
||||
}
|
||||
return fullTemplate;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WorkOrder_Family_Preserves_Expected_Public_Endpoint_Set()
|
||||
{
|
||||
var actual = FullRoutesFor(a => a is ControllerActionDescriptor cad
|
||||
&& WorkOrderFamilyControllerTypes.Contains(cad.ControllerTypeInfo))
|
||||
.Select(t => $"{t.Verb} {Normalize(t.FullTemplate)}")
|
||||
.ToHashSet(StringComparer.Ordinal);
|
||||
|
||||
Dump(actual);
|
||||
|
||||
var missing = ExpectedWorkOrderEndpoints.Except(actual).OrderBy(x => x).ToList();
|
||||
var unexpected = actual.Except(ExpectedWorkOrderEndpoints).OrderBy(x => x).ToList();
|
||||
|
||||
missing.Should().BeEmpty("every pre-split WorkOrder endpoint must still be reachable");
|
||||
unexpected.Should().BeEmpty("the split must not introduce new public WorkOrder endpoints");
|
||||
actual.Should().HaveCount(ExpectedWorkOrderEndpoints.Count,
|
||||
"the distinct action-relative endpoint count must match the baseline");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WorkOrder_Family_Has_No_Duplicate_Verb_And_Route_From_Different_Actions()
|
||||
{
|
||||
// Duplicate detection is done at the FULL route-template level. Each action legitimately
|
||||
// resolves under both base routes (api/WorkOrder and api/workorders); those are distinct
|
||||
// full templates. A true collision is the SAME full template produced by two actions,
|
||||
// which would cause an AmbiguousMatchException at request time.
|
||||
var collisions = FullRoutesFor(a => a is ControllerActionDescriptor cad
|
||||
&& WorkOrderFamilyControllerTypes.Contains(cad.ControllerTypeInfo))
|
||||
.GroupBy(t => (t.Verb, t.FullTemplate))
|
||||
.Where(g => g.Select(x => (x.Controller, x.Action)).Distinct().Count() > 1)
|
||||
.Select(g => $"{g.Key.Verb} {g.Key.FullTemplate} -> {string.Join(", ", g.Select(x => $"{x.Controller}.{x.Action}"))}")
|
||||
.ToList();
|
||||
|
||||
collisions.Should().BeEmpty(
|
||||
"no two actions in the WorkOrder family may register the same verb+full-route");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WorkOrder_Url_Space_Has_No_Duplicate_Verb_And_Route_From_Different_Actions()
|
||||
{
|
||||
var collisions = FullRoutesFor(_ => true)
|
||||
.Where(t => t.FullTemplate.StartsWith("api/WorkOrder", StringComparison.OrdinalIgnoreCase)
|
||||
|| t.FullTemplate.StartsWith("api/workorders", StringComparison.OrdinalIgnoreCase))
|
||||
.GroupBy(t => (t.Verb, t.FullTemplate))
|
||||
.Where(g => g.Select(x => (x.Controller, x.Action)).Distinct().Count() > 1)
|
||||
.Select(g => $"{g.Key.Verb} {g.Key.FullTemplate} -> {string.Join(", ", g.Select(x => $"{x.Controller}.{x.Action}"))}")
|
||||
.ToList();
|
||||
|
||||
collisions.Should().BeEmpty(
|
||||
"no two controllers sharing api/WorkOrder or api/workorders may register the same verb+full-route");
|
||||
}
|
||||
|
||||
private void Dump(IEnumerable<string> endpoints)
|
||||
{
|
||||
_output.WriteLine("WorkOrder-family public endpoints (verb + action-relative route):");
|
||||
foreach (var endpoint in endpoints.OrderBy(x => x, StringComparer.Ordinal))
|
||||
_output.WriteLine(" " + endpoint);
|
||||
}
|
||||
}
|
||||
|
|
@ -24,4 +24,8 @@
|
|||
<ProjectReference Include="..\SeaHaven.DataServices\SeaHaven.DataServices.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<InternalsVisibleTo Include="Api.SeaHavenIndustries.Tests" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using System.IdentityModel.Tokens.Jwt;
|
||||
using System.Security.Claims;
|
||||
using System.Text;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -16,73 +14,54 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/Authentication")]
|
||||
public class AuthenticationController : Controller
|
||||
{
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly IConfiguration _configuration;
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly SendMessage _sendMessage;
|
||||
private readonly IAuthenticationService _authenticationService;
|
||||
private readonly ILogger<AuthenticationController> _logger;
|
||||
|
||||
public AuthenticationController(UserManager<ApplicationUser> userManager, IConfiguration configuration, ApplicationDbContext db, SendMessage sendMessage)
|
||||
public AuthenticationController(IAuthenticationService authenticationService, ILogger<AuthenticationController> logger)
|
||||
{
|
||||
_userManager = userManager;
|
||||
_configuration = configuration;
|
||||
_db = db;
|
||||
_sendMessage = sendMessage;
|
||||
_authenticationService = authenticationService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[AllowAnonymous]
|
||||
[HttpPost]
|
||||
[Route("login")]
|
||||
public async Task<IActionResult> Login([FromBody] LoginModel model)
|
||||
public async Task<IActionResult> Login([FromBody] LoginModel model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var user = await _userManager.FindByNameAsync(model.Username ?? "");
|
||||
if (user != null && user.IsDeleted != true && await _userManager.CheckPasswordAsync(user, model.Password ?? ""))
|
||||
var result = await _authenticationService.LoginAsync(model.Username, model.Password, cancellationToken);
|
||||
if (result != null)
|
||||
{
|
||||
// Standard login without 2FA
|
||||
var userRoles = await _userManager.GetRolesAsync(user);
|
||||
var authClaims = new List<Claim>
|
||||
{
|
||||
new Claim(ClaimTypes.Name, user.UserName ?? ""),
|
||||
new Claim(ClaimTypes.NameIdentifier, user.Id),
|
||||
new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())
|
||||
};
|
||||
foreach (var userRole in userRoles)
|
||||
{
|
||||
authClaims.Add(new Claim(ClaimTypes.Role, userRole));
|
||||
}
|
||||
var token = GetToken(authClaims);
|
||||
return Ok(new
|
||||
{
|
||||
token = new JwtSecurityTokenHandler().WriteToken(token),
|
||||
expiration = token.ValidTo,
|
||||
email = user.Email,
|
||||
userRoles = userRoles.FirstOrDefault(),
|
||||
phoneNumber = user.PhoneNumber,
|
||||
fullname = user.FirstName + " " + user.LastName,
|
||||
id = user.Id
|
||||
token = result.Token,
|
||||
expiration = result.Expiration,
|
||||
email = result.Email,
|
||||
userRoles = result.UserRole,
|
||||
phoneNumber = result.PhoneNumber,
|
||||
fullname = result.Fullname,
|
||||
id = result.Id
|
||||
});
|
||||
}
|
||||
|
||||
// Invalid credentials
|
||||
return Unauthorized();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
return StatusCode(500, ex.Message);
|
||||
return StatusCode(500, _logger.Sanitize(ex));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
[Route("ChangePassword")]
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> ChangePassword(ChangePasswords usermodel)
|
||||
public async Task<IActionResult> ChangePassword(ChangePasswords usermodel, CancellationToken cancellationToken)
|
||||
{
|
||||
var userid = User.FindFirstValue(ClaimTypes.NameIdentifier) ?? "";
|
||||
var user = await _userManager.FindByIdAsync(userid);
|
||||
var result = await _userManager.ChangePasswordAsync(user, usermodel.Currentpassword ?? "", usermodel.Confirmpassword ?? "");
|
||||
if (result.Succeeded)
|
||||
var succeeded = await _authenticationService.ChangePasswordAsync(userid, usermodel.Currentpassword, usermodel.Confirmpassword, cancellationToken);
|
||||
if (succeeded)
|
||||
{
|
||||
return Ok(new Response { Status = "Success ", Message = "Password successfully changed" });
|
||||
}
|
||||
|
|
@ -90,49 +69,36 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
return BadRequest(new Response { Status = "Old Password is incorrect" });
|
||||
}
|
||||
|
||||
private JwtSecurityToken GetToken(List<Claim> authClaims)
|
||||
{
|
||||
var authSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_configuration["JWT:Secret"] ?? ""));
|
||||
var token = new JwtSecurityToken(
|
||||
issuer: _configuration["JWT:ValidIssuer"],
|
||||
audience: _configuration["JWT:ValidAudience"],
|
||||
expires: DateTime.Now.AddDays(10),
|
||||
claims: authClaims,
|
||||
signingCredentials: new SigningCredentials(authSigningKey, SecurityAlgorithms.HmacSha256)
|
||||
);
|
||||
return token;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("UpdateProfile")]
|
||||
public async Task<IActionResult> UserProfileUpdate([FromForm] User_DTO model)
|
||||
public async Task<IActionResult> UserProfileUpdate([FromForm] User_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userid = User.FindFirstValue(ClaimTypes.NameIdentifier) ?? "";
|
||||
ApplicationUser appuser = _db.Users.AsNoTracking().Where(u => u.Id == userid).FirstOrDefault() ?? new ApplicationUser();
|
||||
appuser.FirstName = model.Name;
|
||||
appuser.Email = model.Email;
|
||||
appuser.Contact = model.Contact;
|
||||
_db.Users.Update(appuser);
|
||||
await _db.SaveChangesAsync();
|
||||
var dto = new UpdateProfileRequestDTO
|
||||
{
|
||||
Name = model.Name,
|
||||
Email = model.Email,
|
||||
Contact = model.Contact
|
||||
};
|
||||
var data = await _authenticationService.UpdateProfileAsync(userid, dto, cancellationToken);
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Message = "Introduction Updated Successfully",
|
||||
Status = "200",
|
||||
Data = _db.Users.Where(u => u.Id == userid).Select(s => new
|
||||
Data = data == null ? null : new
|
||||
{
|
||||
s.FirstName,
|
||||
//s.Location,
|
||||
s.Email,
|
||||
s.Contact
|
||||
}).FirstOrDefault()
|
||||
data.FirstName,
|
||||
data.Email,
|
||||
data.Contact
|
||||
}
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -141,25 +107,11 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[AllowAnonymous]
|
||||
[HttpPost()]
|
||||
[Route("ForgetPassword")]
|
||||
public async Task<IActionResult> ForgetPassword(string Email)
|
||||
public async Task<IActionResult> ForgetPassword(string Email, CancellationToken cancellationToken)
|
||||
{
|
||||
var user = await _db.Users.Where(u => u.Email.ToLower().Trim() == Email.ToLower().ToLower()).FirstOrDefaultAsync();
|
||||
if (user != null)
|
||||
var found = await _authenticationService.ForgetPasswordAsync(Email, cancellationToken);
|
||||
if (found)
|
||||
{
|
||||
if (_db.ForgetPasswordCodes.Where(u => u.Email.ToLower().Trim() == Email.ToLower().Trim()).Any())
|
||||
{
|
||||
_db.ForgetPasswordCodes.Remove(_db.ForgetPasswordCodes.Where(u => u.Email.ToLower().Trim() == Email.ToLower().Trim()).FirstOrDefault());
|
||||
_db.SaveChanges();
|
||||
}
|
||||
ForgetPasswordCode forgetPasswordCode = new ForgetPasswordCode();
|
||||
forgetPasswordCode.Email = user.Email ?? "";
|
||||
forgetPasswordCode.UserId = user.Id;
|
||||
forgetPasswordCode.Code = GenerateRandomNo();
|
||||
|
||||
_db.ForgetPasswordCodes.Add(forgetPasswordCode);
|
||||
_db.SaveChanges();
|
||||
string body = $"Your Password Reset Code is: " + forgetPasswordCode.Code;
|
||||
await _sendMessage.SendEMail(user.Email, "Forget Password Request.", body);
|
||||
return Ok(new Response { Status = "Success ", Message = "Please check your email for code" });
|
||||
}
|
||||
else
|
||||
|
|
@ -171,11 +123,11 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[AllowAnonymous]
|
||||
[HttpPost()]
|
||||
[Route("VerificationCode")]
|
||||
public async Task<IActionResult> VerificationCode(string code)
|
||||
public async Task<IActionResult> VerificationCode(string code, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (await _db.ForgetPasswordCodes.Where(u => u.Code == code).AnyAsync())
|
||||
if (await _authenticationService.VerifyCodeAsync(code, cancellationToken))
|
||||
{
|
||||
|
||||
return Ok(new Response { Status = "Success ", Message = "Code Matched" });
|
||||
|
|
@ -187,7 +139,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "Error: " + ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -195,16 +147,12 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[AllowAnonymous]
|
||||
[HttpPost()]
|
||||
[Route("ResetPassword")]
|
||||
public async Task<IActionResult> ResetPassword(ForgetPassword_Dto fpdto)
|
||||
public async Task<IActionResult> ResetPassword(ForgetPassword_Dto fpdto, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (_db.ForgetPasswordCodes.Where(u => u.Email.ToLower().Trim() == fpdto.Email.ToLower().Trim() && u.Code == fpdto.Code.Trim()).Any())
|
||||
if (await _authenticationService.ResetPasswordAsync(fpdto.Email, fpdto.Code, fpdto.Password, cancellationToken))
|
||||
{
|
||||
var GetUser = _db.ForgetPasswordCodes.Where(u => u.Email.ToLower().Trim() == fpdto.Email.ToLower().Trim()).FirstOrDefault();
|
||||
var user = await _userManager.FindByIdAsync(GetUser.UserId);
|
||||
var token = await _userManager.GeneratePasswordResetTokenAsync(user);
|
||||
var result = await _userManager.ResetPasswordAsync(user, token, fpdto.Password);
|
||||
return Ok(new Response { Status = "Success ", Message = "password changed" });
|
||||
}
|
||||
else
|
||||
|
|
@ -215,16 +163,10 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
catch (Exception ex)
|
||||
{
|
||||
|
||||
return BadRequest(new Response { Status = "Error", Message = "Error: " + ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private Random _random = new Random();
|
||||
private string GenerateRandomNo()
|
||||
{
|
||||
return _random.Next(0, 999999).ToString("D6");
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -16,13 +14,13 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/Calendar")]
|
||||
public class CalendarController : Controller
|
||||
{
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly ICalendarService _calendarService;
|
||||
private readonly ILogger<CalendarController> _logger;
|
||||
|
||||
public CalendarController(UserManager<ApplicationUser> userManager, ApplicationDbContext db)
|
||||
public CalendarController(ICalendarService calendarService, ILogger<CalendarController> logger)
|
||||
{
|
||||
_userManager = userManager;
|
||||
_db = db;
|
||||
_calendarService = calendarService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
// ===================================================================================
|
||||
|
|
@ -30,37 +28,17 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
// ===================================================================================
|
||||
[HttpPost]
|
||||
[Route("AddEvent")]
|
||||
public async Task<IActionResult> AddEvent(EditEvent_DTO eventDto)
|
||||
public async Task<IActionResult> AddEvent(EditEvent_DTO eventDto, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = new Events
|
||||
{
|
||||
Title = eventDto.Title,
|
||||
Description = eventDto.Description,
|
||||
Location = eventDto.Location,
|
||||
RecordID = eventDto.RecordID,
|
||||
RecordName = eventDto.RecordName,
|
||||
RecordTargetType = eventDto.RecordTargetType,
|
||||
ReminderMinutes = eventDto.ReminderMinutes,
|
||||
EventColor = eventDto.EventColor,
|
||||
StartDate = eventDto.StartDate,
|
||||
StartTime = eventDto.StartTime,
|
||||
EndDate = eventDto.EndDate,
|
||||
EndTime = eventDto.EndTime,
|
||||
AllDay = eventDto.AllDay,
|
||||
CreatedDate = DateTime.Now,
|
||||
IsDeleted = false
|
||||
};
|
||||
|
||||
_db.Events.Add(model);
|
||||
await _db.SaveChangesAsync();
|
||||
await _calendarService.CreateEventAsync(MapToInput(eventDto), cancellationToken);
|
||||
|
||||
return Ok(new DataResponse { Message = "Event Created Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -69,7 +47,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
// ===================================================================================
|
||||
[HttpPost]
|
||||
[Route("EditEvent")]
|
||||
public async Task<IActionResult> EditEvent(EditEvent_DTO eventDto)
|
||||
public async Task<IActionResult> EditEvent(EditEvent_DTO eventDto, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -78,35 +56,17 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
return BadRequest(new Response { Status = "Error", Message = "Event ID is required for editing" });
|
||||
}
|
||||
|
||||
var model = await _db.Events.FindAsync(eventDto.Id.Value);
|
||||
if (model == null || model.IsDeleted == true)
|
||||
var updated = await _calendarService.UpdateEventAsync(MapToInput(eventDto), cancellationToken);
|
||||
if (!updated)
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = "Event not found" });
|
||||
}
|
||||
|
||||
model.Title = eventDto.Title;
|
||||
model.Description = eventDto.Description;
|
||||
model.Location = eventDto.Location;
|
||||
model.RecordID = eventDto.RecordID;
|
||||
model.RecordName = eventDto.RecordName;
|
||||
model.RecordTargetType = eventDto.RecordTargetType;
|
||||
model.ReminderMinutes = eventDto.ReminderMinutes;
|
||||
model.EventColor = eventDto.EventColor;
|
||||
model.StartDate = eventDto.StartDate;
|
||||
model.StartTime = eventDto.StartTime;
|
||||
model.EndDate = eventDto.EndDate;
|
||||
model.EndTime = eventDto.EndTime;
|
||||
model.AllDay = eventDto.AllDay;
|
||||
model.LastModificationTime = DateTime.Now;
|
||||
|
||||
_db.Events.Update(model);
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return Ok(new DataResponse { Message = "Event Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -115,44 +75,22 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
// ===================================================================================
|
||||
[HttpGet]
|
||||
[Route("GetEventById/{id}")]
|
||||
public async Task<IActionResult> GetEventById(int id)
|
||||
public async Task<IActionResult> GetEventById(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = await _db.Events
|
||||
.Where(e => e.Id == id && e.IsDeleted != true)
|
||||
.FirstOrDefaultAsync();
|
||||
var dto = await _calendarService.GetEventByIdAsync(id, cancellationToken);
|
||||
|
||||
if (model == null)
|
||||
if (dto == null)
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = "Event not found" });
|
||||
}
|
||||
|
||||
var dto = new Event_DTO
|
||||
{
|
||||
Id = model.Id,
|
||||
Title = model.Title,
|
||||
Description = model.Description,
|
||||
Location = model.Location,
|
||||
RecordID = model.RecordID,
|
||||
RecordName = model.RecordName,
|
||||
RecordTargetType = model.RecordTargetType,
|
||||
ReminderMinutes = model.ReminderMinutes,
|
||||
EventColor = model.EventColor,
|
||||
StartDate = model.StartDate,
|
||||
StartTime = model.StartTime,
|
||||
EndDate = model.EndDate,
|
||||
EndTime = model.EndTime,
|
||||
AllDay = model.AllDay,
|
||||
CreatedDate = model.CreatedDate,
|
||||
createdby = model.createdby
|
||||
};
|
||||
|
||||
return Ok(new DataResponse { Message = "Success", Status = "200", Data = dto });
|
||||
return Ok(new DataResponse { Message = "Success", Status = "200", Data = MapToResponse(dto) });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -161,28 +99,21 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
// ===================================================================================
|
||||
[HttpDelete]
|
||||
[Route("DeleteEvent/{id}")]
|
||||
public async Task<IActionResult> DeleteEvent(int id)
|
||||
public async Task<IActionResult> DeleteEvent(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = await _db.Events.FindAsync(id);
|
||||
if (model == null)
|
||||
var deleted = await _calendarService.DeleteEventAsync(id, cancellationToken);
|
||||
if (!deleted)
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = "Event not found" });
|
||||
}
|
||||
|
||||
// Soft delete
|
||||
model.IsDeleted = true;
|
||||
model.DeletionTime = DateTime.Now;
|
||||
|
||||
_db.Events.Update(model);
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return Ok(new DataResponse { Message = "Event Deleted Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -191,63 +122,24 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
// ===================================================================================
|
||||
[HttpGet]
|
||||
[Route("GetEventList")]
|
||||
public IActionResult GetEventList(string? search = "", int page = 1, int pageSize = 10)
|
||||
public async Task<IActionResult> GetEventList(string? search = "", int page = 1, int pageSize = 10, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
var query = _db.Events.Where(e => e.IsDeleted != true);
|
||||
var result = await _calendarService.GetEventListAsync(search, page, pageSize, cancellationToken);
|
||||
|
||||
// Apply search filter if provided
|
||||
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))
|
||||
);
|
||||
}
|
||||
|
||||
// IMPORTANT: Calculate totalCount AFTER applying filters
|
||||
var totalCount = query.Count();
|
||||
|
||||
// Apply pagination
|
||||
var events = query
|
||||
.OrderByDescending(e => e.StartDate)
|
||||
.ThenByDescending(e => e.CreatedDate)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.Select(e => new Event_DTO
|
||||
{
|
||||
Id = e.Id,
|
||||
Title = e.Title,
|
||||
Description = e.Description,
|
||||
Location = e.Location,
|
||||
RecordID = e.RecordID,
|
||||
RecordName = e.RecordName,
|
||||
RecordTargetType = e.RecordTargetType,
|
||||
ReminderMinutes = e.ReminderMinutes,
|
||||
EventColor = e.EventColor,
|
||||
StartDate = e.StartDate,
|
||||
StartTime = e.StartTime,
|
||||
EndDate = e.EndDate,
|
||||
EndTime = e.EndTime,
|
||||
AllDay = e.AllDay,
|
||||
CreatedDate = e.CreatedDate,
|
||||
createdby = e.createdby
|
||||
})
|
||||
.ToList();
|
||||
var events = result.Rows.Select(MapToResponse).ToList();
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Message = "Success",
|
||||
Status = "200",
|
||||
Data = new { rows = events, totalCount }
|
||||
Data = new { rows = events, totalCount = result.TotalCount }
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -256,51 +148,62 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
// ===================================================================================
|
||||
[HttpGet]
|
||||
[Route("GetEventsForCalendar")]
|
||||
public IActionResult GetEventsForCalendar([FromQuery] DateTime? start, [FromQuery] DateTime? end)
|
||||
public async Task<IActionResult> GetEventsForCalendar([FromQuery] DateTime? start, [FromQuery] DateTime? end, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var query = _db.Events.Where(e => e.IsDeleted != true);
|
||||
var events = await _calendarService.GetEventsForCalendarAsync(start, end, cancellationToken);
|
||||
|
||||
// Filter by date range if provided
|
||||
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)
|
||||
);
|
||||
}
|
||||
|
||||
var events = query
|
||||
.Select(e => new Event_DTO
|
||||
{
|
||||
Id = e.Id,
|
||||
Title = e.Title,
|
||||
Description = e.Description,
|
||||
Location = e.Location,
|
||||
RecordID = e.RecordID,
|
||||
RecordName = e.RecordName,
|
||||
RecordTargetType = e.RecordTargetType,
|
||||
ReminderMinutes = e.ReminderMinutes,
|
||||
EventColor = e.EventColor,
|
||||
StartDate = e.StartDate,
|
||||
StartTime = e.StartTime,
|
||||
EndDate = e.EndDate,
|
||||
EndTime = e.EndTime,
|
||||
AllDay = e.AllDay,
|
||||
CreatedDate = e.CreatedDate,
|
||||
createdby = e.createdby
|
||||
})
|
||||
.ToList();
|
||||
|
||||
return Ok(new DataResponse { Message = "Success", Status = "200", Data = events });
|
||||
return Ok(new DataResponse { Message = "Success", Status = "200", Data = events.Select(MapToResponse).ToList() });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
private static EditEventInput MapToInput(EditEvent_DTO eventDto)
|
||||
{
|
||||
return new EditEventInput
|
||||
{
|
||||
Id = eventDto.Id,
|
||||
Title = eventDto.Title,
|
||||
Description = eventDto.Description,
|
||||
Location = eventDto.Location,
|
||||
RecordID = eventDto.RecordID,
|
||||
RecordName = eventDto.RecordName,
|
||||
RecordTargetType = eventDto.RecordTargetType,
|
||||
ReminderMinutes = eventDto.ReminderMinutes,
|
||||
EventColor = eventDto.EventColor,
|
||||
StartDate = eventDto.StartDate,
|
||||
StartTime = eventDto.StartTime,
|
||||
EndDate = eventDto.EndDate,
|
||||
EndTime = eventDto.EndTime,
|
||||
AllDay = eventDto.AllDay
|
||||
};
|
||||
}
|
||||
|
||||
private static Event_DTO MapToResponse(EventDTO dto)
|
||||
{
|
||||
return new Event_DTO
|
||||
{
|
||||
Id = dto.Id,
|
||||
Title = dto.Title,
|
||||
Description = dto.Description,
|
||||
Location = dto.Location,
|
||||
RecordID = dto.RecordID,
|
||||
RecordName = dto.RecordName,
|
||||
RecordTargetType = dto.RecordTargetType,
|
||||
ReminderMinutes = dto.ReminderMinutes,
|
||||
EventColor = dto.EventColor,
|
||||
StartDate = dto.StartDate,
|
||||
StartTime = dto.StartTime,
|
||||
EndDate = dto.EndDate,
|
||||
EndTime = dto.EndTime,
|
||||
AllDay = dto.AllDay,
|
||||
CreatedDate = dto.CreatedDate,
|
||||
createdby = dto.createdby
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,136 +1,101 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Api.SeaHavenIndustries.Helper.ViewModel;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
[Authorize]
|
||||
[ApiController]
|
||||
[Route("[controller]")]
|
||||
|
||||
|
||||
public class CommonController : Controller
|
||||
{
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly ApplicationDbContext _db;
|
||||
public CommonController(UserManager<ApplicationUser> userManager, ApplicationDbContext db)
|
||||
private readonly ICommonService _commonService;
|
||||
private readonly ILogger<CommonController> _logger;
|
||||
|
||||
public CommonController(ICommonService commonService, ILogger<CommonController> logger)
|
||||
{
|
||||
_userManager = userManager;
|
||||
_db = db;
|
||||
_commonService = commonService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetUsers")]
|
||||
public async Task<IActionResult> GetUsers(string? search = "", int page = 1, int pageSize = 10)
|
||||
public async Task<IActionResult> GetUsers(string? search = "", int page = 1, int pageSize = 10, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
var allUsersQuery = _db.Users
|
||||
.Where(w => (w.FirstName ?? "").ToLower().Contains((search ?? "").ToLower()))
|
||||
.OrderByDescending(d => d.Id);
|
||||
var result = await _commonService.GetUsersPagedAsync(search, page, pageSize, cancellationToken);
|
||||
|
||||
var totalCount = allUsersQuery.Count();
|
||||
|
||||
var paginatedUsers = allUsersQuery
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToList();
|
||||
// Calculate the number of pages
|
||||
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
|
||||
|
||||
var filteredUsers = new List<UserRoleViewModel>();
|
||||
|
||||
foreach (var user in paginatedUsers)
|
||||
var filteredUsers = result.Users.Select(u => new UserRoleViewModel
|
||||
{
|
||||
var roles = await _userManager.GetRolesAsync(user);
|
||||
if (!roles.Contains("Admin"))
|
||||
{
|
||||
filteredUsers.Add(new UserRoleViewModel
|
||||
{
|
||||
RoleName = roles.Count()>0?roles.First():"",
|
||||
Email = user.Email,
|
||||
UserName = user.FirstName,
|
||||
Date = user.CreatedDate?.Date.ToString(),
|
||||
Status = user.UniqueName,
|
||||
Id = user.Id
|
||||
});
|
||||
}
|
||||
}
|
||||
// Create a view model containing the paged items and pagination metadata
|
||||
RoleName = u.RoleName,
|
||||
Email = u.Email,
|
||||
UserName = u.UserName,
|
||||
Date = u.Date,
|
||||
Status = u.Status,
|
||||
Id = u.Id
|
||||
}).ToList();
|
||||
|
||||
var viewModel = new Pagination_DTO
|
||||
{
|
||||
Data = filteredUsers,
|
||||
PageNumber = page,
|
||||
PageSize = pageSize,
|
||||
TotalCount = totalCount,
|
||||
TotalPages = totalPages
|
||||
PageNumber = result.PageNumber,
|
||||
PageSize = result.PageSize,
|
||||
TotalCount = result.TotalCount,
|
||||
TotalPages = result.TotalPages
|
||||
};
|
||||
return Ok(viewModel);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetRoles")]
|
||||
public async Task<IActionResult> GetRoles()
|
||||
public async Task<IActionResult> GetRoles(CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var data = await _db.Roles.Select(s => new {Id=s.Name,s.Name}).ToListAsync();
|
||||
|
||||
var data = await _commonService.GetRolesAsync(cancellationToken);
|
||||
|
||||
return Ok(data);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetSitesName")]
|
||||
public async Task<IActionResult> GetSiteName()
|
||||
public async Task<IActionResult> GetSiteName(CancellationToken cancellationToken)
|
||||
{
|
||||
var data =await _db.Locations.Select(n=> new
|
||||
{
|
||||
n.Id,
|
||||
n.Name,
|
||||
n.Title
|
||||
}).ToListAsync();
|
||||
var data = await _commonService.GetSiteNamesAsync(cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetContacts")]
|
||||
public async Task<IActionResult> GetContacts()
|
||||
public async Task<IActionResult> GetContacts(CancellationToken cancellationToken)
|
||||
{
|
||||
var data =await _db.Contacts.Select(n=> new
|
||||
{
|
||||
n.Id,
|
||||
Name = (n.FirstName + " " + n.LastName).Trim(),
|
||||
email=n.Email,
|
||||
phone=n.PhoneNumber
|
||||
}).ToListAsync();
|
||||
var data = await _commonService.GetContactsAsync(cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetCategories")]
|
||||
public async Task<IActionResult> GetCategories()
|
||||
public async Task<IActionResult> GetCategories(CancellationToken cancellationToken)
|
||||
{
|
||||
var data = await _db.Categories.Select(s=> new
|
||||
{
|
||||
s.Id,
|
||||
s.Name
|
||||
}).ToListAsync();
|
||||
var data = await _commonService.GetCategoriesAsync(cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -10,29 +9,24 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/[controller]")]
|
||||
public class DashboardController : Controller
|
||||
{
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly IDashboardService _dashboardService;
|
||||
|
||||
public DashboardController(ApplicationDbContext db)
|
||||
public DashboardController(IDashboardService dashboardService)
|
||||
{
|
||||
_db = db;
|
||||
_dashboardService = dashboardService;
|
||||
}
|
||||
|
||||
[HttpGet("Stats")]
|
||||
public async Task<IActionResult> GetStats()
|
||||
public async Task<IActionResult> GetStats(CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _db.workOrders.Where(w => w.istemplate != true);
|
||||
|
||||
var total = await query.CountAsync();
|
||||
var open = await query.CountAsync(w => w.Status == "Open" || w.Status == "In Progress" || w.Status == "On Hold");
|
||||
var notDispatched = await query.CountAsync(w => (w.Status == "Open") && (w.AssignTo == null || w.AssignTo == ""));
|
||||
var completed = await query.CountAsync(w => w.Status == "Done");
|
||||
var stats = await _dashboardService.GetStatsAsync(cancellationToken);
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
total,
|
||||
open,
|
||||
notDispatched,
|
||||
completed
|
||||
total = stats.Total,
|
||||
open = stats.Open,
|
||||
notDispatched = stats.NotDispatched,
|
||||
completed = stats.Completed
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using SeaHaven.Services.DTOs;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -14,12 +12,10 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
public class DispatchController : Controller
|
||||
{
|
||||
private readonly IDispatchService _dispatchService;
|
||||
private readonly ApplicationDbContext _db; // Keep for complex queries
|
||||
|
||||
public DispatchController(IDispatchService dispatchService, ApplicationDbContext db)
|
||||
public DispatchController(IDispatchService dispatchService)
|
||||
{
|
||||
_dispatchService = dispatchService;
|
||||
_db = db;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
|
|
@ -32,317 +28,29 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[FromQuery] string? sortBy = "dispatchedAt",
|
||||
[FromQuery] string? sortDir = "desc",
|
||||
[FromQuery] int page = 1,
|
||||
[FromQuery] int pageSize = 25)
|
||||
[FromQuery] int pageSize = 25,
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
var q = _db.Dispatches
|
||||
.Include(d => d.Vendor)
|
||||
.Include(d => d.WorkOrder).ThenInclude(w => w!.Locations)
|
||||
.Where(d => d.IsDeleted == null || d.IsDeleted == false);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(search))
|
||||
{
|
||||
var s = search.ToLower();
|
||||
q = q.Where(d =>
|
||||
(d.DispatchNumber ?? "").ToLower().Contains(s) ||
|
||||
(d.PONumber ?? "").ToLower().Contains(s) ||
|
||||
(d.Vendor != null && (d.Vendor.CompanyName ?? "").ToLower().Contains(s)) ||
|
||||
(d.WorkOrder != null && (d.WorkOrder.InternalWONumber ?? "").ToLower().Contains(s)) ||
|
||||
(d.WorkOrder != null && (d.WorkOrder.WorkerOrderTitle ?? "").ToLower().Contains(s)) ||
|
||||
(d.WorkOrder != null && d.WorkOrder.Locations != null && (d.WorkOrder.Locations.Name ?? "").ToLower().Contains(s))
|
||||
);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(status))
|
||||
q = q.Where(d => d.Status == status);
|
||||
|
||||
if (vendorId.HasValue)
|
||||
q = q.Where(d => d.VendorId == vendorId.Value);
|
||||
|
||||
if (dateFrom.HasValue)
|
||||
q = q.Where(d => d.DispatchedAt >= dateFrom.Value);
|
||||
|
||||
if (dateTo.HasValue)
|
||||
{
|
||||
var end = dateTo.Value.Date.AddDays(1);
|
||||
q = q.Where(d => d.DispatchedAt < end);
|
||||
}
|
||||
|
||||
var total = await q.CountAsync();
|
||||
|
||||
var dir = (sortDir ?? "desc").ToLowerInvariant() == "asc";
|
||||
switch ((sortBy ?? "").ToLowerInvariant())
|
||||
{
|
||||
case "ponumber":
|
||||
q = dir ? q.OrderBy(d => d.PONumber) : q.OrderByDescending(d => d.PONumber);
|
||||
break;
|
||||
case "dispatchnumber":
|
||||
q = dir ? q.OrderBy(d => d.DispatchNumber) : q.OrderByDescending(d => d.DispatchNumber);
|
||||
break;
|
||||
case "vendor":
|
||||
q = dir ? q.OrderBy(d => d.Vendor!.CompanyName) : q.OrderByDescending(d => d.Vendor!.CompanyName);
|
||||
break;
|
||||
case "nte":
|
||||
case "nteamount":
|
||||
q = dir ? q.OrderBy(d => d.NTEAmount) : q.OrderByDescending(d => d.NTEAmount);
|
||||
break;
|
||||
case "status":
|
||||
q = dir ? q.OrderBy(d => d.Status) : q.OrderByDescending(d => d.Status);
|
||||
break;
|
||||
case "scheduleddate":
|
||||
q = dir ? q.OrderBy(d => d.ScheduledDate) : q.OrderByDescending(d => d.ScheduledDate);
|
||||
break;
|
||||
case "completeddate":
|
||||
q = dir ? q.OrderBy(d => d.CompletedDate) : q.OrderByDescending(d => d.CompletedDate);
|
||||
break;
|
||||
default:
|
||||
q = dir ? q.OrderBy(d => d.DispatchedAt) : q.OrderByDescending(d => d.DispatchedAt);
|
||||
break;
|
||||
}
|
||||
|
||||
var rows = await q
|
||||
.Skip((Math.Max(page, 1) - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.Select(d => new
|
||||
{
|
||||
d.Id,
|
||||
d.DispatchNumber,
|
||||
d.PONumber,
|
||||
d.NTEAmount,
|
||||
d.Status,
|
||||
d.DispatchedAt,
|
||||
d.ScheduledDate,
|
||||
d.CompletedDate,
|
||||
d.AcknowledgedAt,
|
||||
d.VerifiedAt,
|
||||
VendorId = d.VendorId,
|
||||
VendorName = d.Vendor != null ? d.Vendor.CompanyName : null,
|
||||
WorkOrderId = d.WorkOrderId,
|
||||
PrimaryWOInternalNumber = d.WorkOrder != null ? d.WorkOrder.InternalWONumber : null,
|
||||
PrimaryWOTitle = d.WorkOrder != null ? d.WorkOrder.WorkerOrderTitle : null,
|
||||
LocationName = d.WorkOrder != null && d.WorkOrder.Locations != null ? d.WorkOrder.Locations.Name : null,
|
||||
WorkOrderCount = _db.DispatchWorkOrders.Count(dwo => dwo.DispatchId == d.Id),
|
||||
PendingUpliftCount = _db.DispatchUpliftRequests.Count(u => u.DispatchId == d.Id && u.Status == "Pending" && (u.IsDeleted == null || u.IsDeleted == false))
|
||||
})
|
||||
.ToListAsync();
|
||||
var result = await _dispatchService.GetDispatchListAsync(
|
||||
search, status, vendorId, dateFrom, dateTo, sortBy, sortDir, page, pageSize, cancellationToken);
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new { total, page, pageSize, items = rows }
|
||||
Data = new { total = result.Total, page = result.Page, pageSize = result.PageSize, items = result.Items }
|
||||
});
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}")]
|
||||
public async Task<IActionResult> GetById(int id)
|
||||
public async Task<IActionResult> GetById(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var dispatch = await _db.Dispatches
|
||||
.Include(d => d.Vendor)
|
||||
.Include(d => d.WorkOrder).ThenInclude(w => w!.Locations)
|
||||
.FirstOrDefaultAsync(d => d.Id == id);
|
||||
var dispatch = await _dispatchService.GetDispatchDetailAsync(id, cancellationToken);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
var linkedWOs = await _db.DispatchWorkOrders
|
||||
.Where(dwo => dwo.DispatchId == id)
|
||||
.Select(dwo => new
|
||||
{
|
||||
dwo.WorkOrderId,
|
||||
InternalWONumber = dwo.WorkOrder != null ? dwo.WorkOrder.InternalWONumber : null,
|
||||
Title = dwo.WorkOrder != null ? dwo.WorkOrder.WorkerOrderTitle : null,
|
||||
Priority = dwo.WorkOrder != null ? dwo.WorkOrder.Priority : null,
|
||||
Status = dwo.WorkOrder != null ? dwo.WorkOrder.Status : null,
|
||||
LocationName = dwo.WorkOrder != null && dwo.WorkOrder.Locations != null ? dwo.WorkOrder.Locations.Name : null,
|
||||
Trade = dwo.WorkOrder != null ? dwo.WorkOrder.Trade : null,
|
||||
SubTrade = dwo.WorkOrder != null ? dwo.WorkOrder.SubTrade : null,
|
||||
Problem = dwo.WorkOrder != null ? dwo.WorkOrder.Problem : null
|
||||
}).ToListAsync();
|
||||
|
||||
if (linkedWOs.Count == 0 && dispatch.WorkOrderId.HasValue)
|
||||
{
|
||||
var wo = await _db.workOrders
|
||||
.Include(w => w.Locations)
|
||||
.FirstOrDefaultAsync(w => w.Id == dispatch.WorkOrderId.Value);
|
||||
if (wo != null)
|
||||
{
|
||||
linkedWOs = new[] { new
|
||||
{
|
||||
WorkOrderId = wo.Id,
|
||||
InternalWONumber = wo.InternalWONumber,
|
||||
Title = wo.WorkerOrderTitle,
|
||||
Priority = wo.Priority,
|
||||
Status = wo.Status,
|
||||
LocationName = wo.Locations != null ? wo.Locations.Name : null,
|
||||
Trade = wo.Trade,
|
||||
SubTrade = wo.SubTrade,
|
||||
Problem = wo.Problem
|
||||
}}.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
var checklist = await _db.DispatchChecklistItems
|
||||
.Where(c => c.DispatchId == id && (c.IsDeleted == null || c.IsDeleted == false))
|
||||
.OrderBy(c => c.SortOrder)
|
||||
.Select(c => new { c.Id, c.ItemText, c.IsCompleted, c.CompletedBy, c.CompletedAt, c.SortOrder, c.WorkOrderId })
|
||||
.ToListAsync();
|
||||
|
||||
var signoffs = await _db.DispatchSignoffs
|
||||
.Where(s => s.DispatchId == id && (s.IsDeleted == null || s.IsDeleted == false))
|
||||
.Select(s => new { s.Id, s.SignoffType, s.Name, s.Signature, s.SignatureMethod, s.SignedAt })
|
||||
.ToListAsync();
|
||||
|
||||
var rawComments = await (from c in _db.Comments
|
||||
where c.DispatchId == id && (c.IsDeleted == null || c.IsDeleted == false)
|
||||
join u in _db.Users on c.UserId equals u.Id into users
|
||||
from u in users.DefaultIfEmpty()
|
||||
orderby c.CreatedDate
|
||||
select new
|
||||
{
|
||||
c.Id,
|
||||
c.Commenttext,
|
||||
c.Commenter,
|
||||
c.CommentType,
|
||||
c.RecordType,
|
||||
c.CreatedDate,
|
||||
c.UserId,
|
||||
UserFirstName = u != null ? u.FirstName : null,
|
||||
UserLastName = u != null ? u.LastName : null
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var comments = rawComments.Select(c => new
|
||||
{
|
||||
c.Id,
|
||||
c.Commenttext,
|
||||
c.Commenter,
|
||||
c.CommentType,
|
||||
c.RecordType,
|
||||
c.CreatedDate,
|
||||
UserName = string.Join(" ", new[] { c.UserFirstName, c.UserLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim()
|
||||
}).ToList();
|
||||
|
||||
var rawUplifts = await (from u in _db.DispatchUpliftRequests
|
||||
where u.DispatchId == id && (u.IsDeleted == null || u.IsDeleted == false)
|
||||
join dec in _db.Users on u.DecidedByUserId equals dec.Id into decs
|
||||
from dec in decs.DefaultIfEmpty()
|
||||
orderby u.CreatedDate descending
|
||||
select new
|
||||
{
|
||||
u.Id,
|
||||
u.CurrentNTE,
|
||||
u.RequestedNTE,
|
||||
u.VendorReason,
|
||||
u.Status,
|
||||
u.RequiredTier,
|
||||
u.RequestedByVendorName,
|
||||
RequestedAt = u.CreatedDate,
|
||||
u.DecidedAt,
|
||||
u.DecisionNote,
|
||||
DecidedByFirstName = dec != null ? dec.FirstName : null,
|
||||
DecidedByLastName = dec != null ? dec.LastName : null
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var upliftRequests = rawUplifts.Select(u => new
|
||||
{
|
||||
u.Id,
|
||||
u.CurrentNTE,
|
||||
u.RequestedNTE,
|
||||
Delta = u.RequestedNTE - (u.CurrentNTE ?? 0m),
|
||||
u.VendorReason,
|
||||
u.Status,
|
||||
u.RequiredTier,
|
||||
u.RequestedByVendorName,
|
||||
u.RequestedAt,
|
||||
u.DecidedAt,
|
||||
u.DecisionNote,
|
||||
DecidedByName = string.Join(" ", new[] { u.DecidedByFirstName, u.DecidedByLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim()
|
||||
}).ToList();
|
||||
|
||||
var dispatchNumber = dispatch.DispatchNumber ?? "";
|
||||
var workOrderIds = linkedWOs.Select(l => l.WorkOrderId).Where(wid => wid > 0).ToList();
|
||||
|
||||
var rawAudit = await (from a in _db.WorkOrderAuditLogs
|
||||
where workOrderIds.Contains(a.WorkOrderId)
|
||||
&& a.FieldName != null
|
||||
&& a.FieldName.Contains(dispatchNumber)
|
||||
join u in _db.Users on a.UserId equals u.Id into users
|
||||
from u in users.DefaultIfEmpty()
|
||||
orderby a.CreatedAt descending
|
||||
select new
|
||||
{
|
||||
a.Id,
|
||||
a.Action,
|
||||
a.FieldName,
|
||||
a.OldValue,
|
||||
a.NewValue,
|
||||
a.CreatedAt,
|
||||
a.UserId,
|
||||
UserFirstName = u != null ? u.FirstName : null,
|
||||
UserLastName = u != null ? u.LastName : null
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var auditLog = rawAudit.Select(a => new
|
||||
{
|
||||
Id = a.Id,
|
||||
Action = a.Action,
|
||||
FieldName = a.FieldName,
|
||||
OldValue = a.OldValue,
|
||||
NewValue = a.NewValue,
|
||||
CreatedAt = a.CreatedAt,
|
||||
UserName = string.Join(" ", new[] { a.UserFirstName, a.UserLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim()
|
||||
}).ToList();
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new
|
||||
{
|
||||
dispatch.Id,
|
||||
dispatch.DispatchNumber,
|
||||
dispatch.PONumber,
|
||||
dispatch.NTEAmount,
|
||||
dispatch.Description,
|
||||
dispatch.Status,
|
||||
dispatch.ScheduledDate,
|
||||
dispatch.CompletedDate,
|
||||
dispatch.DispatchedAt,
|
||||
dispatch.AcknowledgedAt,
|
||||
dispatch.VerifiedAt,
|
||||
dispatch.VerifiedBy,
|
||||
dispatch.EmailSent,
|
||||
dispatch.WorkOrderId,
|
||||
Vendor = dispatch.Vendor == null ? null : new
|
||||
{
|
||||
dispatch.Vendor.Id,
|
||||
dispatch.Vendor.CompanyName,
|
||||
dispatch.Vendor.ContactName,
|
||||
dispatch.Vendor.Email,
|
||||
dispatch.Vendor.Phone,
|
||||
dispatch.Vendor.Address,
|
||||
dispatch.Vendor.City,
|
||||
dispatch.Vendor.State,
|
||||
dispatch.Vendor.Zip,
|
||||
dispatch.Vendor.TradeSpecialties
|
||||
},
|
||||
PrimaryLocation = dispatch.WorkOrder?.Locations == null ? null : new
|
||||
{
|
||||
dispatch.WorkOrder.Locations.Id,
|
||||
dispatch.WorkOrder.Locations.Name,
|
||||
dispatch.WorkOrder.Locations.Address1,
|
||||
dispatch.WorkOrder.Locations.City,
|
||||
dispatch.WorkOrder.Locations.State,
|
||||
dispatch.WorkOrder.Locations.Zip
|
||||
},
|
||||
WorkOrders = linkedWOs,
|
||||
Checklist = checklist,
|
||||
Signoffs = signoffs,
|
||||
Comments = comments,
|
||||
UpliftRequests = upliftRequests,
|
||||
AuditLog = auditLog
|
||||
}
|
||||
Data = dispatch
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -10,78 +13,82 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/[controller]")]
|
||||
public class DropdownOptionsController : Controller
|
||||
{
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly IDropdownOptionsService _dropdownOptionsService;
|
||||
private readonly ILogger<DropdownOptionsController> _logger;
|
||||
|
||||
public DropdownOptionsController(ApplicationDbContext db)
|
||||
public DropdownOptionsController(IDropdownOptionsService dropdownOptionsService, ILogger<DropdownOptionsController> logger)
|
||||
{
|
||||
_db = db;
|
||||
_dropdownOptionsService = dropdownOptionsService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetAll([FromQuery] string? category = null)
|
||||
public async Task<IActionResult> GetAll([FromQuery] string? category = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var query = _db.DropdownOptions.Where(d => d.IsActive);
|
||||
if (!string.IsNullOrWhiteSpace(category))
|
||||
query = query.Where(d => d.Category == category);
|
||||
|
||||
var data = await query.OrderBy(d => d.Category).ThenBy(d => d.SortOrder).ThenBy(d => d.Value).ToListAsync();
|
||||
var data = await _dropdownOptionsService.GetAllAsync(category, cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpGet("ByCategory/{category}")]
|
||||
public async Task<IActionResult> GetByCategory(string category, [FromQuery] string? parent = null)
|
||||
public async Task<IActionResult> GetByCategory(string category, [FromQuery] string? parent = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var query = _db.DropdownOptions.Where(d => d.IsActive && d.Category == category);
|
||||
if (!string.IsNullOrWhiteSpace(parent))
|
||||
query = query.Where(d => d.ParentValue == parent);
|
||||
|
||||
var data = await query.OrderBy(d => d.SortOrder).ThenBy(d => d.Value).ToListAsync();
|
||||
var data = await _dropdownOptionsService.GetByCategoryAsync(category, parent, cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> Create([FromBody] DropdownOption model)
|
||||
public async Task<IActionResult> Create([FromBody] DropdownOption_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(model.Category) || string.IsNullOrWhiteSpace(model.Value))
|
||||
return BadRequest(new { message = "Category and Value are required" });
|
||||
|
||||
var existing = await _db.DropdownOptions
|
||||
.AnyAsync(d => d.Category == model.Category && d.Value == model.Value && d.ParentValue == model.ParentValue);
|
||||
if (existing)
|
||||
return BadRequest(new { message = "This option already exists" });
|
||||
|
||||
model.Id = 0;
|
||||
model.IsActive = true;
|
||||
_db.DropdownOptions.Add(model);
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(model);
|
||||
try
|
||||
{
|
||||
var created = await _dropdownOptionsService.CreateAsync(MapToService(model), cancellationToken);
|
||||
return Ok(created);
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new { message = _logger.Sanitize(ex, "The dropdown option could not be saved") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPut("{id}")]
|
||||
public async Task<IActionResult> Update(int id, [FromBody] DropdownOption model)
|
||||
public async Task<IActionResult> Update(int id, [FromBody] DropdownOption_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
var item = await _db.DropdownOptions.FindAsync(id);
|
||||
if (item == null)
|
||||
try
|
||||
{
|
||||
var updated = await _dropdownOptionsService.UpdateAsync(id, MapToService(model), cancellationToken);
|
||||
return Ok(updated);
|
||||
}
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
return NotFound(new { message = "Option not found" });
|
||||
|
||||
item.Value = model.Value;
|
||||
item.ParentValue = model.ParentValue;
|
||||
item.SortOrder = model.SortOrder;
|
||||
item.IsActive = model.IsActive;
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(item);
|
||||
}
|
||||
}
|
||||
|
||||
[HttpDelete("{id}")]
|
||||
public async Task<IActionResult> Delete(int id)
|
||||
public async Task<IActionResult> Delete(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var item = await _db.DropdownOptions.FindAsync(id);
|
||||
if (item == null)
|
||||
try
|
||||
{
|
||||
await _dropdownOptionsService.DeleteAsync(id, cancellationToken);
|
||||
return Ok(new { message = "Deleted" });
|
||||
}
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
return NotFound(new { message = "Option not found" });
|
||||
}
|
||||
}
|
||||
|
||||
_db.DropdownOptions.Remove(item);
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { message = "Deleted" });
|
||||
private static DropdownOptionDTO MapToService(DropdownOption_DTO model)
|
||||
{
|
||||
return new DropdownOptionDTO
|
||||
{
|
||||
Id = model.Id,
|
||||
Category = model.Category,
|
||||
Value = model.Value,
|
||||
ParentValue = model.ParentValue,
|
||||
SortOrder = model.SortOrder,
|
||||
IsActive = model.IsActive
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
using System.Security.Claims;
|
||||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentValidation;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
[ApiController]
|
||||
[Authorize]
|
||||
|
|
@ -17,16 +16,12 @@ using SeaHaven.DataServices.Interfaces;
|
|||
public class FollowUpController : ControllerBase
|
||||
{
|
||||
private readonly IFollowUpService _followUpService;
|
||||
private readonly IFollowUpDataService _followUpDataService; // Keep for direct entity operations
|
||||
private readonly ApplicationDbContext _db; // Keep for User lookups
|
||||
private readonly UserManager<ApplicationUser> _users;
|
||||
private readonly ILogger<FollowUpController> _logger;
|
||||
|
||||
public FollowUpController(IFollowUpService followUpService, IFollowUpDataService followUpDataService, ApplicationDbContext db, UserManager<ApplicationUser> users)
|
||||
public FollowUpController(IFollowUpService followUpService, ILogger<FollowUpController> logger)
|
||||
{
|
||||
_followUpService = followUpService;
|
||||
_followUpDataService = followUpDataService;
|
||||
_db = db;
|
||||
_users = users;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet("GetFollowUpList")]
|
||||
|
|
@ -34,70 +29,31 @@ public class FollowUpController : ControllerBase
|
|||
string? search = "",
|
||||
string? status = "Open",
|
||||
int page = 1,
|
||||
int pageSize = 12)
|
||||
int pageSize = 12,
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
status = string.IsNullOrWhiteSpace(status) ? "Open" : status;
|
||||
|
||||
var pagedResult = await _followUpService.GetFollowUpsPagedAsync(page, pageSize, search, status);
|
||||
var pagedResult = await _followUpService.GetFollowUpListAsync(page, pageSize, search, status, cancellationToken);
|
||||
var items = pagedResult.Items;
|
||||
|
||||
var rows = items.Select(x => new
|
||||
var data = items.Select(x => new
|
||||
{
|
||||
Id = x.Id,
|
||||
Reason = x.Reason,
|
||||
ScheduleDate = x.ScheduleDate,
|
||||
ScheduleStartTime = x.ScheduleStartTime,
|
||||
EmployeeId = x.EmployeeId,
|
||||
WorkOrderId = x.WorkOrderId,
|
||||
AccountId = x.AccountId,
|
||||
LocationId = x.LocationId,
|
||||
AccountName = x.AccountName ?? "",
|
||||
AssignedTo = x.EmployeeName ?? "",
|
||||
LocationName = x.LocationName ?? "",
|
||||
WorkOrderNumber = "",
|
||||
InternalWONumber = "",
|
||||
Status = x.Status,
|
||||
CreatedDate = x.CreatedDate,
|
||||
CreatedById = (string?)null
|
||||
}).ToList();
|
||||
|
||||
var creatorIds = rows
|
||||
.Select(r => r.CreatedById)
|
||||
.Where(id => !string.IsNullOrEmpty(id))
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
var creators = await _db.Users
|
||||
.Where(u => creatorIds.Contains(u.Id))
|
||||
.Select(u => new { u.Id, u.FirstName, u.LastName, u.UserName })
|
||||
.ToDictionaryAsync(u => u.Id, u => u);
|
||||
|
||||
string NameFor(string? userId)
|
||||
{
|
||||
if (string.IsNullOrEmpty(userId) || !creators.TryGetValue(userId, out var u)) return "";
|
||||
var full = ((u.FirstName ?? "") + " " + (u.LastName ?? "")).Trim();
|
||||
return string.IsNullOrWhiteSpace(full) ? (u.UserName ?? "") : full;
|
||||
}
|
||||
|
||||
var data = rows.Select(r => new
|
||||
{
|
||||
r.Id,
|
||||
r.Reason,
|
||||
r.ScheduleDate,
|
||||
r.ScheduleStartTime,
|
||||
r.EmployeeId,
|
||||
r.WorkOrderId,
|
||||
r.AccountId,
|
||||
r.LocationId,
|
||||
r.AccountName,
|
||||
r.AssignedTo,
|
||||
r.LocationName,
|
||||
r.WorkOrderNumber,
|
||||
r.InternalWONumber,
|
||||
r.Status,
|
||||
r.CreatedDate,
|
||||
r.CreatedById,
|
||||
CreatedByName = NameFor(r.CreatedById)
|
||||
x.Id,
|
||||
x.Reason,
|
||||
x.ScheduleDate,
|
||||
x.ScheduleStartTime,
|
||||
x.EmployeeId,
|
||||
x.WorkOrderId,
|
||||
x.AccountId,
|
||||
x.LocationId,
|
||||
x.AccountName,
|
||||
x.AssignedTo,
|
||||
x.LocationName,
|
||||
x.WorkOrderNumber,
|
||||
x.InternalWONumber,
|
||||
x.Status,
|
||||
x.CreatedDate,
|
||||
x.CreatedById,
|
||||
x.CreatedByName
|
||||
}).ToList();
|
||||
|
||||
return Ok(new Pagination_DTO
|
||||
|
|
@ -111,26 +67,12 @@ public class FollowUpController : ControllerBase
|
|||
}
|
||||
|
||||
[HttpGet("GetById")]
|
||||
public async Task<IActionResult> GetById(int id)
|
||||
public async Task<IActionResult> GetById(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var model = await _followUpDataService.GetByIdWithDetailsAsync(id);
|
||||
var model = await _followUpService.GetFollowUpDetailAsync(id, cancellationToken);
|
||||
|
||||
if (model == null) return NotFound();
|
||||
|
||||
string createdByName = "";
|
||||
if (!string.IsNullOrEmpty(model.createdby))
|
||||
{
|
||||
var u = await _db.Users
|
||||
.Where(x => x.Id == model.createdby)
|
||||
.Select(x => new { x.FirstName, x.LastName, x.UserName })
|
||||
.FirstOrDefaultAsync();
|
||||
if (u != null)
|
||||
{
|
||||
var n = ((u.FirstName ?? "") + " " + (u.LastName ?? "")).Trim();
|
||||
createdByName = string.IsNullOrWhiteSpace(n) ? (u.UserName ?? "") : n;
|
||||
}
|
||||
}
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
model.Id,
|
||||
|
|
@ -141,22 +83,20 @@ public class FollowUpController : ControllerBase
|
|||
model.WorkOrderId,
|
||||
model.AccountId,
|
||||
model.LocationId,
|
||||
AccountName = model.Account?.Name ?? "",
|
||||
AssignedTo = model.Employee != null
|
||||
? (model.Employee.FirstName + " " + model.Employee.LastName)
|
||||
: "",
|
||||
LocationName = model.Location?.Name ?? "",
|
||||
WorkOrderNumber = model.WorkOrder?.WorkerOrderNumber ?? "",
|
||||
InternalWONumber = model.WorkOrder?.InternalWONumber ?? "",
|
||||
model.AccountName,
|
||||
model.AssignedTo,
|
||||
model.LocationName,
|
||||
model.WorkOrderNumber,
|
||||
model.InternalWONumber,
|
||||
model.Status,
|
||||
model.CreatedDate,
|
||||
CreatedById = model.createdby,
|
||||
CreatedByName = createdByName
|
||||
model.CreatedById,
|
||||
model.CreatedByName
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("Create")]
|
||||
public async Task<IActionResult> Create(FollowUp_DTO dto)
|
||||
public async Task<IActionResult> Create(FollowUp_DTO dto, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -164,23 +104,9 @@ public class FollowUpController : ControllerBase
|
|||
if (userId == null)
|
||||
return Unauthorized(new Response { Status = "Error", Message = "User not authenticated" });
|
||||
|
||||
var model = new FollowUps
|
||||
{
|
||||
Reason = dto.Reason,
|
||||
ScheduleDate = dto.ScheduleDate,
|
||||
ScheduleStartTime = dto.ScheduleStartTime,
|
||||
EmployeeId = dto.EmployeeId,
|
||||
WorkOrderId = dto.WorkOrderId,
|
||||
AccountId = dto.AccountId,
|
||||
LocationId = dto.LocationId,
|
||||
Status = "Open",
|
||||
CreatedDate = DateTime.UtcNow,
|
||||
createdby = userId
|
||||
};
|
||||
var id = await _followUpService.CreateOpenFollowUpAsync(MapToCreateRequest(dto), userId, cancellationToken);
|
||||
|
||||
await _followUpDataService.AddAsync(model);
|
||||
|
||||
return Ok(new DataResponse { Status = "200", Message = "Follow Up created", Data = model.Id });
|
||||
return Ok(new DataResponse { Status = "200", Message = "Follow Up created", Data = id });
|
||||
}
|
||||
catch (ValidationException vex)
|
||||
{
|
||||
|
|
@ -189,29 +115,16 @@ public class FollowUpController : ControllerBase
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("Update")]
|
||||
public async Task<IActionResult> Update(FollowUp_DTO dto)
|
||||
public async Task<IActionResult> Update(FollowUp_DTO dto, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = await _followUpDataService.GetByIdAsync(dto.Id);
|
||||
if (model == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Follow Up not found" });
|
||||
|
||||
model.Reason = dto.Reason;
|
||||
model.ScheduleDate = dto.ScheduleDate;
|
||||
model.ScheduleStartTime = dto.ScheduleStartTime;
|
||||
model.EmployeeId = dto.EmployeeId;
|
||||
model.WorkOrderId = dto.WorkOrderId;
|
||||
model.AccountId = dto.AccountId;
|
||||
model.LocationId = dto.LocationId;
|
||||
model.LastModificationTime = DateTime.UtcNow;
|
||||
|
||||
await _followUpDataService.UpdateAsync(model);
|
||||
await _followUpService.UpdateFollowUpFieldsAsync(dto.Id, MapToUpdateRequest(dto), cancellationToken);
|
||||
return Ok(new DataResponse { Status = "200", Message = "Follow Up updated" });
|
||||
}
|
||||
catch (ValidationException vex)
|
||||
|
|
@ -225,47 +138,37 @@ public class FollowUpController : ControllerBase
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("Complete")]
|
||||
public async Task<IActionResult> Complete(int id)
|
||||
public async Task<IActionResult> Complete(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var model = await _followUpDataService.GetByIdAsync(id);
|
||||
if (model == null) return NotFound();
|
||||
|
||||
model.Status = "Completed";
|
||||
model.LastModificationTime = DateTime.UtcNow;
|
||||
await _followUpDataService.UpdateAsync(model);
|
||||
var found = await _followUpService.SetFollowUpStatusAsync(id, "Completed", cancellationToken);
|
||||
if (!found) return NotFound();
|
||||
|
||||
return Ok();
|
||||
}
|
||||
|
||||
[HttpPost("Cancel")]
|
||||
public async Task<IActionResult> Cancel(int id)
|
||||
public async Task<IActionResult> Cancel(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var model = await _followUpDataService.GetByIdAsync(id);
|
||||
if (model == null) return NotFound();
|
||||
|
||||
model.Status = "Cancelled";
|
||||
model.LastModificationTime = DateTime.UtcNow;
|
||||
await _followUpDataService.UpdateAsync(model);
|
||||
var found = await _followUpService.SetFollowUpStatusAsync(id, "Cancelled", cancellationToken);
|
||||
if (!found) return NotFound();
|
||||
|
||||
return Ok();
|
||||
}
|
||||
|
||||
[HttpPost("Delete")]
|
||||
public async Task<IActionResult> Delete(int id)
|
||||
public async Task<IActionResult> Delete(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var model = await _followUpDataService.GetByIdAsync(id);
|
||||
if (model == null)
|
||||
var found = await _followUpService.RemoveFollowUpAsync(id, cancellationToken);
|
||||
if (!found)
|
||||
return NotFound(new Response { Status = "Error", Message = "Follow Up not found" });
|
||||
|
||||
await _followUpDataService.DeleteAsync(id);
|
||||
|
||||
return Ok(new DataResponse { Status = "200", Message = "Follow Up deleted" });
|
||||
}
|
||||
catch (KeyNotFoundException)
|
||||
|
|
@ -274,7 +177,36 @@ public class FollowUpController : ControllerBase
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
private static FollowUpCreateRequestDTO MapToCreateRequest(FollowUp_DTO dto)
|
||||
{
|
||||
return new FollowUpCreateRequestDTO
|
||||
{
|
||||
Reason = dto.Reason,
|
||||
ScheduleDate = dto.ScheduleDate,
|
||||
ScheduleStartTime = dto.ScheduleStartTime,
|
||||
EmployeeId = dto.EmployeeId,
|
||||
WorkOrderId = dto.WorkOrderId,
|
||||
AccountId = dto.AccountId,
|
||||
LocationId = dto.LocationId
|
||||
};
|
||||
}
|
||||
|
||||
private static FollowUpUpdateRequestDTO MapToUpdateRequest(FollowUp_DTO dto)
|
||||
{
|
||||
return new FollowUpUpdateRequestDTO
|
||||
{
|
||||
Id = dto.Id,
|
||||
Reason = dto.Reason,
|
||||
ScheduleDate = dto.ScheduleDate,
|
||||
ScheduleStartTime = dto.ScheduleStartTime,
|
||||
EmployeeId = dto.EmployeeId,
|
||||
WorkOrderId = dto.WorkOrderId,
|
||||
AccountId = dto.AccountId,
|
||||
LocationId = dto.LocationId
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentValidation;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using System.Security.Claims;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -18,12 +17,12 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
public class LocationController : Controller
|
||||
{
|
||||
private readonly ILocationService _locationService;
|
||||
private readonly ILocationDataService _locationDataService; // Keep for direct entity operations
|
||||
private readonly ILogger<LocationController> _logger;
|
||||
|
||||
public LocationController(ILocationService locationService, ILocationDataService locationDataService)
|
||||
public LocationController(ILocationService locationService, ILogger<LocationController> logger)
|
||||
{
|
||||
_locationService = locationService;
|
||||
_locationDataService = locationDataService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet("sites")]
|
||||
|
|
@ -34,9 +33,9 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
|
||||
[HttpGet("GetLocationList")]
|
||||
public async Task<IActionResult> GetLocationList(string? search = "", int page = 1, int pageSize = 10)
|
||||
public async Task<IActionResult> GetLocationList(string? search = "", int page = 1, int pageSize = 10, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var pagedResult = await _locationService.GetLocationsPagedAsync(page, pageSize, search);
|
||||
var pagedResult = await _locationService.GetLocationListPagedAsync(page, pageSize, search, cancellationToken);
|
||||
|
||||
var data = pagedResult.Items.Select(l => new
|
||||
{
|
||||
|
|
@ -68,9 +67,9 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
|
||||
[HttpGet("{id}")]
|
||||
public async Task<IActionResult> GetLocationById(int id)
|
||||
public async Task<IActionResult> GetLocationById(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var location = await _locationDataService.GetByIdAsync(id);
|
||||
var location = await _locationService.GetLocationDetailAsync(id, cancellationToken);
|
||||
|
||||
if (location == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Location not found" });
|
||||
|
|
@ -96,25 +95,11 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> AddLocation([FromBody] Location_DTO model)
|
||||
public async Task<IActionResult> AddLocation([FromBody] Location_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var location = new Locations
|
||||
{
|
||||
Name = model.Name,
|
||||
Title = model.Title,
|
||||
Address1 = model.Address,
|
||||
City = model.City,
|
||||
State = model.State,
|
||||
Zip = model.ZipCode,
|
||||
PhoneNumber = model.Phone,
|
||||
Email = model.ContactEmail,
|
||||
Status = model.Status,
|
||||
CreatedDate = DateTime.Now
|
||||
};
|
||||
|
||||
await _locationDataService.AddAsync(location);
|
||||
await _locationService.CreateLocationFromRequestAsync(MapToCreateRequest(model), cancellationToken);
|
||||
return Ok(new DataResponse { Message = "Location Created Successfully", Status = "200" });
|
||||
}
|
||||
catch (ValidationException vex)
|
||||
|
|
@ -124,31 +109,16 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPut("{id}")]
|
||||
public async Task<IActionResult> EditLocation(int id, [FromBody] EditLocation_DTO model)
|
||||
public async Task<IActionResult> EditLocation(int id, [FromBody] EditLocation_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var exist = await _locationDataService.GetByIdAsync(id);
|
||||
if (exist == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Location not found" });
|
||||
|
||||
exist.Name = model.Name;
|
||||
exist.Title = model.Title;
|
||||
exist.Address1 = model.Address;
|
||||
exist.City = model.City;
|
||||
exist.State = model.State;
|
||||
exist.Zip = model.ZipCode;
|
||||
exist.PhoneNumber = model.Phone;
|
||||
exist.Email = model.ContactEmail;
|
||||
exist.Status = model.Status;
|
||||
exist.LastModificationTime = DateTime.Now;
|
||||
|
||||
await _locationDataService.UpdateAsync(exist);
|
||||
await _locationService.UpdateLocationFromRequestAsync(id, MapToUpdateRequest(model), cancellationToken);
|
||||
return Ok(new DataResponse { Message = "Location Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (ValidationException vex)
|
||||
|
|
@ -162,20 +132,19 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpDelete("{id}")]
|
||||
public async Task<IActionResult> DeleteLocation(int id)
|
||||
public async Task<IActionResult> DeleteLocation(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var exist = await _locationDataService.GetByIdAsync(id);
|
||||
if (exist == null)
|
||||
var found = await _locationService.DeleteLocationByIdAsync(id, cancellationToken);
|
||||
if (!found)
|
||||
return NotFound(new Response { Status = "Error", Message = "Location not found" });
|
||||
|
||||
await _locationDataService.DeleteAsync(id);
|
||||
return Ok(new DataResponse { Message = "Location Deleted Successfully", Status = "200" });
|
||||
}
|
||||
catch (KeyNotFoundException)
|
||||
|
|
@ -184,14 +153,46 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("DeleteLocation")]
|
||||
public async Task<IActionResult> DeleteLocationByQuery(int id)
|
||||
public async Task<IActionResult> DeleteLocationByQuery(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await DeleteLocation(id);
|
||||
return await DeleteLocation(id, cancellationToken);
|
||||
}
|
||||
|
||||
private static LocationCreateRequestDTO MapToCreateRequest(Location_DTO model)
|
||||
{
|
||||
return new LocationCreateRequestDTO
|
||||
{
|
||||
Name = model.Name,
|
||||
Title = model.Title,
|
||||
Address = model.Address,
|
||||
City = model.City,
|
||||
State = model.State,
|
||||
ZipCode = model.ZipCode,
|
||||
Phone = model.Phone,
|
||||
ContactEmail = model.ContactEmail,
|
||||
Status = model.Status
|
||||
};
|
||||
}
|
||||
|
||||
private static LocationUpdateRequestDTO MapToUpdateRequest(EditLocation_DTO model)
|
||||
{
|
||||
return new LocationUpdateRequestDTO
|
||||
{
|
||||
Name = model.Name,
|
||||
Title = model.Title,
|
||||
Address = model.Address,
|
||||
City = model.City,
|
||||
State = model.State,
|
||||
ZipCode = model.ZipCode,
|
||||
Phone = model.Phone,
|
||||
ContactEmail = model.ContactEmail,
|
||||
Status = model.Status
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Data.SqlClient;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Linq;
|
||||
using static System.Runtime.InteropServices.JavaScript.JSType;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -15,178 +14,82 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/Quotes")]
|
||||
public class QuotesController : Controller
|
||||
{
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly IWebHostEnvironment _webHostEnvironment;
|
||||
IHttpContextAccessor _httpContext;
|
||||
public QuotesController(UserManager<ApplicationUser> userManager, ApplicationDbContext db, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContext)
|
||||
private readonly IQuotesService _quotesService;
|
||||
private readonly ILogger<QuotesController> _logger;
|
||||
|
||||
public QuotesController(IQuotesService quotesService, ILogger<QuotesController> logger)
|
||||
{
|
||||
_userManager = userManager;
|
||||
_db = db;
|
||||
_webHostEnvironment = webHostEnvironment;
|
||||
_httpContext = httpContext;
|
||||
_quotesService = quotesService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("AddQuote")]
|
||||
public async Task<IActionResult> AddQuote([FromBody] Quote_DTO model)
|
||||
public async Task<IActionResult> AddQuote([FromBody] Quote_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
Random rnd = new Random();
|
||||
int id = rnd.Next(1, 99999);
|
||||
Quotes quotes = new Quotes();
|
||||
quotes.QuotId = id.ToString();
|
||||
quotes.ContactId = model.ContactId;
|
||||
quotes.PO = model.PO;
|
||||
quotes.TT = model.TT;
|
||||
quotes.ProjectName = model.ProjectName;
|
||||
quotes.Date = DateTime.Parse(model.Date);
|
||||
quotes.WorkorderId = model.WorkorderId;
|
||||
quotes.SiteName = model.SiteName;
|
||||
quotes.SiteId = model.SiteId;
|
||||
quotes.BillingAddress = model.BillingAddress;
|
||||
quotes.LineItems = quotes.LineItems == null ? new List<QuotesLineItems>() : quotes.LineItems;
|
||||
if (model.LineItems != null && model.LineItems.Any())
|
||||
{
|
||||
foreach (var lineItemDto in model.LineItems)
|
||||
{
|
||||
QuotesLineItems lineItem = new QuotesLineItems()
|
||||
{
|
||||
LineitemNumber = lineItemDto.LineitemNumber,
|
||||
Lineitem = lineItemDto.Lineitem,
|
||||
Descriptions = lineItemDto.Descriptions
|
||||
};
|
||||
quotes.LineItems.Add(lineItem);
|
||||
}
|
||||
}
|
||||
_db.Quotes.Add(quotes);
|
||||
await _db.SaveChangesAsync();
|
||||
await _quotesService.CreateQuoteAsync(MapToCreateInput(model), cancellationToken);
|
||||
|
||||
return Ok(new DataResponse { Message = "Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPut]
|
||||
[Route("EditQuote")]
|
||||
public async Task<IActionResult> EditQuote([FromBody] EditQuote_DTO model)
|
||||
public async Task<IActionResult> EditQuote([FromBody] EditQuote_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var quotes = _db.Quotes.Where(w => w.Id == model.id).FirstOrDefault();
|
||||
if (quotes != null)
|
||||
{
|
||||
quotes.QuotId = model.QuotId;
|
||||
quotes.ContactId = model.ContactId;
|
||||
quotes.PO = model.PO;
|
||||
quotes.TT = model.TT;
|
||||
quotes.ProjectName = model.ProjectName;
|
||||
quotes.Date = DateTime.Parse(model.Date);
|
||||
quotes.WorkorderId = model.WorkorderId;
|
||||
quotes.SiteName = model.SiteName;
|
||||
quotes.SiteId = model.SiteId;
|
||||
quotes.BillingAddress = model.BillingAddress;
|
||||
|
||||
var existQuoteLine = _db.QuotesLines.Where(w => w.QuoteId == model.id).ToList();
|
||||
if (existQuoteLine.Count() > 0)
|
||||
{
|
||||
_db.QuotesLines.RemoveRange(existQuoteLine);
|
||||
}
|
||||
quotes.LineItems = quotes.LineItems == null ? new List<QuotesLineItems>() : quotes.LineItems;
|
||||
if (model.LineItems != null && model.LineItems.Any())
|
||||
{
|
||||
foreach (var lineItemDto in model.LineItems)
|
||||
{
|
||||
QuotesLineItems lineItem = new QuotesLineItems()
|
||||
{
|
||||
LineitemNumber = lineItemDto.LineitemNumber,
|
||||
Lineitem = lineItemDto.Lineitem,
|
||||
Descriptions = lineItemDto.Descriptions
|
||||
};
|
||||
quotes.LineItems.Add(lineItem);
|
||||
}
|
||||
}
|
||||
_db.Update(quotes);
|
||||
}
|
||||
else
|
||||
{
|
||||
var updated = await _quotesService.UpdateQuoteAsync(MapToUpdateInput(model), cancellationToken);
|
||||
if (!updated)
|
||||
return BadRequest("ID not matched!");
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return Ok(new DataResponse { Message = "Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpDelete]
|
||||
[Route("DeleteQuote")]
|
||||
public IActionResult DeleteQuote(EditQuote_DTO model)
|
||||
public async Task<IActionResult> DeleteQuote(EditQuote_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
int id = model.id;
|
||||
try
|
||||
try
|
||||
{
|
||||
var data = _db.Quotes.Where(w => w.Id == id).FirstOrDefault();
|
||||
if (data != null)
|
||||
{
|
||||
var existlineitem = _db.QuotesLines.Where(w => w.QuoteId == id).ToList();
|
||||
if (existlineitem.Any())
|
||||
{
|
||||
_db.QuotesLines.RemoveRange(existlineitem);
|
||||
}
|
||||
_db.Quotes.Remove(data);
|
||||
}
|
||||
else
|
||||
{
|
||||
var deleted = await _quotesService.DeleteQuoteAsync(id, cancellationToken);
|
||||
if (!deleted)
|
||||
return BadRequest("ID not matched!");
|
||||
}
|
||||
_db.SaveChanges();
|
||||
|
||||
return Ok(new DataResponse { Message = "Removed Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetQuoutes")]
|
||||
public IActionResult GetQuotes(string search = "", int page = 1, int pageSize = 10)
|
||||
public async Task<IActionResult> GetQuotes(string search = "", int page = 1, int pageSize = 10, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var totalCount = _db.Quotes.Count();
|
||||
var data = _db.Quotes.Include(s => s.WorkOrder).AsNoTracking().Where(w => (w.QuotId ?? "").ToLower().Contains(search.ToLower()) || (w.SiteName ?? "").ToLower().Contains(search.ToLower()) || (w.WorkOrder != null && (w.WorkOrder.WorkerOrderTitle ?? "").ToLower().Contains(search.ToLower()))).Select(s => new
|
||||
{
|
||||
s.Id,
|
||||
QuoteId = "QO-" + s.QuotId,
|
||||
WorkOrder = s.WorkOrder != null ? s.WorkOrder.WorkerOrderNumber : "",
|
||||
s.ProjectName,
|
||||
TotalAmount = "$" + (s.LineItems != null ? s.LineItems.Sum(l => l.Lineitem ?? 0) : 0).ToString(),
|
||||
s.SiteName,
|
||||
s.SiteId,
|
||||
s.PO,
|
||||
s.TT,
|
||||
s.BillingAddress,
|
||||
s.Status,
|
||||
s.ContactId,
|
||||
s.Date,
|
||||
lineitems = s.LineItems.Select(q => new { q.Descriptions, q.Lineitem, q.LineitemNumber}),
|
||||
}).OrderByDescending(d => d.Id).Skip((page - 1) * pageSize)
|
||||
.Take(pageSize).ToList();
|
||||
var result = await _quotesService.GetQuotesPagedAsync(page, pageSize, search, cancellationToken);
|
||||
|
||||
// Calculate the number of pages
|
||||
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
|
||||
var totalPages = (int)Math.Ceiling(result.TotalCount / (double)pageSize);
|
||||
|
||||
// Create a view model containing the paged items and pagination metadata
|
||||
var viewModel = new Pagination_DTO
|
||||
{
|
||||
Data = data,
|
||||
Data = result.Items,
|
||||
PageNumber = page,
|
||||
PageSize = pageSize,
|
||||
TotalCount = totalCount,
|
||||
TotalCount = result.TotalCount,
|
||||
TotalPages = totalPages
|
||||
};
|
||||
return Ok(viewModel);
|
||||
|
|
@ -194,66 +97,85 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
|
||||
[HttpGet]
|
||||
[Route("GetQuoutesdetailsAgainstWorkOrder")]
|
||||
public async Task<IActionResult> GetQuoutesdetailsAgainstWorkOrder(int woId)
|
||||
public async Task<IActionResult> GetQuoutesdetailsAgainstWorkOrder(int woId, CancellationToken cancellationToken)
|
||||
{
|
||||
var data = await _db.workOrders.Include(s => s.Locations).Where(w => w.Id == woId).Select(s => new
|
||||
{
|
||||
s.Id,
|
||||
s.PO,
|
||||
s.TT,
|
||||
Title = s.Locations != null ? s.Locations.Title : "",
|
||||
Name = s.Locations != null ? s.Locations.Name : ""
|
||||
}).ToListAsync();
|
||||
var data = await _quotesService.GetWorkOrderQuoteDetailsAsync(woId, cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetQuoutesById")]
|
||||
public async Task<IActionResult> GetQuoutesById(int id)
|
||||
public async Task<IActionResult> GetQuoutesById(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var data = await _db.Quotes.Where(s => s.Id == id).Include(s => s.WorkOrder).Select(s => new
|
||||
{
|
||||
s.Id,
|
||||
s.QuotId,
|
||||
s.Date,
|
||||
Name = s.Contacts != null ? (s.Contacts.FirstName + " " + s.Contacts.LastName).Trim() : "",
|
||||
s.PO,
|
||||
s.TT,
|
||||
s.SiteName,
|
||||
s.ProjectName,
|
||||
s.SiteId,
|
||||
s.BillingAddress,
|
||||
s.ShippingAddress,
|
||||
lineitems = s.LineItems.Select(q => new { q.Descriptions, q.Lineitem }),
|
||||
TotalAmount = "$" + (s.LineItems != null ? s.LineItems.Sum(l => l.Lineitem ?? 0) : 0).ToString()
|
||||
}).FirstOrDefaultAsync();
|
||||
var data = await _quotesService.GetQuoteDetailsByIdAsync(id, cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetReporting")]
|
||||
public async Task<IActionResult> GetReporting()
|
||||
public async Task<IActionResult> GetReporting(CancellationToken cancellationToken)
|
||||
{
|
||||
var totalCreatedWorkOrder = await _db.workOrders.CountAsync();
|
||||
var totalCompleted = _db.workOrders.Count(w => w.Status == "Done");
|
||||
var totalSev1 = _db.workOrders.Count(w => w.Priority == "Sev 1");
|
||||
var totalSev2 = _db.workOrders.Count(w => w.Priority == "Sev 2");
|
||||
var totalSev3 = _db.workOrders.Count(w => w.Priority == "Sev 3");
|
||||
var totalSev4 = _db.workOrders.Count(w => w.Priority == "Sev 4");
|
||||
var totalSev5 = _db.workOrders.Count(w => w.Priority == "Sev 5");
|
||||
var data = await _quotesService.GetReportingAsync(cancellationToken);
|
||||
|
||||
var data = new Reporting_DTO
|
||||
var reportingDto = new Reporting_DTO
|
||||
{
|
||||
TotalCreatedWorkOrder = totalCreatedWorkOrder,
|
||||
TotalCompleted = totalCompleted,
|
||||
TotalSev1 = totalSev1,
|
||||
TotalSev2 = totalSev2,
|
||||
TotalSev3 = totalSev3,
|
||||
TotalSev4 = totalSev4,
|
||||
TotalSev5 = totalSev5
|
||||
TotalCreatedWorkOrder = data.TotalCreatedWorkOrder,
|
||||
TotalCompleted = data.TotalCompleted,
|
||||
TotalSev1 = data.TotalSev1,
|
||||
TotalSev2 = data.TotalSev2,
|
||||
TotalSev3 = data.TotalSev3,
|
||||
TotalSev4 = data.TotalSev4,
|
||||
TotalSev5 = data.TotalSev5
|
||||
};
|
||||
|
||||
return Ok(data);
|
||||
return Ok(reportingDto);
|
||||
}
|
||||
|
||||
private static CreateQuoteInput MapToCreateInput(Quote_DTO dto)
|
||||
{
|
||||
return new CreateQuoteInput
|
||||
{
|
||||
QuotId = dto.QuotId,
|
||||
ContactId = dto.ContactId,
|
||||
PO = dto.PO,
|
||||
TT = dto.TT,
|
||||
ProjectName = dto.ProjectName,
|
||||
Date = dto.Date != null ? DateTime.Parse(dto.Date) : null,
|
||||
WorkorderId = dto.WorkorderId,
|
||||
SiteName = dto.SiteName,
|
||||
SiteId = dto.SiteId,
|
||||
BillingAddress = dto.BillingAddress,
|
||||
LineItems = dto.LineItems?.Select(li => new QuoteLineItemInput
|
||||
{
|
||||
LineitemNumber = li.LineitemNumber,
|
||||
Lineitem = li.Lineitem,
|
||||
Descriptions = li.Descriptions
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
|
||||
private static UpdateQuoteInput MapToUpdateInput(EditQuote_DTO dto)
|
||||
{
|
||||
return new UpdateQuoteInput
|
||||
{
|
||||
Id = dto.id,
|
||||
QuotId = dto.QuotId,
|
||||
ContactId = dto.ContactId,
|
||||
PO = dto.PO,
|
||||
TT = dto.TT,
|
||||
ProjectName = dto.ProjectName,
|
||||
Date = dto.Date != null ? DateTime.Parse(dto.Date) : null,
|
||||
WorkorderId = dto.WorkorderId,
|
||||
SiteName = dto.SiteName,
|
||||
SiteId = dto.SiteId,
|
||||
BillingAddress = dto.BillingAddress,
|
||||
LineItems = dto.LineItems?.Select(li => new QuoteLineItemInput
|
||||
{
|
||||
LineitemNumber = li.LineitemNumber,
|
||||
Lineitem = li.Lineitem,
|
||||
Descriptions = li.Descriptions
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Api.SeaHavenIndustries.Helper.ViewModel;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using static System.Runtime.InteropServices.JavaScript.JSType;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -14,107 +14,78 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("[controller]")]
|
||||
public class SettingsController : Controller
|
||||
{
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly ApplicationDbContext _db;
|
||||
public SettingsController(UserManager<ApplicationUser> userManager, ApplicationDbContext db)
|
||||
private readonly ISettingsService _settingsService;
|
||||
private readonly ILogger<SettingsController> _logger;
|
||||
|
||||
public SettingsController(ISettingsService settingsService, ILogger<SettingsController> logger)
|
||||
{
|
||||
_userManager = userManager;
|
||||
_db = db;
|
||||
_settingsService = settingsService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("AddCategory")]
|
||||
public async Task<IActionResult> AddCategory(Category_DTO model)
|
||||
public async Task<IActionResult> AddCategory(Category_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
Category category = new Category();
|
||||
category.Name = model.Name;
|
||||
_db.Categories.Add(category);
|
||||
await _db.SaveChangesAsync();
|
||||
await _settingsService.AddCategoryAsync(model.Name, cancellationToken);
|
||||
return Ok(new DataResponse { Message = "Successfully Saved Data", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("EditCategory")]
|
||||
public async Task<IActionResult> EditCategory(EditCategory_DTO model)
|
||||
public async Task<IActionResult> EditCategory(EditCategory_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var exist = _db.Categories.Where(w => w.Id == model.Id).FirstOrDefault();
|
||||
if (exist == null)
|
||||
var found = await _settingsService.UpdateCategoryAsync(model.Id, model.Name, cancellationToken);
|
||||
if (!found)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Category not found" });
|
||||
exist.Name = model.Name;
|
||||
_db.Categories.Update(exist);
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Message = "Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("DeleteCategory")]
|
||||
public async Task<IActionResult> DeleteCategory(int id)
|
||||
public async Task<IActionResult> DeleteCategory(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var exist = _db.Categories.Where(w => w.Id == id).FirstOrDefault();
|
||||
if (exist != null)
|
||||
{
|
||||
var chkexist = _db.Templates.Where(w => w.CategoryId == id).ToList();
|
||||
if (chkexist != null)
|
||||
{
|
||||
_db.RemoveRange(chkexist);
|
||||
}
|
||||
var chkworkordercategory = _db.workOrderCategories.Where(w => w.CategoryId == id).ToList();
|
||||
if (chkworkordercategory != null)
|
||||
{
|
||||
_db.RemoveRange(chkworkordercategory);
|
||||
}
|
||||
_db.Remove(exist);
|
||||
}
|
||||
else
|
||||
{
|
||||
var found = await _settingsService.DeleteCategoryAsync(id, cancellationToken);
|
||||
if (!found)
|
||||
return BadRequest(new Response { Status = "Error", Message = "ID not matched!" });
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Message = "Deleted Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetCategoryList")]
|
||||
public IActionResult GetCategoryList(int page = 1, int pageSize = 10)
|
||||
public async Task<IActionResult> GetCategoryList(int page = 1, int pageSize = 10, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var totalCount = _db.Categories.Count();
|
||||
var data = _db.Categories.Select(s => new
|
||||
{
|
||||
s.Id,
|
||||
s.Name
|
||||
}).OrderByDescending(d => d.Id).Skip((page - 1) * pageSize)
|
||||
.Take(pageSize).ToList();
|
||||
var (items, total) = await _settingsService.GetCategoryListAsync(page, pageSize, cancellationToken);
|
||||
|
||||
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
|
||||
var totalPages = (int)Math.Ceiling(total / (double)pageSize);
|
||||
|
||||
var viewModel = new Pagination_DTO
|
||||
{
|
||||
Data = data,
|
||||
Data = items,
|
||||
PageNumber = page,
|
||||
PageSize = pageSize,
|
||||
TotalCount = totalCount,
|
||||
TotalCount = total,
|
||||
TotalPages = totalPages
|
||||
};
|
||||
return Ok(viewModel);
|
||||
|
|
@ -122,117 +93,79 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
|
||||
[HttpGet]
|
||||
[Route("GetTemplates")]
|
||||
public IActionResult GetTemplates(int page = 1, int pageSize = 10)
|
||||
public async Task<IActionResult> GetTemplates(int page = 1, int pageSize = 10, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
var totalCount = _db.workOrders.Where(w=> w.istemplate == true).Count();
|
||||
var data = _db.workOrders.Where(w => w.istemplate == true).OrderByDescending(d => d.Id).Skip((page - 1) * pageSize)
|
||||
.Take(pageSize).ToList();
|
||||
var (items, total) = await _settingsService.GetTemplatesAsync(page, pageSize, cancellationToken);
|
||||
|
||||
// Calculate the number of pages
|
||||
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
|
||||
var totalPages = (int)Math.Ceiling(total / (double)pageSize);
|
||||
|
||||
// Create a view model containing the paged items and pagination metadata
|
||||
var viewModel = new Pagination_DTO
|
||||
{
|
||||
Data = data,
|
||||
Data = items,
|
||||
PageNumber = page,
|
||||
PageSize = pageSize,
|
||||
TotalCount = totalCount,
|
||||
TotalCount = total,
|
||||
TotalPages = totalPages
|
||||
};
|
||||
return Ok(viewModel);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetUsers")]
|
||||
public async Task<IActionResult> GetUsers(string? search = "", int page = 1, int pageSize = 10)
|
||||
public async Task<IActionResult> GetUsers(string? search = "", int page = 1, int pageSize = 10, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
var totalCount = _db.Users.Count();
|
||||
var allUsers = _db.Users.Where(w => (w.FirstName ?? "").ToLower().Contains((search ?? "").ToLower())).OrderByDescending(d => d.Id).Skip((page - 1) * pageSize)
|
||||
.Take(pageSize).ToList();
|
||||
var (users, total) = await _settingsService.GetUsersAsync(search, page, pageSize, cancellationToken);
|
||||
|
||||
// Calculate the number of pages
|
||||
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
|
||||
|
||||
var filteredUsers = new List<UserRoleViewModel>();
|
||||
|
||||
foreach (var user in allUsers)
|
||||
var filteredUsers = users.Select(u => new UserRoleViewModel
|
||||
{
|
||||
var roles = await _userManager.GetRolesAsync(user);
|
||||
if (!roles.Contains("Admin"))
|
||||
{
|
||||
filteredUsers.Add(new UserRoleViewModel
|
||||
{
|
||||
RoleName = roles.Count() > 0 ? roles.First() : "",
|
||||
Email = user.Email,
|
||||
UserName = user.FirstName,
|
||||
Date = user.CreatedDate?.Date.ToString(),
|
||||
Status = user.UniqueName,
|
||||
Id = user.Id
|
||||
});
|
||||
}
|
||||
}
|
||||
// Create a view model containing the paged items and pagination metadata
|
||||
RoleName = u.RoleName,
|
||||
Email = u.Email,
|
||||
UserName = u.UserName,
|
||||
Date = u.Date,
|
||||
Status = u.Status,
|
||||
Id = u.Id
|
||||
}).ToList();
|
||||
|
||||
var totalPages = (int)Math.Ceiling(total / (double)pageSize);
|
||||
|
||||
var viewModel = new Pagination_DTO
|
||||
{
|
||||
Data = filteredUsers,
|
||||
PageNumber = page,
|
||||
PageSize = pageSize,
|
||||
TotalCount = totalCount,
|
||||
TotalCount = total,
|
||||
TotalPages = totalPages
|
||||
};
|
||||
return Ok(viewModel);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("GetRoles")]
|
||||
public async Task<IActionResult> GetRoles()
|
||||
public async Task<IActionResult> GetRoles(CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var data = _db.Roles.ToList();
|
||||
List<Roles_DTO> roles = new List<Roles_DTO>();
|
||||
foreach (var role in data)
|
||||
{
|
||||
if (role.Name == "Admin")
|
||||
{
|
||||
roles.Add(new Roles_DTO { Name = role.Name, Description = "Full Access" });
|
||||
}
|
||||
else if(role.Name == "Supervisor")
|
||||
{
|
||||
roles.Add(new Roles_DTO { Name = role.Name, Description = "Access to Team's Work Orders Only" });
|
||||
|
||||
}
|
||||
else if(role.Name == "Manager")
|
||||
{
|
||||
roles.Add(new Roles_DTO { Name = role.Name, Description = "Full access accept quotes" });
|
||||
|
||||
}
|
||||
else if(role.Name =="User")
|
||||
{
|
||||
roles.Add(new Roles_DTO { Name = role.Name, Description = "Access to Assigned Work Orders Only" });
|
||||
|
||||
}
|
||||
}
|
||||
return Ok(roles);
|
||||
var roles = await _settingsService.GetRolesAsync(cancellationToken);
|
||||
var result = roles.Select(r => new Roles_DTO { Name = r.Name, Description = r.Description }).ToList();
|
||||
return Ok(result);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
using Amazon.DynamoDBv2;
|
||||
using Amazon.DynamoDBv2.Model;
|
||||
using Api.SeaHavenIndustries.Options;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Options;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -14,18 +11,13 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/[controller]")]
|
||||
public class SyncController : Controller
|
||||
{
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly AmazonDynamoDBClient _dynamo;
|
||||
private readonly ISyncService _syncService;
|
||||
private readonly SyncOptions _syncOptions;
|
||||
private const string WO_TABLE = "WorkOrders";
|
||||
private const string COMMENTS_TABLE = "WorkOrderComments";
|
||||
private const string VENDOR_REPLIES_TABLE = "VendorReplies";
|
||||
|
||||
public SyncController(ApplicationDbContext db, IOptions<SyncOptions> syncOptions)
|
||||
public SyncController(ISyncService syncService, IOptions<SyncOptions> syncOptions)
|
||||
{
|
||||
_db = db;
|
||||
_syncService = syncService;
|
||||
_syncOptions = syncOptions.Value;
|
||||
_dynamo = new AmazonDynamoDBClient(Amazon.RegionEndpoint.USEast1);
|
||||
}
|
||||
|
||||
private IActionResult? SyncDisabledResult()
|
||||
|
|
@ -40,419 +32,73 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
|
||||
[HttpPost("WorkOrders")]
|
||||
public async Task<IActionResult> SyncWorkOrders()
|
||||
public async Task<IActionResult> SyncWorkOrders(CancellationToken cancellationToken)
|
||||
{
|
||||
if (SyncDisabledResult() is { } disabled)
|
||||
return disabled;
|
||||
var synced = 0;
|
||||
var created = 0;
|
||||
var updated = 0;
|
||||
var locationsCreated = 0;
|
||||
|
||||
var lastInternalWO = await _db.workOrders
|
||||
.Where(w => w.InternalWONumber != null && w.InternalWONumber != "")
|
||||
.OrderByDescending(w => w.InternalWONumber)
|
||||
.Select(w => w.InternalWONumber)
|
||||
.FirstOrDefaultAsync();
|
||||
int nextInternal = 10000001;
|
||||
if (lastInternalWO != null && int.TryParse(lastInternalWO, out var parsed))
|
||||
nextInternal = parsed + 1;
|
||||
|
||||
Dictionary<string, AttributeValue>? lastKey = null;
|
||||
|
||||
do
|
||||
{
|
||||
var request = new ScanRequest
|
||||
{
|
||||
TableName = WO_TABLE,
|
||||
Limit = 100,
|
||||
ExclusiveStartKey = lastKey
|
||||
};
|
||||
|
||||
var response = await _dynamo.ScanAsync(request);
|
||||
|
||||
foreach (var item in response.Items)
|
||||
{
|
||||
var externalId = GetString(item, "work_order_id");
|
||||
if (string.IsNullOrEmpty(externalId)) continue;
|
||||
|
||||
var existing = await _db.workOrders
|
||||
.FirstOrDefaultAsync(w => w.ExternalWorkOrderId == externalId);
|
||||
|
||||
var (locationId, locationWasCreated) = await ResolveLocationId(
|
||||
GetString(item, "site_code"),
|
||||
GetString(item, "building"),
|
||||
GetString(item, "address"));
|
||||
|
||||
if (locationWasCreated)
|
||||
locationsCreated++;
|
||||
|
||||
if (existing == null)
|
||||
{
|
||||
var wo = new WorkOrder
|
||||
{
|
||||
InternalWONumber = (nextInternal++).ToString("D8"),
|
||||
ExternalWorkOrderId = externalId,
|
||||
WorkerOrderNumber = externalId,
|
||||
WorkerOrderTitle = GetString(item, "description"),
|
||||
Description = GetString(item, "description"),
|
||||
Status = MapStatus(GetString(item, "wo_status")),
|
||||
Priority = MapSeverityToPriority(GetString(item, "severity")),
|
||||
Severity = GetString(item, "severity"),
|
||||
Customer = GetString(item, "customer"),
|
||||
SiteCode = GetString(item, "site_code"),
|
||||
Building = GetString(item, "building"),
|
||||
LocationId = locationId,
|
||||
DueDate = ParseDate(GetString(item, "due_date")),
|
||||
DateReported = ParseDate(GetString(item, "date_reported")),
|
||||
ScheduledStart = ParseDate(GetString(item, "scheduled_start")),
|
||||
AssignTo = null,
|
||||
SourceEmailS3Key = GetString(item, "source_email_s3_key"),
|
||||
CreatedDate = ParseDate(GetString(item, "created_at")) ?? DateTime.UtcNow,
|
||||
istemplate = false
|
||||
};
|
||||
_db.workOrders.Add(wo);
|
||||
created++;
|
||||
}
|
||||
else
|
||||
{
|
||||
existing.WorkerOrderTitle = GetString(item, "description") ?? existing.WorkerOrderTitle;
|
||||
existing.Description = GetString(item, "description") ?? existing.Description;
|
||||
existing.Status = MapStatus(GetString(item, "wo_status")) ?? existing.Status;
|
||||
existing.Priority = MapSeverityToPriority(GetString(item, "severity")) ?? existing.Priority;
|
||||
existing.Severity = GetString(item, "severity") ?? existing.Severity;
|
||||
existing.SiteCode = GetString(item, "site_code") ?? existing.SiteCode;
|
||||
existing.Building = GetString(item, "building") ?? existing.Building;
|
||||
existing.LocationId = locationId ?? existing.LocationId;
|
||||
existing.DueDate = ParseDate(GetString(item, "due_date")) ?? existing.DueDate;
|
||||
existing.DateReported = ParseDate(GetString(item, "date_reported")) ?? existing.DateReported;
|
||||
existing.ScheduledStart = ParseDate(GetString(item, "scheduled_start")) ?? existing.ScheduledStart;
|
||||
existing.SourceEmailS3Key = GetString(item, "source_email_s3_key") ?? existing.SourceEmailS3Key;
|
||||
updated++;
|
||||
}
|
||||
|
||||
synced++;
|
||||
|
||||
if (synced % 100 == 0)
|
||||
await _db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
lastKey = response.LastEvaluatedKey;
|
||||
|
||||
} while (lastKey != null && lastKey.Count > 0);
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
synced,
|
||||
created,
|
||||
updated,
|
||||
locationsCreated = await _db.Locations.CountAsync()
|
||||
});
|
||||
var result = await _syncService.SyncWorkOrdersAsync(cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("Comments")]
|
||||
public async Task<IActionResult> SyncComments()
|
||||
public async Task<IActionResult> SyncComments(CancellationToken cancellationToken)
|
||||
{
|
||||
if (SyncDisabledResult() is { } disabled)
|
||||
return disabled;
|
||||
|
||||
var synced = 0;
|
||||
var created = 0;
|
||||
var skipped = 0;
|
||||
Dictionary<string, AttributeValue>? lastKey = null;
|
||||
|
||||
do
|
||||
{
|
||||
var request = new ScanRequest
|
||||
{
|
||||
TableName = COMMENTS_TABLE,
|
||||
Limit = 100,
|
||||
ExclusiveStartKey = lastKey
|
||||
};
|
||||
|
||||
var response = await _dynamo.ScanAsync(request);
|
||||
|
||||
foreach (var item in response.Items)
|
||||
{
|
||||
var externalCommentId = GetString(item, "comment_id");
|
||||
var externalWoId = GetString(item, "work_order_id");
|
||||
|
||||
if (string.IsNullOrEmpty(externalCommentId) || string.IsNullOrEmpty(externalWoId))
|
||||
continue;
|
||||
|
||||
var alreadyExists = await _db.Comments
|
||||
.AnyAsync(c => c.ExternalCommentId == externalCommentId);
|
||||
|
||||
if (alreadyExists)
|
||||
{
|
||||
skipped++;
|
||||
synced++;
|
||||
continue;
|
||||
}
|
||||
|
||||
var workOrder = await _db.workOrders
|
||||
.FirstOrDefaultAsync(w => w.ExternalWorkOrderId == externalWoId);
|
||||
|
||||
if (workOrder == null)
|
||||
{
|
||||
skipped++;
|
||||
continue;
|
||||
}
|
||||
|
||||
var comment = new Comments
|
||||
{
|
||||
ExternalCommentId = externalCommentId,
|
||||
WorkerOrderId = workOrder.Id,
|
||||
Commenttext = GetString(item, "text"),
|
||||
Commenter = GetString(item, "commenter"),
|
||||
RecordType = GetString(item, "record_type"),
|
||||
CommentType = "customer",
|
||||
CreatedDate = ParseDate(GetString(item, "created_at")) ?? DateTime.UtcNow,
|
||||
};
|
||||
|
||||
_db.Comments.Add(comment);
|
||||
created++;
|
||||
synced++;
|
||||
|
||||
if (synced % 100 == 0)
|
||||
await _db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
lastKey = response.LastEvaluatedKey;
|
||||
|
||||
} while (lastKey != null && lastKey.Count > 0);
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return Ok(new { synced, created, skipped });
|
||||
var result = await _syncService.SyncCommentsAsync(cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("BackfillInternalWONumbers")]
|
||||
public async Task<IActionResult> BackfillInternalWONumbers()
|
||||
public async Task<IActionResult> BackfillInternalWONumbers(CancellationToken cancellationToken)
|
||||
{
|
||||
if (SyncDisabledResult() is { } disabled)
|
||||
return disabled;
|
||||
|
||||
var wosMissing = await _db.workOrders
|
||||
.Where(w => w.InternalWONumber == null || w.InternalWONumber == "")
|
||||
.OrderBy(w => w.Id)
|
||||
.ToListAsync();
|
||||
|
||||
if (wosMissing.Count == 0)
|
||||
return Ok(new { updated = 0 });
|
||||
|
||||
var lastWO = await _db.workOrders
|
||||
.Where(w => w.InternalWONumber != null && w.InternalWONumber != "")
|
||||
.OrderByDescending(w => w.InternalWONumber)
|
||||
.Select(w => w.InternalWONumber)
|
||||
.FirstOrDefaultAsync();
|
||||
|
||||
int next = 10000001;
|
||||
if (lastWO != null && int.TryParse(lastWO, out var lastNum))
|
||||
next = lastNum + 1;
|
||||
|
||||
foreach (var wo in wosMissing)
|
||||
{
|
||||
wo.InternalWONumber = next.ToString("D8");
|
||||
next++;
|
||||
}
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { updated = wosMissing.Count });
|
||||
var result = await _syncService.BackfillInternalWONumbersAsync(cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("BackfillDispatchNumbers")]
|
||||
public async Task<IActionResult> BackfillDispatchNumbers()
|
||||
public async Task<IActionResult> BackfillDispatchNumbers(CancellationToken cancellationToken)
|
||||
{
|
||||
if (SyncDisabledResult() is { } disabled)
|
||||
return disabled;
|
||||
|
||||
var missing = await _db.Dispatches
|
||||
.Where(d => d.DispatchNumber == null || d.DispatchNumber == "")
|
||||
.OrderBy(d => d.Id)
|
||||
.ToListAsync();
|
||||
if (missing.Count == 0) return Ok(new { updated = 0 });
|
||||
|
||||
int next = 1;
|
||||
var last = await _db.Dispatches
|
||||
.Where(d => d.DispatchNumber != null && d.DispatchNumber != "")
|
||||
.OrderByDescending(d => d.DispatchNumber)
|
||||
.Select(d => d.DispatchNumber)
|
||||
.FirstOrDefaultAsync();
|
||||
if (last != null && last.StartsWith("DSP-") && int.TryParse(last.Substring(4), out var n))
|
||||
next = n + 1;
|
||||
|
||||
foreach (var d in missing)
|
||||
{
|
||||
d.DispatchNumber = $"DSP-{next:D5}";
|
||||
next++;
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { updated = missing.Count });
|
||||
var result = await _syncService.BackfillDispatchNumbersAsync(cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("VendorReplies")]
|
||||
public async Task<IActionResult> SyncVendorReplies()
|
||||
public async Task<IActionResult> SyncVendorReplies(CancellationToken cancellationToken)
|
||||
{
|
||||
if (SyncDisabledResult() is { } disabled)
|
||||
return disabled;
|
||||
|
||||
var synced = 0;
|
||||
var created = 0;
|
||||
var skipped = 0;
|
||||
Dictionary<string, AttributeValue>? lastKey = null;
|
||||
|
||||
do
|
||||
{
|
||||
var request = new ScanRequest
|
||||
{
|
||||
TableName = VENDOR_REPLIES_TABLE,
|
||||
Limit = 100,
|
||||
ExclusiveStartKey = lastKey
|
||||
};
|
||||
|
||||
var response = await _dynamo.ScanAsync(request);
|
||||
|
||||
foreach (var item in response.Items)
|
||||
{
|
||||
var replyId = GetString(item, "reply_id");
|
||||
var woNumber = GetString(item, "internal_wo_number");
|
||||
var dispatchNumber = GetString(item, "dispatch_number");
|
||||
|
||||
if (string.IsNullOrEmpty(replyId) || string.IsNullOrEmpty(woNumber))
|
||||
continue;
|
||||
|
||||
var alreadyExists = await _db.Comments
|
||||
.AnyAsync(c => c.ExternalCommentId == replyId);
|
||||
if (alreadyExists) { skipped++; synced++; continue; }
|
||||
|
||||
var workOrder = await _db.workOrders
|
||||
.FirstOrDefaultAsync(w => w.InternalWONumber == woNumber);
|
||||
if (workOrder == null) { skipped++; continue; }
|
||||
|
||||
int? dispatchId = null;
|
||||
if (!string.IsNullOrWhiteSpace(dispatchNumber))
|
||||
{
|
||||
var dispatch = await _db.Dispatches
|
||||
.FirstOrDefaultAsync(d => d.DispatchNumber == dispatchNumber && d.WorkOrderId == workOrder.Id);
|
||||
dispatchId = dispatch?.Id;
|
||||
}
|
||||
|
||||
var comment = new Comments
|
||||
{
|
||||
ExternalCommentId = replyId,
|
||||
WorkerOrderId = workOrder.Id,
|
||||
DispatchId = dispatchId,
|
||||
Commenttext = GetString(item, "reply_text"),
|
||||
Commenter = GetString(item, "sender_email"),
|
||||
CommentType = "vendor",
|
||||
RecordType = "vendor_reply",
|
||||
CreatedDate = ParseDate(GetString(item, "received_at")) ?? DateTime.UtcNow,
|
||||
};
|
||||
|
||||
_db.Comments.Add(comment);
|
||||
created++;
|
||||
synced++;
|
||||
|
||||
if (synced % 50 == 0)
|
||||
await _db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
lastKey = response.LastEvaluatedKey;
|
||||
} while (lastKey != null && lastKey.Count > 0);
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { synced, created, skipped });
|
||||
var result = await _syncService.SyncVendorRepliesAsync(cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("BackfillCommentTypes")]
|
||||
public async Task<IActionResult> BackfillCommentTypes()
|
||||
public async Task<IActionResult> BackfillCommentTypes(CancellationToken cancellationToken)
|
||||
{
|
||||
if (SyncDisabledResult() is { } disabled)
|
||||
return disabled;
|
||||
|
||||
var updated = await _db.Database.ExecuteSqlRawAsync(
|
||||
"UPDATE Comments SET CommentType = 'customer' WHERE ExternalCommentId IS NOT NULL AND (CommentType IS NULL OR CommentType = '')");
|
||||
return Ok(new { updated });
|
||||
var result = await _syncService.BackfillCommentTypesAsync(cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("All")]
|
||||
public async Task<IActionResult> SyncAll()
|
||||
public async Task<IActionResult> SyncAll(CancellationToken cancellationToken)
|
||||
{
|
||||
if (SyncDisabledResult() is { } disabled)
|
||||
return disabled;
|
||||
|
||||
var woResult = await SyncWorkOrders() as OkObjectResult;
|
||||
var commentResult = await SyncComments() as OkObjectResult;
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
workOrders = woResult?.Value,
|
||||
comments = commentResult?.Value
|
||||
});
|
||||
}
|
||||
|
||||
private async Task<(int? LocationId, bool Created)> ResolveLocationId(string? siteCode, string? building, string? address)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(siteCode) && string.IsNullOrWhiteSpace(building))
|
||||
return (null, false);
|
||||
|
||||
var matchCode = siteCode ?? building;
|
||||
var existing = await _db.Locations
|
||||
.FirstOrDefaultAsync(l => l.Name == matchCode || l.Title == matchCode);
|
||||
|
||||
if (existing != null)
|
||||
return (existing.Id, false);
|
||||
|
||||
var location = new Locations
|
||||
{
|
||||
Name = matchCode,
|
||||
Title = building,
|
||||
Address1 = address,
|
||||
Status = "Active"
|
||||
};
|
||||
|
||||
_db.Locations.Add(location);
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return (location.Id, true);
|
||||
}
|
||||
|
||||
private static string? GetString(Dictionary<string, AttributeValue> item, string key)
|
||||
{
|
||||
if (item.TryGetValue(key, out var val) && val.S != null)
|
||||
return val.S;
|
||||
return null;
|
||||
}
|
||||
|
||||
private static DateTime? ParseDate(string? value)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(value)) return null;
|
||||
if (DateTime.TryParse(value, out var dt)) return dt;
|
||||
return null;
|
||||
}
|
||||
|
||||
private static string? MapStatus(string? dynamoStatus)
|
||||
{
|
||||
return dynamoStatus switch
|
||||
{
|
||||
"new" => "Open",
|
||||
"assigned" => "Open",
|
||||
"in_progress" => "In Progress",
|
||||
"on_hold" => "On Hold",
|
||||
"completed" => "Done",
|
||||
"cancelled" => "Cancelled",
|
||||
"unknown" => "Open",
|
||||
_ => "Open"
|
||||
};
|
||||
}
|
||||
|
||||
private static string? MapSeverityToPriority(string? severity)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(severity)) return null;
|
||||
return $"Sev {severity}";
|
||||
var result = await _syncService.SyncAllAsync(cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -12,57 +15,26 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/tasklisttemplates")]
|
||||
public class TaskListTemplateController : Controller
|
||||
{
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly ITaskListTemplateService _taskListTemplateService;
|
||||
private readonly ILogger<TaskListTemplateController> _logger;
|
||||
|
||||
public TaskListTemplateController(ApplicationDbContext db)
|
||||
public TaskListTemplateController(ITaskListTemplateService taskListTemplateService, ILogger<TaskListTemplateController> logger)
|
||||
{
|
||||
_db = db;
|
||||
_taskListTemplateService = taskListTemplateService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetAll()
|
||||
public async Task<IActionResult> GetAll(CancellationToken cancellationToken)
|
||||
{
|
||||
var data = await _db.TaskListTemplates
|
||||
.Where(t => t.IsActive)
|
||||
.Include(t => t.Items.OrderBy(i => i.SortOrder))
|
||||
.OrderBy(t => t.Name)
|
||||
.Select(t => new
|
||||
{
|
||||
t.Id,
|
||||
t.Name,
|
||||
t.Description,
|
||||
t.IsActive,
|
||||
items = t.Items.OrderBy(i => i.SortOrder).Select(i => new
|
||||
{
|
||||
i.Id,
|
||||
i.ItemText,
|
||||
i.SortOrder
|
||||
}).ToList()
|
||||
})
|
||||
.ToListAsync();
|
||||
var data = await _taskListTemplateService.GetAllAsync(cancellationToken);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpGet("{id}")]
|
||||
public async Task<IActionResult> GetById(int id)
|
||||
public async Task<IActionResult> GetById(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var template = await _db.TaskListTemplates
|
||||
.Include(t => t.Items.OrderBy(i => i.SortOrder))
|
||||
.Where(t => t.Id == id)
|
||||
.Select(t => new
|
||||
{
|
||||
t.Id,
|
||||
t.Name,
|
||||
t.Description,
|
||||
t.IsActive,
|
||||
items = t.Items.OrderBy(i => i.SortOrder).Select(i => new
|
||||
{
|
||||
i.Id,
|
||||
i.ItemText,
|
||||
i.SortOrder
|
||||
}).ToList()
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
var template = await _taskListTemplateService.GetByIdAsync(id, cancellationToken);
|
||||
|
||||
if (template == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Template not found" });
|
||||
|
|
@ -71,76 +43,61 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
|
||||
[HttpPost]
|
||||
public async Task<IActionResult> Create([FromBody] TaskListTemplate_DTO model)
|
||||
public async Task<IActionResult> Create([FromBody] TaskListTemplate_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var template = new TaskListTemplate
|
||||
{
|
||||
Name = model.Name,
|
||||
Description = model.Description,
|
||||
IsActive = model.IsActive,
|
||||
Items = model.Items.Select((item, idx) => new TaskListTemplateItem
|
||||
{
|
||||
ItemText = item.ItemText,
|
||||
SortOrder = item.SortOrder > 0 ? item.SortOrder : idx
|
||||
}).ToList()
|
||||
};
|
||||
|
||||
_db.TaskListTemplates.Add(template);
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { message = "Template created", id = template.Id });
|
||||
var input = MapToInput(model);
|
||||
var id = await _taskListTemplateService.CreateAsync(input, cancellationToken);
|
||||
return Ok(new { message = "Template created", id });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPut("{id}")]
|
||||
public async Task<IActionResult> Update(int id, [FromBody] TaskListTemplate_DTO model)
|
||||
public async Task<IActionResult> Update(int id, [FromBody] TaskListTemplate_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var template = await _db.TaskListTemplates
|
||||
.Include(t => t.Items)
|
||||
.FirstOrDefaultAsync(t => t.Id == id);
|
||||
|
||||
if (template == null)
|
||||
var input = MapToInput(model);
|
||||
var updated = await _taskListTemplateService.UpdateAsync(id, input, cancellationToken);
|
||||
if (!updated)
|
||||
return NotFound(new Response { Status = "Error", Message = "Template not found" });
|
||||
|
||||
template.Name = model.Name;
|
||||
template.Description = model.Description;
|
||||
template.IsActive = model.IsActive;
|
||||
|
||||
_db.TaskListTemplateItems.RemoveRange(template.Items);
|
||||
|
||||
template.Items = model.Items.Select((item, idx) => new TaskListTemplateItem
|
||||
{
|
||||
TaskListTemplateId = id,
|
||||
ItemText = item.ItemText,
|
||||
SortOrder = item.SortOrder > 0 ? item.SortOrder : idx
|
||||
}).ToList();
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { message = "Template updated" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpDelete("{id}")]
|
||||
public async Task<IActionResult> Delete(int id)
|
||||
public async Task<IActionResult> Delete(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var template = await _db.TaskListTemplates.FindAsync(id);
|
||||
if (template == null)
|
||||
var deleted = await _taskListTemplateService.DeleteAsync(id, cancellationToken);
|
||||
if (!deleted)
|
||||
return NotFound(new Response { Status = "Error", Message = "Template not found" });
|
||||
|
||||
template.IsActive = false;
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { message = "Template deleted" });
|
||||
}
|
||||
|
||||
private static TaskListTemplateInput MapToInput(TaskListTemplate_DTO model)
|
||||
{
|
||||
return new TaskListTemplateInput
|
||||
{
|
||||
Name = model.Name,
|
||||
Description = model.Description,
|
||||
IsActive = model.IsActive,
|
||||
Items = model.Items.Select(item => new TaskListTemplateInputItem
|
||||
{
|
||||
ItemText = item.ItemText,
|
||||
SortOrder = item.SortOrder
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Security.Claims;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -12,225 +14,77 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/uplifts")]
|
||||
public class UpliftController : Controller
|
||||
{
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly IConfiguration _config;
|
||||
private readonly IUpliftService _upliftService;
|
||||
private readonly ILogger<UpliftController> _logger;
|
||||
|
||||
public UpliftController(ApplicationDbContext db, IConfiguration config)
|
||||
public UpliftController(IUpliftService upliftService, ILogger<UpliftController> logger)
|
||||
{
|
||||
_db = db;
|
||||
_config = config;
|
||||
_upliftService = upliftService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> List([FromQuery] string? status = "Pending", [FromQuery] int? tier = null, [FromQuery] int page = 1, [FromQuery] int pageSize = 25)
|
||||
public async Task<IActionResult> List([FromQuery] string? status = "Pending", [FromQuery] int? tier = null, [FromQuery] int page = 1, [FromQuery] int pageSize = 25, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var query = from u in _db.DispatchUpliftRequests
|
||||
join d in _db.Dispatches on u.DispatchId equals d.Id
|
||||
join v in _db.Vendors on d.VendorId equals v.Id into vendors
|
||||
from v in vendors.DefaultIfEmpty()
|
||||
where (u.IsDeleted == null || u.IsDeleted == false)
|
||||
select new { u, d, v };
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(status))
|
||||
query = query.Where(x => x.u.Status == status);
|
||||
if (tier.HasValue)
|
||||
query = query.Where(x => x.u.RequiredTier == tier.Value);
|
||||
|
||||
var total = await query.CountAsync();
|
||||
|
||||
var raw = await query
|
||||
.OrderByDescending(x => x.u.CreatedDate)
|
||||
.Skip((Math.Max(page, 1) - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.Select(x => new
|
||||
{
|
||||
x.u.Id,
|
||||
DispatchId = x.d.Id,
|
||||
x.d.DispatchNumber,
|
||||
x.d.PONumber,
|
||||
WorkOrderId = x.d.WorkOrderId,
|
||||
VendorCompanyName = x.v != null ? x.v.CompanyName : x.u.RequestedByVendorName,
|
||||
x.u.CurrentNTE,
|
||||
x.u.RequestedNTE,
|
||||
x.u.VendorReason,
|
||||
x.u.RequiredTier,
|
||||
x.u.Status,
|
||||
RequestedAt = x.u.CreatedDate,
|
||||
x.u.DecidedAt,
|
||||
x.u.DecisionNote
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var items = raw.Select(r => new
|
||||
{
|
||||
r.Id,
|
||||
r.DispatchId,
|
||||
r.DispatchNumber,
|
||||
r.PONumber,
|
||||
r.WorkOrderId,
|
||||
r.VendorCompanyName,
|
||||
r.CurrentNTE,
|
||||
r.RequestedNTE,
|
||||
Delta = r.RequestedNTE - (r.CurrentNTE ?? 0m),
|
||||
r.VendorReason,
|
||||
r.RequiredTier,
|
||||
r.Status,
|
||||
r.RequestedAt,
|
||||
r.DecidedAt,
|
||||
r.DecisionNote,
|
||||
CanDecide = UserCanApprove(r.RequiredTier)
|
||||
}).ToList();
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new { total, page, pageSize, items }
|
||||
});
|
||||
var result = await _upliftService.ListAsync(User, status, tier, page, pageSize, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
|
||||
[HttpGet("dispatch/{dispatchId:int}")]
|
||||
public async Task<IActionResult> ListForDispatch(int dispatchId)
|
||||
public async Task<IActionResult> ListForDispatch(int dispatchId, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var rows = await (from u in _db.DispatchUpliftRequests
|
||||
where u.DispatchId == dispatchId && (u.IsDeleted == null || u.IsDeleted == false)
|
||||
join dec in _db.Users on u.DecidedByUserId equals dec.Id into decs
|
||||
from dec in decs.DefaultIfEmpty()
|
||||
orderby u.CreatedDate descending
|
||||
select new
|
||||
{
|
||||
u.Id,
|
||||
u.DispatchId,
|
||||
u.CurrentNTE,
|
||||
u.RequestedNTE,
|
||||
Delta = u.RequestedNTE - (u.CurrentNTE ?? 0m),
|
||||
u.VendorReason,
|
||||
u.Status,
|
||||
u.RequiredTier,
|
||||
u.RequestedByVendorName,
|
||||
RequestedAt = u.CreatedDate,
|
||||
u.DecidedAt,
|
||||
u.DecisionNote,
|
||||
DecidedByFirstName = dec != null ? dec.FirstName : null,
|
||||
DecidedByLastName = dec != null ? dec.LastName : null
|
||||
}).ToListAsync();
|
||||
|
||||
var items = rows.Select(r => new
|
||||
{
|
||||
r.Id,
|
||||
r.DispatchId,
|
||||
r.CurrentNTE,
|
||||
r.RequestedNTE,
|
||||
r.Delta,
|
||||
r.VendorReason,
|
||||
r.Status,
|
||||
r.RequiredTier,
|
||||
r.RequestedByVendorName,
|
||||
r.RequestedAt,
|
||||
r.DecidedAt,
|
||||
r.DecisionNote,
|
||||
DecidedByName = string.Join(" ", new[] { r.DecidedByFirstName, r.DecidedByLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim(),
|
||||
CanDecide = UserCanApprove(r.RequiredTier)
|
||||
}).ToList();
|
||||
|
||||
var items = await _upliftService.ListForDispatchAsync(User, dispatchId, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = items });
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/approve")]
|
||||
public async Task<IActionResult> Approve(int id, [FromBody] DecisionRequest? body)
|
||||
public async Task<IActionResult> Approve(int id, [FromBody] DecisionRequest? body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var req = await _db.DispatchUpliftRequests.FirstOrDefaultAsync(u => u.Id == id);
|
||||
if (req == null) return NotFound(new Response { Status = "Error", Message = "Uplift request not found" });
|
||||
if (req.Status != "Pending") return BadRequest(new Response { Status = "Error", Message = $"Cannot approve a '{req.Status}' request" });
|
||||
if (!UserCanApprove(req.RequiredTier))
|
||||
return StatusCode(403, new Response { Status = "Error", Message = $"Approval requires a Tier {req.RequiredTier} role" });
|
||||
|
||||
var dispatch = await _db.Dispatches.FirstOrDefaultAsync(d => d.Id == req.DispatchId);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
if (dispatch.Status == "Verified" || dispatch.Status == "Cancelled")
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Cannot approve uplift on a '{dispatch.Status}' dispatch" });
|
||||
|
||||
var userId = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||
var now = DateTime.UtcNow;
|
||||
var oldNTE = dispatch.NTEAmount ?? 0m;
|
||||
|
||||
dispatch.NTEAmount = req.RequestedNTE;
|
||||
dispatch.LastModificationTime = now;
|
||||
|
||||
req.Status = "Approved";
|
||||
req.DecidedAt = now;
|
||||
req.DecidedByUserId = userId;
|
||||
req.DecisionNote = string.IsNullOrWhiteSpace(body?.Note) ? null : body!.Note!.Trim();
|
||||
req.LastModificationTime = now;
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
try
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
UserId = userId,
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber} NTE",
|
||||
OldValue = $"${oldNTE:F2}",
|
||||
NewValue = $"${req.RequestedNTE:F2}",
|
||||
Action = "uplift_approved",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { req.Id, req.Status, dispatch.NTEAmount } });
|
||||
var result = await _upliftService.ApproveAsync(User, id, body?.Note, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
catch (KeyNotFoundException ex)
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = _logger.Sanitize(ex, "Uplift request not found") });
|
||||
}
|
||||
catch (UpliftForbiddenException ex)
|
||||
{
|
||||
return StatusCode(403, new Response { Status = "Error", Message = _logger.Sanitize(ex, "You are not authorized to perform this action on this uplift request") });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "This uplift request cannot be modified in its current state") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/deny")]
|
||||
public async Task<IActionResult> Deny(int id, [FromBody] DecisionRequest body)
|
||||
public async Task<IActionResult> Deny(int id, [FromBody] DecisionRequest? body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
if (body == null || string.IsNullOrWhiteSpace(body.Note))
|
||||
return BadRequest(new Response { Status = "Error", Message = "A note is required when denying" });
|
||||
|
||||
var req = await _db.DispatchUpliftRequests.FirstOrDefaultAsync(u => u.Id == id);
|
||||
if (req == null) return NotFound(new Response { Status = "Error", Message = "Uplift request not found" });
|
||||
if (req.Status != "Pending") return BadRequest(new Response { Status = "Error", Message = $"Cannot deny a '{req.Status}' request" });
|
||||
if (!UserCanApprove(req.RequiredTier))
|
||||
return StatusCode(403, new Response { Status = "Error", Message = $"Decision requires a Tier {req.RequiredTier} role" });
|
||||
|
||||
var dispatch = await _db.Dispatches.FirstOrDefaultAsync(d => d.Id == req.DispatchId);
|
||||
|
||||
var userId = User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
|
||||
var now = DateTime.UtcNow;
|
||||
|
||||
req.Status = "Denied";
|
||||
req.DecidedAt = now;
|
||||
req.DecidedByUserId = userId;
|
||||
req.DecisionNote = body.Note!.Trim();
|
||||
req.LastModificationTime = now;
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
try
|
||||
{
|
||||
WorkOrderId = dispatch?.WorkOrderId ?? 0,
|
||||
UserId = userId,
|
||||
FieldName = $"Dispatch {dispatch?.DispatchNumber} Uplift",
|
||||
OldValue = "Pending",
|
||||
NewValue = "Denied",
|
||||
Action = "uplift_denied",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { req.Id, req.Status } });
|
||||
var result = await _upliftService.DenyAsync(User, id, body?.Note, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
catch (KeyNotFoundException ex)
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = _logger.Sanitize(ex, "Uplift request not found") });
|
||||
}
|
||||
catch (UpliftForbiddenException ex)
|
||||
{
|
||||
return StatusCode(403, new Response { Status = "Error", Message = _logger.Sanitize(ex, "You are not authorized to perform this action on this uplift request") });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "This uplift request cannot be modified in its current state") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("can-approve")]
|
||||
public IActionResult CanApprove([FromQuery] int tier)
|
||||
{
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { canApprove = UserCanApprove(tier) } });
|
||||
}
|
||||
|
||||
private bool UserCanApprove(int requiredTier)
|
||||
{
|
||||
var key = $"Approvals:Tier{requiredTier}Roles";
|
||||
var roles = _config.GetSection(key).Get<string[]>() ?? Array.Empty<string>();
|
||||
foreach (var r in roles)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(r) && User.IsInRole(r)) return true;
|
||||
}
|
||||
return false;
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { canApprove = _upliftService.CanApprove(User, tier) } });
|
||||
}
|
||||
|
||||
public class DecisionRequest
|
||||
|
|
|
|||
|
|
@ -1,15 +1,12 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Api.SeaHavenIndustries.Models;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using PasswordGenerator;
|
||||
using SendGrid.Helpers.Mail;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
using System.Security.Cryptography;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -18,287 +15,123 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/User")]
|
||||
public class UserController : Controller
|
||||
{
|
||||
private readonly UserManager<ApplicationUser> _userManager;
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly SendMessage _sendemail;
|
||||
private readonly IUserService _userService;
|
||||
private readonly ILogger<UserController> _logger;
|
||||
|
||||
public UserController(UserManager<ApplicationUser> userManager, ApplicationDbContext db, SendMessage sendemail)
|
||||
public UserController(IUserService userService, ILogger<UserController> logger)
|
||||
{
|
||||
_userManager = userManager;
|
||||
_db = db;
|
||||
_sendemail = sendemail;
|
||||
_userService = userService;
|
||||
_logger = logger;
|
||||
}
|
||||
[Route("")]
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetUsers()
|
||||
public async Task<IActionResult> GetUsers(CancellationToken cancellationToken)
|
||||
{
|
||||
_db.ChangeTracker.Clear();
|
||||
|
||||
var allUsers = _db.Users.Select(s => new UserRoleViewModel
|
||||
{
|
||||
RoleName = s.PhoneNumber,
|
||||
Email = s.Email,
|
||||
Name = s.FirstName,
|
||||
Date = s.CreatedDate != null ? s.CreatedDate.Value.Date.ToString("MMM dd yyyy") : "",
|
||||
Status = s.UniqueName,
|
||||
Id = s.Id
|
||||
}).AsQueryable();
|
||||
return Ok(allUsers);
|
||||
var users = await _userService.GetUsersAsync(cancellationToken);
|
||||
return Ok(users);
|
||||
}
|
||||
[HttpPost]
|
||||
[Route("AddUser")]
|
||||
public async Task<IActionResult> AddUser(User_DTO user)
|
||||
public async Task<IActionResult> AddUser(User_DTO user, CancellationToken cancellationToken)
|
||||
{
|
||||
|
||||
var model = new ApplicationUser
|
||||
{
|
||||
UserName = user.Email,
|
||||
FirstName = user.Name,
|
||||
Email = user.Email,
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
_db.ChangeTracker.Clear();
|
||||
var exist = _db.Set<ApplicationUser>().Find(model.Id);
|
||||
if (exist == null)
|
||||
var dto = new AddUserRequestDTO
|
||||
{
|
||||
model.EmailConfirmed = true;
|
||||
model.UserName = model.Email;
|
||||
model.CreatedDate = DateTime.Now;
|
||||
model.UniqueName = "Active";
|
||||
model.PhoneNumber = user.Role;
|
||||
|
||||
var pwd = new Password(8).IncludeLowercase().IncludeUppercase().IncludeSpecial().IncludeNumeric();
|
||||
var password = pwd.Next();
|
||||
|
||||
var result = await _userManager.CreateAsync(model, password);
|
||||
if (result.Succeeded)
|
||||
{
|
||||
await _userManager.AddToRoleAsync(model, user.Role ?? "");
|
||||
}
|
||||
else
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = result.Errors.FirstOrDefault()?.Description ?? "error" });
|
||||
}
|
||||
var request = HttpContext?.Request;
|
||||
//var domain = $"{request?.Scheme}://{request?.Host}";
|
||||
var domain = "http://shoc-ui-app.s3-website-us-east-1.amazonaws.com/#";
|
||||
string subject = "Login Information";
|
||||
string greeting = $"Dear {model.FirstName},\n\n";
|
||||
string loginLink = $"Click here to login:<a href='{domain}/Login'>Login</a>\n";
|
||||
string passwordInfo = $"Your password is: {password}\n\n";
|
||||
string body = $"{greeting}\n\n{loginLink}\n\n{passwordInfo}";
|
||||
await _sendemail.SendEMail(model?.Email ?? "", subject, body);
|
||||
}
|
||||
else
|
||||
Name = user.Name,
|
||||
Email = user.Email,
|
||||
Contact = user.Contact,
|
||||
Role = user.Role
|
||||
};
|
||||
var outcome = await _userService.AddUserAsync(dto, cancellationToken);
|
||||
if (!outcome.Success)
|
||||
{
|
||||
|
||||
var exist1 = await _userManager.Users.FirstOrDefaultAsync(w => w.Id == model.Id);
|
||||
if (exist1 == null)
|
||||
return BadRequest(new Response { Status = "Error", Message = "User not found" });
|
||||
|
||||
var existingRole = await _userManager.GetRolesAsync(exist1);
|
||||
|
||||
// Remove from roles if any exist
|
||||
if (existingRole != null && existingRole.Any() && existingRole.FirstOrDefault() != exist1.PhoneNumber)
|
||||
{
|
||||
await _userManager.RemoveFromRolesAsync(exist1, existingRole);
|
||||
}
|
||||
|
||||
// Update user details
|
||||
exist1.FirstName = model.FirstName;
|
||||
exist1.LastName = model.LastName;
|
||||
exist1.Contact = model.Contact;
|
||||
exist1.PhoneNumber = model.PhoneNumber;
|
||||
|
||||
// Optionally, detach the entity if you're about to attach it again
|
||||
_db.Entry(exist1).State = EntityState.Detached;
|
||||
|
||||
// Add to role after setting properties
|
||||
await _userManager.AddToRoleAsync(exist1, user.Role ?? "");
|
||||
var result = await _userManager.UpdateAsync(exist1);
|
||||
//await _context.SaveChangesAsync();
|
||||
return BadRequest(new Response { Status = "Error", Message = outcome.Error });
|
||||
}
|
||||
return Ok(new DataResponse { Message = "Updated Successfully", Status = "200" });
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
|
||||
}
|
||||
}
|
||||
[HttpPut]
|
||||
[Route("EditUser")]
|
||||
public async Task<IActionResult> EditUser(EditUser_DTO user)
|
||||
public async Task<IActionResult> EditUser(EditUser_DTO user, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var exist = _db.Users.Where(w => w.Id == user.Id).FirstOrDefault();
|
||||
if (exist == null)
|
||||
return BadRequest(new Response { Status = "Error", Message = "User not found" });
|
||||
exist.FirstName = user.Name;
|
||||
exist.EmailConfirmed = true;
|
||||
exist.UserName = user.Email;
|
||||
exist.Email = user.Email;
|
||||
exist.NormalizedEmail = user.Email.ToUpper();
|
||||
exist.NormalizedUserName = user.Email.ToUpper();
|
||||
exist.CreatedDate = DateTime.Now;
|
||||
exist.UniqueName = "Active";
|
||||
exist.PhoneNumber = user.Role;
|
||||
var existingRole = await _userManager.GetRolesAsync(exist);
|
||||
|
||||
if (existingRole != null && existingRole.Any())
|
||||
var dto = new EditUserRequestDTO
|
||||
{
|
||||
await _userManager.RemoveFromRolesAsync(exist, existingRole);
|
||||
}
|
||||
await _userManager.AddToRoleAsync(exist, user.Role ?? "");
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
Id = user.Id,
|
||||
Name = user.Name,
|
||||
Email = user.Email,
|
||||
Role = user.Role
|
||||
};
|
||||
var succeeded = await _userService.EditUserAsync(dto, cancellationToken);
|
||||
if (!succeeded)
|
||||
return BadRequest(new Response { Status = "Error", Message = "User not found" });
|
||||
return Ok(new DataResponse { Message = "Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
public class DeleteUserRequest
|
||||
{
|
||||
public string Id { get; set; }
|
||||
}
|
||||
|
||||
|
||||
[HttpDelete]
|
||||
[Route("DeleteUser")]
|
||||
public async Task<IActionResult> DeleteUser(EditUser_DTO req)
|
||||
public async Task<IActionResult> DeleteUser(EditUser_DTO req, CancellationToken cancellationToken)
|
||||
{
|
||||
string id = req.Id;
|
||||
string id = req.Id ?? "";
|
||||
try
|
||||
{
|
||||
var data = await _db.Users.Where(w => w.Id == id).FirstOrDefaultAsync();
|
||||
|
||||
if (data != null)
|
||||
{
|
||||
var existworkorder = _db.workOrders.Where(w => w.AssignTo.Contains(data.Id)).ToList();
|
||||
foreach (var workorder in existworkorder)
|
||||
{
|
||||
var existdata = _db.workOrders.Where(w => w.Id == workorder.Id).FirstOrDefault();
|
||||
existdata.AssignTo = null;
|
||||
}
|
||||
var existworkordercomments = _db.Comments.Where(w => w.UserId.Contains(data.Id)).ToList();
|
||||
foreach (var workorderc in existworkordercomments)
|
||||
{
|
||||
var existdatacomm = _db.Comments.Where(w => w.Id == workorderc.Id).FirstOrDefault();
|
||||
existdatacomm.UserId = null;
|
||||
}
|
||||
var existtemplate = _db.Templates.Where(w => w.AssignTo.Contains(data.Id)).ToList();
|
||||
foreach (var workordert in existtemplate)
|
||||
{
|
||||
var existdattem = _db.Templates.Where(w => w.Id == workordert.Id).FirstOrDefault();
|
||||
existdattem.AssignTo = null;
|
||||
}
|
||||
var existtempexistuserrolelate = _db.UserRoles.Where(w => w.UserId.Contains(data.Id)).ToList();
|
||||
if (existtempexistuserrolelate.Count() > 0)
|
||||
{
|
||||
_db.UserRoles.RemoveRange(existtempexistuserrolelate);
|
||||
}
|
||||
_db.Users.Remove(data);
|
||||
}
|
||||
else
|
||||
var found = await _userService.DeleteUserAsync(id, cancellationToken);
|
||||
if (!found)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "ID not matched!" });
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Message = "Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("DeleteCurrentUser")]
|
||||
public async Task<IActionResult> DeleteCurrentUser()
|
||||
public async Task<IActionResult> DeleteCurrentUser(CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userid = User.FindFirstValue(ClaimTypes.NameIdentifier) ?? "";
|
||||
var exist = _db.Users.Where(w => w.Id == userid).FirstOrDefault();
|
||||
if(exist != null)
|
||||
{
|
||||
exist.IsDeleted = true;
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
await _userService.DeleteCurrentUserAsync(userid, cancellationToken);
|
||||
return Ok(new DataResponse { Message = "Updated Successfully", Status = "200" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("UserProfile")]
|
||||
public async Task<IActionResult> UserProfile()
|
||||
public async Task<IActionResult> UserProfile(CancellationToken cancellationToken)
|
||||
{
|
||||
var userid = User.FindFirstValue(ClaimTypes.NameIdentifier) ?? "";
|
||||
|
||||
var data = await _db.Users.Where(w => w.Id == userid).Select(s => new
|
||||
var data = await _userService.GetUserProfileAsync(userid, cancellationToken);
|
||||
return Ok(data.Select(d => new
|
||||
{
|
||||
s.Id,
|
||||
Name = s.FirstName,
|
||||
addeddate = s.CreatedDate,
|
||||
s.Email,
|
||||
s.Contact
|
||||
}).ToListAsync();
|
||||
return Ok(data);
|
||||
}
|
||||
public static string GenerateRandomPassword(int length = 8)
|
||||
{
|
||||
const string validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()_-+=<>?";
|
||||
const string capitalLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||
const string digits = "1234567890";
|
||||
const string symbols = "!@#$%^&*()_-+=<>?";
|
||||
|
||||
using (var rng = RandomNumberGenerator.Create())
|
||||
{
|
||||
var passwordChars = new char[length];
|
||||
|
||||
// Ensure at least one capital letter
|
||||
passwordChars[0] = capitalLetters[GetNextNonNegativeIndex(rng, capitalLetters.Length)];
|
||||
|
||||
// Ensure at least one digit
|
||||
passwordChars[1] = digits[GetNextNonNegativeIndex(rng, digits.Length)];
|
||||
|
||||
// Ensure at least one symbol
|
||||
passwordChars[2] = symbols[GetNextNonNegativeIndex(rng, symbols.Length)];
|
||||
|
||||
// Fill the rest of the password with random characters
|
||||
for (int i = 3; i < length; i++)
|
||||
{
|
||||
passwordChars[i] = validChars[GetNextNonNegativeIndex(rng, validChars.Length)];
|
||||
}
|
||||
|
||||
// Shuffle the password characters, excluding the initial characters
|
||||
Random random = new Random();
|
||||
for (int i = length - 1; i > 2; i--)
|
||||
{
|
||||
int j = random.Next(2, i + 1);
|
||||
(passwordChars[i], passwordChars[j]) = (passwordChars[j], passwordChars[i]);
|
||||
}
|
||||
|
||||
return new string(passwordChars);
|
||||
}
|
||||
}
|
||||
|
||||
private static int GetNextNonNegativeIndex(RandomNumberGenerator rng, int maxValue)
|
||||
{
|
||||
byte[] randomBytes = new byte[4];
|
||||
rng.GetBytes(randomBytes);
|
||||
int nextIndex = BitConverter.ToInt32(randomBytes, 0) % maxValue;
|
||||
return (nextIndex + maxValue) % maxValue; // Ensure the index is non-negative
|
||||
d.Id,
|
||||
Name = d.Name,
|
||||
addeddate = d.AddedDate,
|
||||
d.Email,
|
||||
d.Contact
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using FluentValidation;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using System.Security.Claims;
|
||||
|
|
@ -17,18 +18,12 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
public class VendorController : Controller
|
||||
{
|
||||
private readonly IVendorService _vendorService;
|
||||
private readonly ApplicationDbContext _db; // Keep for complex queries like nearby vendors
|
||||
private readonly Helper.ZipCodeDistance _zipDistance;
|
||||
private readonly Helper.VendorPortalTokenService _vendorTokens;
|
||||
private readonly IConfiguration _config;
|
||||
private readonly ILogger<VendorController> _logger;
|
||||
|
||||
public VendorController(IVendorService vendorService, ApplicationDbContext db, Helper.ZipCodeDistance zipDistance, Helper.VendorPortalTokenService vendorTokens, IConfiguration config)
|
||||
public VendorController(IVendorService vendorService, ILogger<VendorController> logger)
|
||||
{
|
||||
_vendorService = vendorService;
|
||||
_db = db;
|
||||
_zipDistance = zipDistance;
|
||||
_vendorTokens = vendorTokens;
|
||||
_config = config;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet("GetVendorList")]
|
||||
|
|
@ -157,7 +152,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -208,7 +203,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
return Conflict(new
|
||||
{
|
||||
Status = "Conflict",
|
||||
Message = dbex.Message,
|
||||
Message = _logger.Sanitize(dbex, "Vendor cannot be deactivated because it has open work orders"),
|
||||
OpenWorkOrders = dbex.OpenWorkOrders
|
||||
});
|
||||
}
|
||||
|
|
@ -218,7 +213,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -245,7 +240,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
return Conflict(new
|
||||
{
|
||||
Status = "Conflict",
|
||||
Message = dbex.Message,
|
||||
Message = _logger.Sanitize(dbex, "Vendor cannot be deactivated because it has open work orders"),
|
||||
OpenWorkOrders = dbex.OpenWorkOrders
|
||||
});
|
||||
}
|
||||
|
|
@ -255,7 +250,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -273,7 +268,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -313,165 +308,46 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
return StatusCode(500, new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("Dropdown")]
|
||||
public async Task<IActionResult> GetDropdown([FromQuery] string? trade = null, [FromQuery] string? siteZip = null)
|
||||
public async Task<IActionResult> GetDropdown([FromQuery] string? trade = null, [FromQuery] string? siteZip = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var query = _db.Vendors.Where(v => v.IsActive);
|
||||
|
||||
var vendors = await query.OrderBy(v => v.CompanyName)
|
||||
.Select(v => new
|
||||
{
|
||||
v.Id,
|
||||
v.CompanyName,
|
||||
v.ContactName,
|
||||
v.PreferredContact,
|
||||
|
||||
v.TradeSpecialties,
|
||||
v.Address,
|
||||
v.City,
|
||||
v.State,
|
||||
v.Zip
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var result = vendors.Select(v =>
|
||||
{
|
||||
var distance = _zipDistance.GetDistanceMiles(siteZip, v.Zip);
|
||||
var addr = new[] { v.Address, v.City, v.State, v.Zip }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s));
|
||||
return new
|
||||
{
|
||||
v.Id,
|
||||
v.CompanyName,
|
||||
v.ContactName,
|
||||
v.PreferredContact,
|
||||
|
||||
v.TradeSpecialties,
|
||||
address = string.Join(", ", addr),
|
||||
distanceMiles = distance.HasValue ? Math.Round(distance.Value, 1) : (double?)null
|
||||
};
|
||||
}).ToList();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(trade))
|
||||
{
|
||||
var tradeMatched = result.Where(v => (v.TradeSpecialties ?? "").Contains(trade)).ToList();
|
||||
var rest = result.Where(v => !(v.TradeSpecialties ?? "").Contains(trade)).ToList();
|
||||
result = tradeMatched.Concat(rest).ToList();
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(siteZip))
|
||||
{
|
||||
result = result.OrderBy(v => v.distanceMiles ?? 99999).ToList();
|
||||
}
|
||||
|
||||
var result = await _vendorService.GetDropdownAsync(trade, siteZip, cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpGet("facets")]
|
||||
public async Task<IActionResult> GetFacets([FromQuery] bool? isActive = null)
|
||||
public async Task<IActionResult> GetFacets([FromQuery] bool? isActive = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var query = _db.Vendors
|
||||
.AsNoTracking()
|
||||
.Where(v => v.IsDeleted == null || v.IsDeleted == false);
|
||||
|
||||
if (isActive.HasValue)
|
||||
query = query.Where(v => v.IsActive == isActive.Value);
|
||||
|
||||
var vendors = await query
|
||||
.OrderByDescending(v => v.Id)
|
||||
.ToListAsync();
|
||||
|
||||
var companies = vendors
|
||||
.Where(v => !string.IsNullOrWhiteSpace(v.CompanyName))
|
||||
.GroupBy(v => v.CompanyName!.Trim(), StringComparer.OrdinalIgnoreCase)
|
||||
.Select(group => group.First())
|
||||
.OrderBy(v => v.CompanyName)
|
||||
.Select(v => new
|
||||
{
|
||||
Name = v.CompanyName,
|
||||
v.CompanyId,
|
||||
v.CompanyPhone,
|
||||
v.Email,
|
||||
v.PreferredContact,
|
||||
v.Address,
|
||||
v.City,
|
||||
v.State,
|
||||
Zip = v.Zip,
|
||||
v.GoogleMapsUrl
|
||||
});
|
||||
|
||||
var trades = vendors
|
||||
.SelectMany(v => (v.TradeSpecialties ?? "")
|
||||
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
||||
.Distinct(StringComparer.OrdinalIgnoreCase)
|
||||
.OrderBy(value => value);
|
||||
|
||||
var locations = vendors
|
||||
.Where(v => !string.IsNullOrWhiteSpace(v.City) || !string.IsNullOrWhiteSpace(v.State))
|
||||
.Select(v => new { v.City, v.State, Label = string.Join(", ", new[] { v.City, v.State }.Where(value => !string.IsNullOrWhiteSpace(value))) })
|
||||
.DistinctBy(location => location.Label, StringComparer.OrdinalIgnoreCase)
|
||||
.OrderBy(location => location.Label);
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
Companies = companies,
|
||||
Trades = trades,
|
||||
Locations = locations,
|
||||
JobBuckets = new[]
|
||||
{
|
||||
new { Id = "under-50", Label = "Under 50" },
|
||||
new { Id = "50-99", Label = "50–99" },
|
||||
new { Id = "100-149", Label = "100–149" },
|
||||
new { Id = "150-plus", Label = "150+" }
|
||||
}
|
||||
});
|
||||
var result = await _vendorService.GetFacetsAsync(isActive, cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}/portal-token")]
|
||||
public async Task<IActionResult> GetPortalToken(int id)
|
||||
public async Task<IActionResult> GetPortalToken(int id, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await _db.Vendors.FindAsync(id);
|
||||
if (vendor == null) return NotFound();
|
||||
|
||||
var token = await _vendorTokens.GetOrCreateActiveTokenAsync(id);
|
||||
return Ok(BuildPortalTokenResponse(token));
|
||||
var result = await _vendorService.GetPortalTokenAsync(id, cancellationToken);
|
||||
if (result == null) return NotFound();
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/portal-token/rotate")]
|
||||
public async Task<IActionResult> RotatePortalToken(int id)
|
||||
public async Task<IActionResult> RotatePortalToken(int id, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await _db.Vendors.FindAsync(id);
|
||||
if (vendor == null) return NotFound();
|
||||
|
||||
var token = await _vendorTokens.RotateAsync(id);
|
||||
return Ok(BuildPortalTokenResponse(token));
|
||||
var result = await _vendorService.RotatePortalTokenAsync(id, cancellationToken);
|
||||
if (result == null) return NotFound();
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/portal-token/revoke")]
|
||||
public async Task<IActionResult> RevokePortalToken(int id)
|
||||
public async Task<IActionResult> RevokePortalToken(int id, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await _db.Vendors.FindAsync(id);
|
||||
if (vendor == null) return NotFound();
|
||||
|
||||
await _vendorTokens.RevokeAllAsync(id);
|
||||
var success = await _vendorService.RevokePortalTokenAsync(id, cancellationToken);
|
||||
if (!success) return NotFound();
|
||||
return Ok(new { revoked = true });
|
||||
}
|
||||
|
||||
private object BuildPortalTokenResponse(VendorAccessToken token)
|
||||
{
|
||||
var frontendBase = _config.GetValue<string>("FrontendBaseUrl")?.TrimEnd('/') ?? "";
|
||||
return new
|
||||
{
|
||||
token.Token,
|
||||
token.IssuedAt,
|
||||
token.ExpiresAt,
|
||||
token.LastUsedAt,
|
||||
PortalUrl = $"{frontendBase}/v/{token.Token}/dashboard"
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
using System.Security.Claims;
|
||||
using System.Text;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Data.SeaHavenIndustries.Enums;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -14,94 +13,33 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[Route("api/vendor-operations")]
|
||||
public class VendorOperationsController : ControllerBase
|
||||
{
|
||||
private static readonly string[] TerminalDispatchStatuses = { "Completed", "Verified", "Cancelled", "Canceled" };
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly IDispatchDataService _dispatchDataService;
|
||||
private readonly TimeProvider _timeProvider;
|
||||
private readonly IVendorOperationsService _service;
|
||||
|
||||
public VendorOperationsController(
|
||||
ApplicationDbContext db,
|
||||
IDispatchDataService dispatchDataService,
|
||||
TimeProvider timeProvider)
|
||||
public VendorOperationsController(IVendorOperationsService service)
|
||||
{
|
||||
_db = db;
|
||||
_dispatchDataService = dispatchDataService;
|
||||
_timeProvider = timeProvider;
|
||||
_service = service;
|
||||
}
|
||||
|
||||
[HttpGet("notifications")]
|
||||
public async Task<IActionResult> GetNotifications()
|
||||
private string Actor() => User.FindFirstValue(ClaimTypes.NameIdentifier)
|
||||
?? User.Identity?.Name
|
||||
?? "unknown";
|
||||
|
||||
private IActionResult Map<T>(VendorOperationOutcome<T> outcome) => outcome.Kind switch
|
||||
{
|
||||
var now = _timeProvider.GetUtcNow().UtcDateTime;
|
||||
var cutoff = now.AddHours(48);
|
||||
VendorOperationOutcomeKind.Ok => Ok(outcome.Value),
|
||||
VendorOperationOutcomeKind.NotFound => outcome.Message is null
|
||||
? NotFound()
|
||||
: NotFound(new Response { Status = "Error", Message = outcome.Message }),
|
||||
VendorOperationOutcomeKind.BadRequest => BadRequest(new Response { Status = "Error", Message = outcome.Message }),
|
||||
VendorOperationOutcomeKind.Conflict => Conflict(new Response { Status = "Conflict", Message = outcome.Message }),
|
||||
_ => StatusCode(StatusCodes.Status500InternalServerError)
|
||||
};
|
||||
|
||||
var directlyAssignedIds = await _db.Dispatches
|
||||
.AsNoTracking()
|
||||
.Where(d => !TerminalDispatchStatuses.Contains(d.Status ?? "") && d.WorkOrderId.HasValue)
|
||||
.Select(d => d.WorkOrderId!.Value)
|
||||
.ToListAsync();
|
||||
var multiplyAssignedIds = await _db.DispatchWorkOrders
|
||||
.AsNoTracking()
|
||||
.Where(link => link.Dispatch != null
|
||||
&& !TerminalDispatchStatuses.Contains(link.Dispatch.Status ?? ""))
|
||||
.Select(link => link.WorkOrderId)
|
||||
.ToListAsync();
|
||||
var assignedWorkOrderIds = directlyAssignedIds.Concat(multiplyAssignedIds).Distinct().ToList();
|
||||
|
||||
var noVendor = await _db.workOrders
|
||||
.AsNoTracking()
|
||||
.Where(wo => wo.ScheduledDate.HasValue
|
||||
&& wo.ScheduledDate.Value <= cutoff
|
||||
&& wo.LifecycleStatus != LifecycleStatus.Completed
|
||||
&& wo.LifecycleStatus != LifecycleStatus.Canceled
|
||||
&& !assignedWorkOrderIds.Contains(wo.Id))
|
||||
.OrderBy(wo => wo.ScheduledDate)
|
||||
.Select(wo => new
|
||||
{
|
||||
Id = $"no-vendor-{wo.Id}",
|
||||
Type = "NoVendor",
|
||||
Severity = "Medium",
|
||||
Group = "No Vendor",
|
||||
Title = "No vendor assigned — 48h to service",
|
||||
WorkOrderId = wo.Id,
|
||||
WorkOrderNumber = wo.InternalWONumber ?? wo.WorkerOrderNumber,
|
||||
TriggeredAt = wo.ScheduledDate!.Value.AddHours(-48),
|
||||
ScheduledAt = wo.ScheduledDate,
|
||||
Action = new { Label = "Choose vendor", Href = $"/workorders/{wo.Id}?assignVendor=1" }
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var dispatches = await ActiveScheduledDispatches().ToListAsync();
|
||||
var conflicts = BuildConflictPairs(dispatches)
|
||||
.Select(pair => new
|
||||
{
|
||||
Id = $"vendor-conflict-{pair.Left.Id}-{pair.Right.Id}",
|
||||
Type = "VendorConflict",
|
||||
Severity = "Medium",
|
||||
Group = "Vendor Conflict",
|
||||
Title = "Vendor has overlapping appointments",
|
||||
VendorId = pair.Left.VendorId,
|
||||
VendorName = pair.Left.VendorName,
|
||||
WorkOrders = new[]
|
||||
{
|
||||
new { pair.Left.WorkOrderId, pair.Left.WorkOrderNumber, pair.Left.Start, pair.Left.End },
|
||||
new { pair.Right.WorkOrderId, pair.Right.WorkOrderNumber, pair.Right.Start, pair.Right.End }
|
||||
},
|
||||
TriggeredAt = pair.Left.Start < pair.Right.Start ? pair.Left.Start : pair.Right.Start,
|
||||
Actions = new[]
|
||||
{
|
||||
new { Label = pair.Left.WorkOrderNumber ?? "Open work order", Href = $"/workorders/{pair.Left.WorkOrderId}" },
|
||||
new { Label = pair.Right.WorkOrderNumber ?? "Open work order", Href = $"/workorders/{pair.Right.WorkOrderId}" }
|
||||
}
|
||||
})
|
||||
.ToList();
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
GeneratedAt = now,
|
||||
Items = noVendor.Cast<object>().Concat(conflicts).OrderBy(item =>
|
||||
item.GetType().GetProperty("TriggeredAt")?.GetValue(item)).ToList()
|
||||
});
|
||||
[HttpGet("notifications")]
|
||||
public async Task<IActionResult> GetNotifications(CancellationToken cancellationToken)
|
||||
{
|
||||
var result = await _service.GetNotificationsAsync(cancellationToken);
|
||||
return Ok(new { result.GeneratedAt, result.Items });
|
||||
}
|
||||
|
||||
[HttpGet("availability")]
|
||||
|
|
@ -109,342 +47,53 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[FromQuery] DateTime? start,
|
||||
[FromQuery] DateTime? end,
|
||||
[FromQuery] int? locationId,
|
||||
[FromQuery] string? trade)
|
||||
[FromQuery] string? trade,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var now = _timeProvider.GetUtcNow().UtcDateTime;
|
||||
var requestedStart = start ?? now;
|
||||
var requestedEnd = end ?? requestedStart.AddHours(2);
|
||||
if (requestedEnd <= requestedStart)
|
||||
return BadRequest(new Response { Status = "Error", Message = "end must be after start" });
|
||||
|
||||
var vendors = await _db.Vendors.AsNoTracking()
|
||||
.Where(v => v.IsActive && (v.IsDeleted == null || v.IsDeleted == false))
|
||||
.ToListAsync();
|
||||
|
||||
var preferences = locationId.HasValue
|
||||
? await _db.SitePreferredVendors.AsNoTracking()
|
||||
.Where(p => p.LocationId == locationId.Value)
|
||||
.ToListAsync()
|
||||
: new List<SitePreferredVendor>();
|
||||
|
||||
var dispatches = await ActiveScheduledDispatches().ToListAsync();
|
||||
var result = vendors.Select(vendor =>
|
||||
{
|
||||
var matchingDispatches = dispatches
|
||||
.Where(dispatch => dispatch.VendorId == vendor.Id
|
||||
&& WindowsOverlap(requestedStart, requestedEnd, dispatch.Start, dispatch.End))
|
||||
.ToList();
|
||||
var matchingPreference = preferences
|
||||
.Where(preference => preference.VendorId == vendor.Id
|
||||
&& (string.IsNullOrWhiteSpace(preference.Trade)
|
||||
|| string.Equals(preference.Trade, trade, StringComparison.OrdinalIgnoreCase)))
|
||||
.OrderBy(preference => preference.SortOrder)
|
||||
.FirstOrDefault();
|
||||
var signalIsFresh = vendor.AvailabilityUpdatedAt.HasValue
|
||||
&& vendor.AvailabilityUpdatedAt.Value >= now.AddHours(-24);
|
||||
var status = matchingDispatches.Count > 0
|
||||
? "Unavailable"
|
||||
: signalIsFresh && new[] { "Available", "Unavailable" }.Contains(vendor.AvailabilityStatus)
|
||||
? vendor.AvailabilityStatus
|
||||
: "Unknown";
|
||||
|
||||
return new
|
||||
{
|
||||
vendor.Id,
|
||||
vendor.CompanyName,
|
||||
vendor.ContactName,
|
||||
vendor.TradeSpecialties,
|
||||
AvailabilityStatus = status,
|
||||
vendor.AvailabilityUpdatedAt,
|
||||
IsPreferred = matchingPreference != null,
|
||||
PreferenceRank = matchingPreference?.SortOrder,
|
||||
Conflicts = matchingDispatches.Select(dispatch => new
|
||||
{
|
||||
dispatch.WorkOrderId,
|
||||
dispatch.WorkOrderNumber,
|
||||
dispatch.Start,
|
||||
dispatch.End
|
||||
})
|
||||
};
|
||||
})
|
||||
.OrderBy(vendor => vendor.IsPreferred ? 0 : 1)
|
||||
.ThenBy(vendor => vendor.PreferenceRank ?? int.MaxValue)
|
||||
.ThenBy(vendor => vendor.AvailabilityStatus == "Available" ? 0
|
||||
: vendor.AvailabilityStatus == "Unknown" ? 1 : 2)
|
||||
.ThenBy(vendor => vendor.CompanyName)
|
||||
.ToList();
|
||||
|
||||
return Ok(new { GeneratedAt = now, StaleAfterHours = 24, Data = result });
|
||||
var outcome = await _service.GetAvailabilityAsync(start, end, locationId, trade, cancellationToken);
|
||||
return Map(outcome);
|
||||
}
|
||||
|
||||
[HttpPut("vendors/{vendorId:int}/availability")]
|
||||
public async Task<IActionResult> UpdateAvailability(int vendorId, [FromBody] AvailabilityRequest body)
|
||||
public async Task<IActionResult> UpdateAvailability(int vendorId, [FromBody] VendorAvailabilityRequest body, CancellationToken cancellationToken)
|
||||
{
|
||||
var normalized = body.Status?.Trim();
|
||||
if (normalized is not ("Available" or "Unavailable" or "Unknown"))
|
||||
return BadRequest(new Response { Status = "Error", Message = "status must be Available, Unavailable, or Unknown" });
|
||||
|
||||
var vendor = await _db.Vendors.FindAsync(vendorId);
|
||||
if (vendor == null) return NotFound();
|
||||
|
||||
var now = _timeProvider.GetUtcNow().UtcDateTime;
|
||||
var actor = Actor();
|
||||
var previous = vendor.AvailabilityStatus;
|
||||
vendor.AvailabilityStatus = normalized;
|
||||
vendor.AvailabilityUpdatedAt = now;
|
||||
vendor.LastModificationTime = now;
|
||||
_db.VendorAuditLogs.Add(new VendorAuditLog
|
||||
{
|
||||
VendorId = vendorId,
|
||||
FieldName = nameof(Vendor.AvailabilityStatus),
|
||||
OldValue = previous,
|
||||
NewValue = normalized,
|
||||
Actor = actor,
|
||||
CreatedAt = now
|
||||
});
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { vendor.Id, vendor.AvailabilityStatus, vendor.AvailabilityUpdatedAt });
|
||||
var outcome = await _service.UpdateAvailabilityAsync(vendorId, body?.Status, Actor(), cancellationToken);
|
||||
return Map(outcome);
|
||||
}
|
||||
|
||||
[HttpGet("sites/{locationId:int}/preferred-vendors")]
|
||||
public async Task<IActionResult> GetSitePreferences(int locationId)
|
||||
public async Task<IActionResult> GetSitePreferences(int locationId, CancellationToken cancellationToken)
|
||||
{
|
||||
var preferences = await _db.SitePreferredVendors
|
||||
.AsNoTracking()
|
||||
.Where(p => p.LocationId == locationId)
|
||||
.Include(p => p.Vendor)
|
||||
.OrderBy(p => p.SortOrder)
|
||||
.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
p.LocationId,
|
||||
p.VendorId,
|
||||
VendorName = p.Vendor!.CompanyName,
|
||||
p.Trade,
|
||||
p.SortOrder,
|
||||
IsStale = !p.Vendor.IsActive || (p.Vendor.IsDeleted ?? false),
|
||||
p.LastModificationTime,
|
||||
p.UpdatedBy
|
||||
})
|
||||
.ToListAsync();
|
||||
var preferences = await _service.GetSitePreferencesAsync(locationId, cancellationToken);
|
||||
return Ok(preferences);
|
||||
}
|
||||
|
||||
[HttpPut("sites/{locationId:int}/preferred-vendors")]
|
||||
public async Task<IActionResult> ReplaceSitePreferences(int locationId, [FromBody] List<SitePreferenceRequest> body)
|
||||
public async Task<IActionResult> ReplaceSitePreferences(int locationId, [FromBody] List<SitePreferenceRequest> body, CancellationToken cancellationToken)
|
||||
{
|
||||
if (!await _db.Locations.AnyAsync(location => location.Id == locationId))
|
||||
return NotFound(new Response { Status = "Error", Message = "Location not found" });
|
||||
if (body.GroupBy(item => new { item.VendorId, Trade = item.Trade?.Trim().ToLowerInvariant() }).Any(group => group.Count() > 1))
|
||||
return BadRequest(new Response { Status = "Error", Message = "Duplicate vendor/trade preference" });
|
||||
|
||||
var vendorIds = body.Select(item => item.VendorId).Distinct().ToList();
|
||||
var vendors = await _db.Vendors.Where(vendor => vendorIds.Contains(vendor.Id)).ToDictionaryAsync(vendor => vendor.Id);
|
||||
foreach (var item in body)
|
||||
{
|
||||
if (!vendors.TryGetValue(item.VendorId, out var vendor) || !vendor.IsActive || (vendor.IsDeleted ?? false))
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Vendor {item.VendorId} is inactive or missing" });
|
||||
if (!string.IsNullOrWhiteSpace(item.Trade)
|
||||
&& !(vendor.TradeSpecialties ?? "").Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
|
||||
.Contains(item.Trade.Trim(), StringComparer.OrdinalIgnoreCase))
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Vendor {item.VendorId} does not support trade '{item.Trade}'" });
|
||||
}
|
||||
|
||||
var now = _timeProvider.GetUtcNow().UtcDateTime;
|
||||
var actor = Actor();
|
||||
var existing = await _db.SitePreferredVendors.Where(p => p.LocationId == locationId).ToListAsync();
|
||||
_db.SitePreferredVendors.RemoveRange(existing);
|
||||
_db.SitePreferredVendors.AddRange(body.Select((item, index) => new SitePreferredVendor
|
||||
{
|
||||
LocationId = locationId,
|
||||
VendorId = item.VendorId,
|
||||
Trade = string.IsNullOrWhiteSpace(item.Trade) ? null : item.Trade.Trim(),
|
||||
SortOrder = item.SortOrder ?? index,
|
||||
CreatedDate = now,
|
||||
LastModificationTime = now,
|
||||
createdby = actor,
|
||||
UpdatedBy = actor
|
||||
}));
|
||||
foreach (var vendorId in existing.Select(p => p.VendorId).Concat(vendorIds).Distinct())
|
||||
{
|
||||
_db.VendorAuditLogs.Add(new VendorAuditLog
|
||||
{
|
||||
VendorId = vendorId,
|
||||
FieldName = $"SitePreference:{locationId}",
|
||||
OldValue = string.Join(",", existing.Where(p => p.VendorId == vendorId).Select(p => $"{p.Trade}:{p.SortOrder}")),
|
||||
NewValue = string.Join(",", body.Where(p => p.VendorId == vendorId).Select(p => $"{p.Trade}:{p.SortOrder}")),
|
||||
Actor = actor,
|
||||
CreatedAt = now
|
||||
});
|
||||
}
|
||||
await _db.SaveChangesAsync();
|
||||
return await GetSitePreferences(locationId);
|
||||
var outcome = await _service.ReplaceSitePreferencesAsync(locationId, body ?? new List<SitePreferenceRequest>(), Actor(), cancellationToken);
|
||||
return Map(outcome);
|
||||
}
|
||||
|
||||
[HttpPut("documents/{documentId:int}/review")]
|
||||
public async Task<IActionResult> ReviewDocument(int documentId, [FromBody] DocumentReviewRequest body)
|
||||
public async Task<IActionResult> ReviewDocument(int documentId, [FromBody] DocumentReviewRequest body, CancellationToken cancellationToken)
|
||||
{
|
||||
if (body.ReviewStatus is not ("Approved" or "Rejected"))
|
||||
return BadRequest(new Response { Status = "Error", Message = "reviewStatus must be Approved or Rejected" });
|
||||
if (body.ReviewStatus == "Rejected" && string.IsNullOrWhiteSpace(body.RejectionReason))
|
||||
return BadRequest(new Response { Status = "Error", Message = "A rejection reason is required" });
|
||||
|
||||
var document = await _db.VendorCompletionDocuments.FindAsync(documentId);
|
||||
if (document == null) return NotFound();
|
||||
if (document.ScanStatus != "Passed")
|
||||
return Conflict(new Response { Status = "Conflict", Message = "A document cannot be approved or reviewed until malware scanning passes" });
|
||||
|
||||
var now = _timeProvider.GetUtcNow().UtcDateTime;
|
||||
var previous = document.ReviewStatus;
|
||||
document.ReviewStatus = body.ReviewStatus;
|
||||
document.RejectionReason = body.ReviewStatus == "Rejected" ? body.RejectionReason?.Trim() : null;
|
||||
document.ReviewedAt = now;
|
||||
document.LastModificationTime = now;
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
{
|
||||
WorkOrderId = document.WorkOrderId,
|
||||
UserId = Actor(),
|
||||
FieldName = $"Completion Document {document.OriginalFileName}",
|
||||
OldValue = previous,
|
||||
NewValue = document.ReviewStatus,
|
||||
Action = "completion_document_reviewed",
|
||||
CreatedAt = now
|
||||
});
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new { document.Id, document.ReviewStatus, document.RejectionReason, document.ReviewedAt });
|
||||
var outcome = await _service.ReviewDocumentAsync(documentId, body ?? new DocumentReviewRequest(), Actor(), cancellationToken);
|
||||
return Map(outcome);
|
||||
}
|
||||
|
||||
[HttpPut("dispatches/{dispatchId:int}/commercial-status")]
|
||||
public async Task<IActionResult> UpdateCommercialStatus(int dispatchId, [FromBody] CommercialStatusRequest body)
|
||||
public async Task<IActionResult> UpdateCommercialStatus(int dispatchId, [FromBody] CommercialStatusRequest body, CancellationToken cancellationToken)
|
||||
{
|
||||
var invoiceStatuses = new[] { "Not Submitted", "Processing", "Confirmed", "Rejected" };
|
||||
var paymentStatuses = new[] { "Unavailable", "Pending", "Scheduled", "Paid", "On Hold" };
|
||||
if (!invoiceStatuses.Contains(body.InvoiceStatus))
|
||||
return BadRequest(new Response { Status = "Error", Message = "Invalid invoice status" });
|
||||
if (!paymentStatuses.Contains(body.PaymentStatus))
|
||||
return BadRequest(new Response { Status = "Error", Message = "Invalid payment status" });
|
||||
|
||||
var dispatch = await _db.Dispatches.FindAsync(dispatchId);
|
||||
if (dispatch == null) return NotFound();
|
||||
var now = _timeProvider.GetUtcNow().UtcDateTime;
|
||||
var oldValue = $"{dispatch.InvoiceStatus}|{dispatch.PaymentStatus}|{dispatch.InvoiceNumber}";
|
||||
dispatch.InvoiceStatus = body.InvoiceStatus;
|
||||
dispatch.PaymentStatus = body.PaymentStatus;
|
||||
dispatch.InvoiceNumber = string.IsNullOrWhiteSpace(body.InvoiceNumber) ? null : body.InvoiceNumber.Trim();
|
||||
dispatch.CommercialStatusUpdatedAt = now;
|
||||
dispatch.LastModificationTime = now;
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
UserId = Actor(),
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber} Commercial Status",
|
||||
OldValue = oldValue,
|
||||
NewValue = $"{dispatch.InvoiceStatus}|{dispatch.PaymentStatus}|{dispatch.InvoiceNumber}",
|
||||
Action = "commercial_status_updated",
|
||||
CreatedAt = now
|
||||
});
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new
|
||||
{
|
||||
dispatch.Id,
|
||||
dispatch.PONumber,
|
||||
dispatch.InvoiceNumber,
|
||||
dispatch.InvoiceStatus,
|
||||
dispatch.PaymentStatus,
|
||||
dispatch.CommercialStatusUpdatedAt
|
||||
});
|
||||
var outcome = await _service.UpdateCommercialStatusAsync(dispatchId, body ?? new CommercialStatusRequest(), Actor(), cancellationToken);
|
||||
return Map(outcome);
|
||||
}
|
||||
|
||||
[HttpPut("work-orders/{workOrderId:int}/assignment")]
|
||||
public async Task<IActionResult> AssignVendor(int workOrderId, [FromBody] VendorAssignmentRequest body)
|
||||
public async Task<IActionResult> AssignVendor(int workOrderId, [FromBody] VendorAssignmentRequest body, CancellationToken cancellationToken)
|
||||
{
|
||||
var workOrder = await _db.workOrders.FindAsync(workOrderId);
|
||||
if (workOrder == null) return NotFound(new Response { Status = "Error", Message = "Work order not found" });
|
||||
var vendor = await _db.Vendors.FindAsync(body.VendorId);
|
||||
if (vendor == null || !vendor.IsActive || (vendor.IsDeleted ?? false))
|
||||
return BadRequest(new Response { Status = "Error", Message = "Only an active vendor can be assigned" });
|
||||
|
||||
var start = body.ScheduledStart ?? workOrder.ScheduledStart ?? workOrder.ScheduledDate;
|
||||
var end = body.ScheduledEnd ?? workOrder.ScheduledEnd ?? start?.AddHours(2);
|
||||
var scheduledDispatches = start.HasValue && end.HasValue
|
||||
? await ActiveScheduledDispatches()
|
||||
.Where(dispatch => dispatch.VendorId == vendor.Id && dispatch.WorkOrderId != workOrderId)
|
||||
.ToListAsync()
|
||||
: new List<ScheduledDispatch>();
|
||||
var conflicts = start.HasValue && end.HasValue
|
||||
? scheduledDispatches.Where(dispatch => WindowsOverlap(start.Value, end.Value, dispatch.Start, dispatch.End)).ToList()
|
||||
: new List<ScheduledDispatch>();
|
||||
|
||||
var linkedDispatchIds = _db.DispatchWorkOrders
|
||||
.Where(link => link.WorkOrderId == workOrderId)
|
||||
.Select(link => link.DispatchId);
|
||||
var dispatch = await _db.Dispatches
|
||||
.Where(item => (item.WorkOrderId == workOrderId || linkedDispatchIds.Contains(item.Id))
|
||||
&& !TerminalDispatchStatuses.Contains(item.Status ?? ""))
|
||||
.OrderByDescending(item => item.CreatedDate)
|
||||
.FirstOrDefaultAsync();
|
||||
var now = _timeProvider.GetUtcNow().UtcDateTime;
|
||||
var previousVendorId = dispatch?.VendorId;
|
||||
if (dispatch == null)
|
||||
{
|
||||
dispatch = new Dispatch
|
||||
{
|
||||
WorkOrderId = workOrderId,
|
||||
VendorId = vendor.Id,
|
||||
DispatchNumber = await _dispatchDataService.GenerateNextDispatchNumberAsync(),
|
||||
PONumber = await _dispatchDataService.GenerateNextPONumberAsync(),
|
||||
Status = "Sent",
|
||||
ScheduledDate = start,
|
||||
EstimatedArrivalAt = body.EstimatedArrivalAt,
|
||||
EtaManualOverride = body.EtaManualOverride,
|
||||
DispatchedAt = now,
|
||||
CreatedDate = now,
|
||||
createdby = Actor()
|
||||
};
|
||||
_db.Dispatches.Add(dispatch);
|
||||
}
|
||||
else
|
||||
{
|
||||
dispatch.VendorId = vendor.Id;
|
||||
dispatch.ScheduledDate = start;
|
||||
dispatch.EstimatedArrivalAt = body.EstimatedArrivalAt;
|
||||
dispatch.EtaManualOverride = body.EtaManualOverride;
|
||||
dispatch.LastModificationTime = now;
|
||||
}
|
||||
|
||||
workOrder.ScheduledStart = body.ScheduledStart ?? workOrder.ScheduledStart;
|
||||
workOrder.ScheduledEnd = body.ScheduledEnd ?? workOrder.ScheduledEnd;
|
||||
workOrder.ScheduledDate = start ?? workOrder.ScheduledDate;
|
||||
workOrder.LastModificationTime = now;
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
{
|
||||
WorkOrderId = workOrderId,
|
||||
UserId = Actor(),
|
||||
FieldName = "Vendor Assignment",
|
||||
OldValue = previousVendorId?.ToString(),
|
||||
NewValue = vendor.Id.ToString(),
|
||||
Action = previousVendorId.HasValue ? "vendor_assignment_changed" : "vendor_assigned",
|
||||
CreatedAt = now
|
||||
});
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return Ok(new
|
||||
{
|
||||
dispatch.Id,
|
||||
dispatch.VendorId,
|
||||
VendorName = vendor.CompanyName,
|
||||
dispatch.EstimatedArrivalAt,
|
||||
dispatch.EtaManualOverride,
|
||||
AvailabilityStatus = conflicts.Count > 0 ? "Unavailable"
|
||||
: vendor.AvailabilityUpdatedAt >= now.AddHours(-24) ? vendor.AvailabilityStatus : "Unknown",
|
||||
Conflicts = conflicts.Select(conflict => new
|
||||
{
|
||||
conflict.WorkOrderId,
|
||||
conflict.WorkOrderNumber,
|
||||
conflict.Start,
|
||||
conflict.End
|
||||
})
|
||||
});
|
||||
var outcome = await _service.AssignVendorAsync(workOrderId, body ?? new VendorAssignmentRequest(), Actor(), cancellationToken);
|
||||
return Map(outcome);
|
||||
}
|
||||
|
||||
[HttpGet("insights")]
|
||||
|
|
@ -453,12 +102,13 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[FromQuery] DateTime? to,
|
||||
[FromQuery] int? locationId,
|
||||
[FromQuery] string? trade,
|
||||
[FromQuery] int? vendorId)
|
||||
[FromQuery] int? vendorId,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var rows = await BuildInsightRows(from, to, locationId, trade, vendorId);
|
||||
var rows = await _service.GetInsightRowsAsync(from, to, locationId, trade, vendorId, cancellationToken);
|
||||
return Ok(new
|
||||
{
|
||||
GeneratedAt = _timeProvider.GetUtcNow().UtcDateTime,
|
||||
GeneratedAt = _service.UtcNow,
|
||||
Filters = new { from, to, locationId, trade, vendorId },
|
||||
MetricDefinitions = MetricDefinitions(),
|
||||
Data = rows
|
||||
|
|
@ -471,9 +121,10 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[FromQuery] DateTime? to,
|
||||
[FromQuery] int? locationId,
|
||||
[FromQuery] string? trade,
|
||||
[FromQuery] int? vendorId)
|
||||
[FromQuery] int? vendorId,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var rows = await BuildInsightRows(from, to, locationId, trade, vendorId);
|
||||
var rows = await _service.GetInsightRowsAsync(from, to, locationId, trade, vendorId, cancellationToken);
|
||||
var csv = new StringBuilder("VendorId,Vendor,CompletedJobs,CancellationRefusalRate,OnTimeArrivalRate,OnTimeCompletionRate,AverageCycleHours\n");
|
||||
foreach (var row in rows)
|
||||
{
|
||||
|
|
@ -486,7 +137,7 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
row.OnTimeCompletionRate.ToString("0.####"),
|
||||
row.AverageCycleHours?.ToString("0.##") ?? ""));
|
||||
}
|
||||
return File(Encoding.UTF8.GetBytes(csv.ToString()), "text/csv", $"vendor-insights-{DateTime.UtcNow:yyyyMMddHHmmss}.csv");
|
||||
return File(Encoding.UTF8.GetBytes(csv.ToString()), "text/csv", $"vendor-insights-{_service.UtcNow:yyyyMMddHHmmss}.csv");
|
||||
}
|
||||
|
||||
[HttpGet("insights.pdf")]
|
||||
|
|
@ -495,131 +146,22 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
[FromQuery] DateTime? to,
|
||||
[FromQuery] int? locationId,
|
||||
[FromQuery] string? trade,
|
||||
[FromQuery] int? vendorId)
|
||||
[FromQuery] int? vendorId,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var rows = await BuildInsightRows(from, to, locationId, trade, vendorId);
|
||||
var rows = await _service.GetInsightRowsAsync(from, to, locationId, trade, vendorId, cancellationToken);
|
||||
var lines = new List<string>
|
||||
{
|
||||
"Vendor Performance Insights",
|
||||
$"Generated: {_timeProvider.GetUtcNow():u}",
|
||||
$"Generated: {_service.UtcNow:u}",
|
||||
$"Filters: from={from:u}; to={to:u}; site={locationId}; trade={trade}; vendor={vendorId}",
|
||||
"Definitions: completed jobs; cancellation/refusal rate; on-time acknowledgement; on-time completion; average dispatch-to-completion hours."
|
||||
};
|
||||
lines.AddRange(rows.Take(35).Select(row =>
|
||||
$"{row.Vendor}: completed {row.CompletedJobs}; cancel/refusal {row.CancellationRefusalRate:P1}; arrival {row.OnTimeArrivalRate:P1}; completion {row.OnTimeCompletionRate:P1}; cycle {row.AverageCycleHours:0.0}h"));
|
||||
return File(SimplePdf(lines), "application/pdf", $"vendor-insights-{DateTime.UtcNow:yyyyMMddHHmmss}.pdf");
|
||||
return File(SimplePdf(lines), "application/pdf", $"vendor-insights-{_service.UtcNow:yyyyMMddHHmmss}.pdf");
|
||||
}
|
||||
|
||||
private IQueryable<ScheduledDispatch> ActiveScheduledDispatches()
|
||||
{
|
||||
var direct = _db.Dispatches.AsNoTracking()
|
||||
.Where(dispatch => !TerminalDispatchStatuses.Contains(dispatch.Status ?? "")
|
||||
&& (dispatch.IsDeleted == null || dispatch.IsDeleted == false)
|
||||
&& dispatch.WorkOrderId.HasValue
|
||||
&& (dispatch.ScheduledDate.HasValue
|
||||
|| (dispatch.WorkOrder != null && dispatch.WorkOrder.ScheduledStart.HasValue)))
|
||||
.Select(dispatch => new ScheduledDispatch
|
||||
{
|
||||
Id = dispatch.Id,
|
||||
VendorId = dispatch.VendorId,
|
||||
VendorName = dispatch.Vendor!.CompanyName,
|
||||
WorkOrderId = dispatch.WorkOrderId!.Value,
|
||||
WorkOrderNumber = dispatch.WorkOrder!.InternalWONumber ?? dispatch.WorkOrder.WorkerOrderNumber,
|
||||
Start = dispatch.WorkOrder!.ScheduledStart ?? dispatch.ScheduledDate!.Value,
|
||||
End = dispatch.WorkOrder.ScheduledEnd
|
||||
?? (dispatch.WorkOrder.ScheduledStart ?? dispatch.ScheduledDate!.Value).AddHours(2)
|
||||
});
|
||||
|
||||
var linked = _db.DispatchWorkOrders.AsNoTracking()
|
||||
.Where(link => link.Dispatch != null
|
||||
&& link.WorkOrder != null
|
||||
&& link.Dispatch.WorkOrderId != link.WorkOrderId
|
||||
&& !TerminalDispatchStatuses.Contains(link.Dispatch.Status ?? "")
|
||||
&& (link.Dispatch.IsDeleted == null || link.Dispatch.IsDeleted == false)
|
||||
&& (link.Dispatch.ScheduledDate.HasValue || link.WorkOrder.ScheduledStart.HasValue))
|
||||
.Select(link => new ScheduledDispatch
|
||||
{
|
||||
Id = link.DispatchId,
|
||||
VendorId = link.Dispatch!.VendorId,
|
||||
VendorName = link.Dispatch.Vendor!.CompanyName,
|
||||
WorkOrderId = link.WorkOrderId,
|
||||
WorkOrderNumber = link.WorkOrder!.InternalWONumber ?? link.WorkOrder.WorkerOrderNumber,
|
||||
Start = link.WorkOrder.ScheduledStart ?? link.Dispatch.ScheduledDate!.Value,
|
||||
End = link.WorkOrder.ScheduledEnd
|
||||
?? (link.WorkOrder.ScheduledStart ?? link.Dispatch.ScheduledDate!.Value).AddHours(2)
|
||||
});
|
||||
|
||||
return direct.Concat(linked);
|
||||
}
|
||||
|
||||
private static IEnumerable<(ScheduledDispatch Left, ScheduledDispatch Right)> BuildConflictPairs(List<ScheduledDispatch> dispatches)
|
||||
{
|
||||
for (var leftIndex = 0; leftIndex < dispatches.Count; leftIndex++)
|
||||
{
|
||||
for (var rightIndex = leftIndex + 1; rightIndex < dispatches.Count; rightIndex++)
|
||||
{
|
||||
var left = dispatches[leftIndex];
|
||||
var right = dispatches[rightIndex];
|
||||
if (left.VendorId == right.VendorId
|
||||
&& left.WorkOrderId != right.WorkOrderId
|
||||
&& WindowsOverlap(left.Start, left.End, right.Start, right.End))
|
||||
yield return (left, right);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<List<VendorInsightRow>> BuildInsightRows(
|
||||
DateTime? from, DateTime? to, int? locationId, string? trade, int? vendorId)
|
||||
{
|
||||
var query = _db.Dispatches.AsNoTracking()
|
||||
.Include(dispatch => dispatch.Vendor)
|
||||
.Include(dispatch => dispatch.WorkOrder)
|
||||
.Where(dispatch => dispatch.Vendor != null);
|
||||
if (from.HasValue) query = query.Where(dispatch => (dispatch.DispatchedAt ?? dispatch.CreatedDate) >= from);
|
||||
if (to.HasValue) query = query.Where(dispatch => (dispatch.DispatchedAt ?? dispatch.CreatedDate) <= to);
|
||||
if (locationId.HasValue) query = query.Where(dispatch => dispatch.WorkOrder!.LocationId == locationId);
|
||||
if (!string.IsNullOrWhiteSpace(trade)) query = query.Where(dispatch => dispatch.WorkOrder!.Trade == trade);
|
||||
if (vendorId.HasValue) query = query.Where(dispatch => dispatch.VendorId == vendorId);
|
||||
|
||||
var dispatches = await query.ToListAsync();
|
||||
return dispatches.GroupBy(dispatch => dispatch.VendorId)
|
||||
.Select(group =>
|
||||
{
|
||||
var completed = group.Where(dispatch => dispatch.Status is "Completed" or "Verified").ToList();
|
||||
var canceled = group.Count(dispatch => dispatch.Status is "Cancelled" or "Canceled" or "Refused");
|
||||
var acknowledgedWithSchedule = group.Where(dispatch => dispatch.AcknowledgedAt.HasValue && dispatch.ScheduledDate.HasValue).ToList();
|
||||
var completedWithDue = completed.Where(dispatch => dispatch.CompletedDate.HasValue && dispatch.WorkOrder?.DueDate != null).ToList();
|
||||
var cycleRows = completed.Where(dispatch => dispatch.CompletedDate.HasValue && (dispatch.DispatchedAt ?? dispatch.CreatedDate).HasValue).ToList();
|
||||
return new VendorInsightRow
|
||||
{
|
||||
VendorId = group.Key,
|
||||
Vendor = group.First().Vendor?.CompanyName ?? $"Vendor {group.Key}",
|
||||
CompletedJobs = completed.Count,
|
||||
CancellationRefusalRate = Rate(canceled, group.Count()),
|
||||
OnTimeArrivalRate = Rate(
|
||||
acknowledgedWithSchedule.Count(dispatch => dispatch.AcknowledgedAt <= dispatch.ScheduledDate),
|
||||
acknowledgedWithSchedule.Count),
|
||||
OnTimeCompletionRate = Rate(
|
||||
completedWithDue.Count(dispatch => dispatch.CompletedDate <= dispatch.WorkOrder!.DueDate),
|
||||
completedWithDue.Count),
|
||||
AverageCycleHours = cycleRows.Count == 0 ? null : cycleRows.Average(dispatch =>
|
||||
(dispatch.CompletedDate!.Value - (dispatch.DispatchedAt ?? dispatch.CreatedDate)!.Value).TotalHours)
|
||||
};
|
||||
})
|
||||
.OrderBy(row => row.Vendor)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
private string Actor() => User.FindFirstValue(ClaimTypes.NameIdentifier)
|
||||
?? User.Identity?.Name
|
||||
?? "unknown";
|
||||
|
||||
private static bool WindowsOverlap(DateTime leftStart, DateTime leftEnd, DateTime rightStart, DateTime rightEnd)
|
||||
=> leftStart < rightEnd && rightStart < leftEnd;
|
||||
|
||||
private static decimal Rate(int numerator, int denominator)
|
||||
=> denominator == 0 ? 0 : Math.Round((decimal)numerator / denominator, 4);
|
||||
|
||||
private static string Csv(string value)
|
||||
{
|
||||
var spreadsheetSafe = value.Length > 0 && "=+-@\t\r".Contains(value[0])
|
||||
|
|
@ -664,61 +206,5 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
builder.Append($"trailer << /Size {objects.Length + 1} /Root 1 0 R >>\nstartxref\n{xrefOffset}\n%%EOF");
|
||||
return Encoding.ASCII.GetBytes(builder.ToString());
|
||||
}
|
||||
|
||||
public sealed class AvailabilityRequest
|
||||
{
|
||||
public string? Status { get; set; }
|
||||
}
|
||||
|
||||
public sealed class SitePreferenceRequest
|
||||
{
|
||||
public int VendorId { get; set; }
|
||||
public string? Trade { get; set; }
|
||||
public int? SortOrder { get; set; }
|
||||
}
|
||||
|
||||
public sealed class DocumentReviewRequest
|
||||
{
|
||||
public string ReviewStatus { get; set; } = "";
|
||||
public string? RejectionReason { get; set; }
|
||||
}
|
||||
|
||||
public sealed class CommercialStatusRequest
|
||||
{
|
||||
public string InvoiceStatus { get; set; } = "Not Submitted";
|
||||
public string PaymentStatus { get; set; } = "Unavailable";
|
||||
public string? InvoiceNumber { get; set; }
|
||||
}
|
||||
|
||||
public sealed class VendorAssignmentRequest
|
||||
{
|
||||
public int VendorId { get; set; }
|
||||
public DateTime? ScheduledStart { get; set; }
|
||||
public DateTime? ScheduledEnd { get; set; }
|
||||
public DateTime? EstimatedArrivalAt { get; set; }
|
||||
public bool EtaManualOverride { get; set; }
|
||||
}
|
||||
|
||||
private sealed class ScheduledDispatch
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int VendorId { get; set; }
|
||||
public string? VendorName { get; set; }
|
||||
public int WorkOrderId { get; set; }
|
||||
public string? WorkOrderNumber { get; set; }
|
||||
public DateTime Start { get; set; }
|
||||
public DateTime End { get; set; }
|
||||
}
|
||||
|
||||
private sealed class VendorInsightRow
|
||||
{
|
||||
public int VendorId { get; set; }
|
||||
public string Vendor { get; set; } = "";
|
||||
public int CompletedJobs { get; set; }
|
||||
public decimal CancellationRefusalRate { get; set; }
|
||||
public decimal OnTimeArrivalRate { get; set; }
|
||||
public decimal OnTimeCompletionRate { get; set; }
|
||||
public double? AverageCycleHours { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
|
|
@ -13,826 +15,260 @@ namespace Api.SeaHavenIndustries.Controllers
|
|||
{
|
||||
private const string TokenHeader = "X-Vendor-Token";
|
||||
|
||||
private static readonly string[] VendorViewableStatuses =
|
||||
new[] { "Sent", "Acknowledged", "In Progress", "Completed", "Verified", "Cancelled" };
|
||||
private readonly IVendorPortalService _portalService;
|
||||
private readonly ILogger<VendorPortalController> _logger;
|
||||
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly VendorPortalTokenService _tokens;
|
||||
private readonly IConfiguration _config;
|
||||
private readonly SendMessage _sendMessage;
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
|
||||
public VendorPortalController(
|
||||
ApplicationDbContext db,
|
||||
VendorPortalTokenService tokens,
|
||||
IConfiguration config,
|
||||
SendMessage sendMessage,
|
||||
IWebHostEnvironment environment)
|
||||
public VendorPortalController(IVendorPortalService portalService, ILogger<VendorPortalController> logger)
|
||||
{
|
||||
_db = db;
|
||||
_tokens = tokens;
|
||||
_config = config;
|
||||
_sendMessage = sendMessage;
|
||||
_environment = environment;
|
||||
_portalService = portalService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpGet("session")]
|
||||
public async Task<IActionResult> Session()
|
||||
public async Task<IActionResult> Session(CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new
|
||||
{
|
||||
vendor.Id,
|
||||
vendor.CompanyName,
|
||||
vendor.ContactName,
|
||||
vendor.Email,
|
||||
vendor.Phone
|
||||
}
|
||||
Data = session
|
||||
});
|
||||
}
|
||||
|
||||
[HttpGet("dispatches")]
|
||||
public async Task<IActionResult> ListDispatches([FromQuery] string? status = null)
|
||||
public async Task<IActionResult> ListDispatches([FromQuery] string? status = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var query = _db.Dispatches
|
||||
.Include(d => d.WorkOrder).ThenInclude(w => w!.Locations)
|
||||
.Where(d => d.VendorId == vendor.Id && (d.IsDeleted == null || d.IsDeleted == false));
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(status))
|
||||
{
|
||||
query = query.Where(d => d.Status == status);
|
||||
}
|
||||
|
||||
var dispatches = await query
|
||||
.OrderByDescending(d => d.DispatchedAt ?? d.CreatedDate)
|
||||
.Select(d => new
|
||||
{
|
||||
d.Id,
|
||||
d.DispatchNumber,
|
||||
d.PONumber,
|
||||
d.InvoiceNumber,
|
||||
d.InvoiceStatus,
|
||||
d.PaymentStatus,
|
||||
d.Status,
|
||||
d.NTEAmount,
|
||||
d.ScheduledDate,
|
||||
d.CompletedDate,
|
||||
d.DispatchedAt,
|
||||
d.AcknowledgedAt,
|
||||
WorkOrderTitle = d.WorkOrder!.WorkerOrderTitle,
|
||||
InternalWONumber = d.WorkOrder!.InternalWONumber,
|
||||
LocationName = d.WorkOrder!.Locations != null ? d.WorkOrder!.Locations.Name : null,
|
||||
LocationCity = d.WorkOrder!.Locations != null ? d.WorkOrder!.Locations.City : null,
|
||||
LocationState = d.WorkOrder!.Locations != null ? d.WorkOrder!.Locations.State : null
|
||||
})
|
||||
.ToListAsync();
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatches = await _portalService.ListDispatchesAsync(session, status, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = dispatches });
|
||||
}
|
||||
|
||||
[HttpGet("dispatches/{id:int}")]
|
||||
public async Task<IActionResult> GetDispatch(int id)
|
||||
public async Task<IActionResult> GetDispatch(int id, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
var detail = await _portalService.GetDispatchDetailAsync(session, id, cancellationToken);
|
||||
if (detail == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
var checklist = await _db.DispatchChecklistItems
|
||||
.Where(c => c.DispatchId == id && (c.IsDeleted == null || c.IsDeleted == false))
|
||||
.OrderBy(c => c.SortOrder)
|
||||
.Select(c => new { c.Id, c.ItemText, c.IsCompleted, c.CompletedBy, c.CompletedAt })
|
||||
.ToListAsync();
|
||||
|
||||
var signoffs = await _db.DispatchSignoffs
|
||||
.Where(s => s.DispatchId == id && (s.IsDeleted == null || s.IsDeleted == false))
|
||||
.Select(s => new { s.Id, s.SignoffType, s.Name, s.SignatureMethod, s.SignedAt })
|
||||
.ToListAsync();
|
||||
|
||||
var documents = await _db.VendorCompletionDocuments
|
||||
.Where(document => document.DispatchId == id && document.VendorId == vendor.Id)
|
||||
.OrderByDescending(document => document.CreatedDate)
|
||||
.Select(document => new
|
||||
{
|
||||
document.Id,
|
||||
document.OriginalFileName,
|
||||
document.ContentType,
|
||||
document.SizeBytes,
|
||||
document.ScanStatus,
|
||||
document.ReviewStatus,
|
||||
document.RejectionReason,
|
||||
document.Version,
|
||||
document.ReplacesDocumentId,
|
||||
document.CreatedDate,
|
||||
document.ScannedAt,
|
||||
document.ReviewedAt,
|
||||
CanDownload = document.ScanStatus == "Passed"
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var rawUplifts = await (from u in _db.DispatchUpliftRequests
|
||||
where u.DispatchId == id && (u.IsDeleted == null || u.IsDeleted == false)
|
||||
join dec in _db.Users on u.DecidedByUserId equals dec.Id into decs
|
||||
from dec in decs.DefaultIfEmpty()
|
||||
orderby u.CreatedDate descending
|
||||
select new
|
||||
{
|
||||
u.Id,
|
||||
u.CurrentNTE,
|
||||
u.RequestedNTE,
|
||||
u.VendorReason,
|
||||
u.Status,
|
||||
u.RequiredTier,
|
||||
u.RequestedByVendorName,
|
||||
u.CreatedDate,
|
||||
u.DecidedAt,
|
||||
u.DecisionNote,
|
||||
DecidedByFirstName = dec != null ? dec.FirstName : null,
|
||||
DecidedByLastName = dec != null ? dec.LastName : null
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var upliftRequests = rawUplifts.Select(u => new
|
||||
{
|
||||
u.Id,
|
||||
u.CurrentNTE,
|
||||
u.RequestedNTE,
|
||||
u.VendorReason,
|
||||
u.Status,
|
||||
u.RequiredTier,
|
||||
u.RequestedByVendorName,
|
||||
RequestedAt = u.CreatedDate,
|
||||
u.DecidedAt,
|
||||
u.DecisionNote,
|
||||
DecidedByName = string.Join(" ", new[] { u.DecidedByFirstName, u.DecidedByLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim()
|
||||
}).ToList();
|
||||
|
||||
var rawComments = await (from c in _db.Comments
|
||||
where c.DispatchId == id
|
||||
&& c.CommentType != "internal"
|
||||
&& (c.IsDeleted == null || c.IsDeleted == false)
|
||||
join u in _db.Users on c.UserId equals u.Id into users
|
||||
from u in users.DefaultIfEmpty()
|
||||
orderby c.CreatedDate
|
||||
select new
|
||||
{
|
||||
c.Id,
|
||||
c.Commenttext,
|
||||
c.Commenter,
|
||||
c.CommentType,
|
||||
c.CreatedDate,
|
||||
c.UserId,
|
||||
UserFirstName = u != null ? u.FirstName : null,
|
||||
UserLastName = u != null ? u.LastName : null
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
var comments = rawComments.Select(c =>
|
||||
{
|
||||
var hasShocUser = !string.IsNullOrWhiteSpace(c.UserId);
|
||||
var userName = string.Join(" ", new[] { c.UserFirstName, c.UserLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim();
|
||||
|
||||
string resolvedType;
|
||||
string resolvedCommenter;
|
||||
if (hasShocUser)
|
||||
{
|
||||
resolvedType = "dispatcher";
|
||||
resolvedCommenter = !string.IsNullOrWhiteSpace(userName) ? userName
|
||||
: !string.IsNullOrWhiteSpace(c.Commenter) ? c.Commenter!
|
||||
: "Dispatcher";
|
||||
}
|
||||
else if (c.CommentType == "customer")
|
||||
{
|
||||
resolvedType = "customer";
|
||||
resolvedCommenter = !string.IsNullOrWhiteSpace(c.Commenter) ? c.Commenter! : "Customer";
|
||||
}
|
||||
else
|
||||
{
|
||||
resolvedType = "vendor";
|
||||
resolvedCommenter = !string.IsNullOrWhiteSpace(c.Commenter) ? c.Commenter! : vendor.CompanyName ?? "Vendor";
|
||||
}
|
||||
|
||||
return new
|
||||
{
|
||||
c.Id,
|
||||
c.Commenttext,
|
||||
Commenter = resolvedCommenter,
|
||||
CommentType = resolvedType,
|
||||
c.CreatedDate
|
||||
};
|
||||
}).ToList();
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new
|
||||
{
|
||||
dispatch.Id,
|
||||
dispatch.DispatchNumber,
|
||||
dispatch.PONumber,
|
||||
dispatch.InvoiceNumber,
|
||||
dispatch.InvoiceStatus,
|
||||
dispatch.PaymentStatus,
|
||||
dispatch.CommercialStatusUpdatedAt,
|
||||
dispatch.Status,
|
||||
dispatch.NTEAmount,
|
||||
dispatch.Description,
|
||||
dispatch.ScheduledDate,
|
||||
dispatch.CompletedDate,
|
||||
dispatch.DispatchedAt,
|
||||
dispatch.AcknowledgedAt,
|
||||
WorkOrder = dispatch.WorkOrder == null ? null : new
|
||||
{
|
||||
dispatch.WorkOrder.Id,
|
||||
dispatch.WorkOrder.InternalWONumber,
|
||||
dispatch.WorkOrder.WorkerOrderTitle,
|
||||
dispatch.WorkOrder.Description,
|
||||
dispatch.WorkOrder.Priority,
|
||||
dispatch.WorkOrder.DueDate,
|
||||
dispatch.WorkOrder.Trade,
|
||||
dispatch.WorkOrder.SubTrade,
|
||||
dispatch.WorkOrder.Problem
|
||||
},
|
||||
Location = dispatch.WorkOrder?.Locations == null ? null : new
|
||||
{
|
||||
dispatch.WorkOrder.Locations.Name,
|
||||
dispatch.WorkOrder.Locations.Address1,
|
||||
dispatch.WorkOrder.Locations.City,
|
||||
dispatch.WorkOrder.Locations.State,
|
||||
dispatch.WorkOrder.Locations.Zip
|
||||
},
|
||||
Checklist = checklist,
|
||||
Signoffs = signoffs,
|
||||
Documents = documents,
|
||||
Comments = comments,
|
||||
UpliftRequests = upliftRequests
|
||||
}
|
||||
});
|
||||
return Ok(new DataResponse { Status = "Success", Data = detail });
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/accept")]
|
||||
public async Task<IActionResult> Accept(int id)
|
||||
public async Task<IActionResult> Accept(int id, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
if (dispatch.Status != "Sent")
|
||||
try
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Cannot accept a dispatch with status '{dispatch.Status}'" });
|
||||
var result = await _portalService.AcceptDispatchAsync(session, id, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
dispatch.Status = "Acknowledged";
|
||||
dispatch.AcknowledgedAt = now;
|
||||
dispatch.LastModificationTime = now;
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber} Status",
|
||||
OldValue = "Sent",
|
||||
NewValue = "Acknowledged",
|
||||
Action = "vendor_accept",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { dispatch.Id, dispatch.Status, dispatch.AcknowledgedAt } });
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/status")]
|
||||
public async Task<IActionResult> ChangeStatus(int id, [FromBody] ChangeStatusRequest body)
|
||||
public async Task<IActionResult> ChangeStatus(int id, [FromBody] ChangeStatusRequest body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
var from = dispatch.Status;
|
||||
var to = body.Status;
|
||||
if (!IsAllowedVendorTransition(from, to))
|
||||
try
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Transition from '{from}' to '{to}' is not allowed" });
|
||||
var result = await _portalService.ChangeStatusAsync(session, id, body?.Status, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
dispatch.Status = to;
|
||||
dispatch.LastModificationTime = now;
|
||||
if (to == "Completed") dispatch.CompletedDate = now;
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber} Status",
|
||||
OldValue = from,
|
||||
NewValue = to,
|
||||
Action = "vendor_status_change",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { dispatch.Id, dispatch.Status, dispatch.CompletedDate } });
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/request-cancel")]
|
||||
public async Task<IActionResult> RequestCancel(int id, [FromBody] RequestCancelRequest body)
|
||||
public async Task<IActionResult> RequestCancel(int id, [FromBody] RequestCancelRequest body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
if (dispatch.Status == "Verified" || dispatch.Status == "Cancelled")
|
||||
try
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Cannot request cancel on a '{dispatch.Status}' dispatch" });
|
||||
await _portalService.RequestCancelAsync(session, id, body?.Reason, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Message = "Cancel request sent to dispatcher" });
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
var reason = string.IsNullOrWhiteSpace(body?.Reason) ? "(no reason provided)" : body!.Reason!.Trim();
|
||||
|
||||
_db.Comments.Add(new Comments
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
DispatchId = id,
|
||||
WorkerOrderId = dispatch.WorkOrderId,
|
||||
Commenter = vendor.CompanyName,
|
||||
CommentType = "vendor",
|
||||
RecordType = "cancel_request",
|
||||
Commenttext = $"Vendor requested cancellation: {reason}",
|
||||
CreatedDate = now
|
||||
});
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber}",
|
||||
OldValue = dispatch.Status,
|
||||
NewValue = "Cancel Requested",
|
||||
Action = "vendor_request_cancel",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Status = "Success", Message = "Cancel request sent to dispatcher" });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/checklist/{itemId:int}")]
|
||||
public async Task<IActionResult> UpdateChecklistItem(int id, int itemId, [FromBody] ChecklistUpdateRequest body)
|
||||
public async Task<IActionResult> UpdateChecklistItem(int id, int itemId, [FromBody] ChecklistUpdateRequest body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
if (dispatch.Status == "Verified" || dispatch.Status == "Cancelled")
|
||||
try
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "Dispatch is locked" });
|
||||
var result = await _portalService.UpdateChecklistItemAsync(session, id, itemId, body.IsCompleted, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
|
||||
var item = await _db.DispatchChecklistItems
|
||||
.FirstOrDefaultAsync(c => c.Id == itemId && c.DispatchId == id);
|
||||
if (item == null) return NotFound(new Response { Status = "Error", Message = "Checklist item not found" });
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
item.IsCompleted = body.IsCompleted;
|
||||
item.CompletedBy = body.IsCompleted ? vendor.CompanyName : null;
|
||||
item.CompletedAt = body.IsCompleted ? now : null;
|
||||
item.LastModificationTime = now;
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new { item.Id, item.IsCompleted, item.CompletedBy, item.CompletedAt }
|
||||
});
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/signoff")]
|
||||
public async Task<IActionResult> AddSignoff(int id, [FromBody] SignoffRequest body)
|
||||
public async Task<IActionResult> AddSignoff(int id, [FromBody] SignoffRequest body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
if (dispatch.Status != "In Progress" && dispatch.Status != "Completed")
|
||||
try
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "Signoffs only allowed on In Progress or Completed dispatches" });
|
||||
var result = await _portalService.AddSignoffAsync(session, id, body?.SignoffType, body?.Name, body?.Signature, body?.SignatureMethod, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(body?.Name) || string.IsNullOrWhiteSpace(body?.Signature))
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "Name and signature are required" });
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
|
||||
var signoffType = (body?.SignoffType ?? "vendor").Trim().ToLowerInvariant();
|
||||
if (signoffType != "vendor" && signoffType != "customer")
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "signoffType must be 'vendor' or 'customer'" });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
|
||||
var existing = await _db.DispatchSignoffs
|
||||
.FirstOrDefaultAsync(s => s.DispatchId == id && s.SignoffType == signoffType);
|
||||
if (existing != null)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = $"A {signoffType} signoff already exists for this dispatch" });
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
var signoff = new DispatchSignoff
|
||||
{
|
||||
DispatchId = id,
|
||||
SignoffType = signoffType,
|
||||
Name = body!.Name,
|
||||
Signature = body.Signature,
|
||||
SignatureMethod = body.SignatureMethod ?? "drawn",
|
||||
SignedAt = now,
|
||||
CreatedDate = now
|
||||
};
|
||||
_db.DispatchSignoffs.Add(signoff);
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber} Signoff",
|
||||
OldValue = null,
|
||||
NewValue = $"{(signoffType == "customer" ? "Customer" : "Vendor")}: {body.Name}",
|
||||
Action = signoffType == "customer" ? "customer_signoff" : "vendor_signoff",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { signoff.Id, signoff.SignedAt } });
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/comments")]
|
||||
public async Task<IActionResult> AddComment(int id, [FromBody] CommentRequest body)
|
||||
public async Task<IActionResult> AddComment(int id, [FromBody] CommentRequest body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
if (string.IsNullOrWhiteSpace(body?.CommentText))
|
||||
try
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "Comment cannot be empty" });
|
||||
var result = await _portalService.AddCommentAsync(session, id, body?.CommentText, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
var comment = new Comments
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
DispatchId = id,
|
||||
WorkerOrderId = dispatch.WorkOrderId,
|
||||
Commenter = vendor.CompanyName,
|
||||
CommentType = "vendor",
|
||||
RecordType = "comment",
|
||||
Commenttext = body!.CommentText,
|
||||
CreatedDate = now
|
||||
};
|
||||
_db.Comments.Add(comment);
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
return Ok(new DataResponse
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new { comment.Id, comment.Commenttext, comment.Commenter, comment.CreatedDate }
|
||||
});
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/uplift-request")]
|
||||
public async Task<IActionResult> RequestUplift(int id, [FromBody] UpliftRequestBody body)
|
||||
public async Task<IActionResult> RequestUplift(int id, [FromBody] UpliftRequestBody body, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
if (dispatch.Status == "Verified" || dispatch.Status == "Cancelled")
|
||||
try
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Cannot request uplift on a '{dispatch.Status}' dispatch" });
|
||||
var result = await _portalService.RequestUpliftAsync(session, id, body?.RequestedNTE ?? 0m, body?.Reason, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
|
||||
if (body == null || body.RequestedNTE <= 0)
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "Requested NTE must be greater than zero" });
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
|
||||
var current = dispatch.NTEAmount ?? 0m;
|
||||
if (body.RequestedNTE <= current)
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "Requested NTE must be greater than the current NTE" });
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
|
||||
var pendingExists = await _db.DispatchUpliftRequests
|
||||
.AnyAsync(u => u.DispatchId == id && u.Status == "Pending" && (u.IsDeleted == null || u.IsDeleted == false));
|
||||
if (pendingExists)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = "A pending uplift request already exists for this dispatch" });
|
||||
}
|
||||
|
||||
var tier1Max = _config.GetValue<decimal?>("Approvals:UpliftTier1MaxUsd") ?? 2500m;
|
||||
var delta = body.RequestedNTE - current;
|
||||
var requiredTier = delta > tier1Max ? 2 : 1;
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
var req = new DispatchUpliftRequest
|
||||
{
|
||||
DispatchId = id,
|
||||
CurrentNTE = current,
|
||||
RequestedNTE = body.RequestedNTE,
|
||||
VendorReason = string.IsNullOrWhiteSpace(body.Reason) ? null : body.Reason!.Trim(),
|
||||
Status = "Pending",
|
||||
RequiredTier = requiredTier,
|
||||
RequestedByVendorName = vendor.CompanyName,
|
||||
CreatedDate = now
|
||||
};
|
||||
_db.DispatchUpliftRequests.Add(req);
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber} Uplift",
|
||||
OldValue = $"${current:F2}",
|
||||
NewValue = $"${body.RequestedNTE:F2}",
|
||||
Action = "uplift_requested",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
await NotifyDispatcherOfUpliftAsync(dispatch, req, vendor);
|
||||
|
||||
return Ok(new DataResponse
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new { req.Id, req.Status, req.RequiredTier, req.CurrentNTE, req.RequestedNTE }
|
||||
});
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/uplift-request/{requestId:int}/cancel")]
|
||||
public async Task<IActionResult> CancelUpliftRequest(int id, int requestId)
|
||||
public async Task<IActionResult> CancelUpliftRequest(int id, int requestId, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
var req = await _db.DispatchUpliftRequests
|
||||
.FirstOrDefaultAsync(u => u.Id == requestId && u.DispatchId == id);
|
||||
if (req == null) return NotFound(new Response { Status = "Error", Message = "Uplift request not found" });
|
||||
|
||||
if (req.Status != "Pending")
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = $"Cannot cancel a '{req.Status}' uplift request" });
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
req.Status = "Cancelled";
|
||||
req.DecidedAt = now;
|
||||
req.LastModificationTime = now;
|
||||
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
{
|
||||
WorkOrderId = dispatch.WorkOrderId ?? 0,
|
||||
FieldName = $"Dispatch {dispatch.DispatchNumber} Uplift",
|
||||
OldValue = "Pending",
|
||||
NewValue = "Cancelled",
|
||||
Action = "uplift_cancelled",
|
||||
CreatedAt = now
|
||||
});
|
||||
|
||||
await _db.SaveChangesAsync();
|
||||
return Ok(new DataResponse { Status = "Success", Data = new { req.Id, req.Status } });
|
||||
}
|
||||
|
||||
[HttpPost("dispatches/{id:int}/documents")]
|
||||
[RequestSizeLimit(10 * 1024 * 1024)]
|
||||
public async Task<IActionResult> UploadCompletionDocument(
|
||||
int id,
|
||||
[FromForm] IFormFile file,
|
||||
[FromForm] int? replacesDocumentId = null)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var dispatch = await LoadVendorDispatchAsync(id, vendor.Id);
|
||||
if (dispatch == null) return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
if (file == null || file.Length == 0)
|
||||
return BadRequest(new Response { Status = "Error", Message = "A non-empty file is required" });
|
||||
if (file.Length > 10 * 1024 * 1024)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Files must be 10 MB or smaller" });
|
||||
|
||||
var allowed = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase)
|
||||
{
|
||||
["application/pdf"] = new[] { ".pdf" },
|
||||
["image/jpeg"] = new[] { ".jpg", ".jpeg" },
|
||||
["image/png"] = new[] { ".png" }
|
||||
};
|
||||
var extension = Path.GetExtension(file.FileName);
|
||||
if (!allowed.TryGetValue(file.ContentType, out var extensions)
|
||||
|| !extensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
|
||||
return BadRequest(new Response { Status = "Error", Message = "Only PDF, JPG, and PNG files are allowed" });
|
||||
|
||||
await using var signatureStream = file.OpenReadStream();
|
||||
if (!await HasExpectedSignature(signatureStream, file.ContentType))
|
||||
return BadRequest(new Response { Status = "Error", Message = "File content does not match its declared type" });
|
||||
|
||||
var workOrderId = dispatch.WorkOrderId
|
||||
?? await _db.DispatchWorkOrders
|
||||
.Where(link => link.DispatchId == dispatch.Id)
|
||||
.OrderBy(link => link.Id)
|
||||
.Select(link => link.WorkOrderId)
|
||||
.FirstOrDefaultAsync();
|
||||
if (workOrderId == 0)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Dispatch is not linked to a work order" });
|
||||
|
||||
VendorCompletionDocument? replaced = null;
|
||||
if (replacesDocumentId.HasValue)
|
||||
{
|
||||
replaced = await _db.VendorCompletionDocuments.FirstOrDefaultAsync(document =>
|
||||
document.Id == replacesDocumentId.Value
|
||||
&& document.DispatchId == id
|
||||
&& document.VendorId == vendor.Id);
|
||||
if (replaced == null)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Replacement document was not found" });
|
||||
}
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
var document = new VendorCompletionDocument
|
||||
{
|
||||
VendorId = vendor.Id,
|
||||
DispatchId = id,
|
||||
WorkOrderId = workOrderId,
|
||||
OriginalFileName = Path.GetFileName(file.FileName),
|
||||
StoredFileName = $"{Guid.NewGuid():N}{extension.ToLowerInvariant()}",
|
||||
ContentType = file.ContentType,
|
||||
SizeBytes = file.Length,
|
||||
ScanStatus = "Pending",
|
||||
ReviewStatus = "Processing",
|
||||
Version = (replaced?.Version ?? 0) + 1,
|
||||
ReplacesDocumentId = replaced?.Id,
|
||||
CreatedDate = now,
|
||||
createdby = $"vendor:{vendor.Id}"
|
||||
};
|
||||
var path = VendorDocumentStorage.ResolvePath(_environment.ContentRootPath, document);
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(path)!);
|
||||
await using (var target = System.IO.File.Create(path))
|
||||
{
|
||||
await file.CopyToAsync(target);
|
||||
}
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
try
|
||||
{
|
||||
_db.VendorCompletionDocuments.Add(document);
|
||||
_db.WorkOrderAuditLogs.Add(new WorkOrderAuditLog
|
||||
{
|
||||
WorkOrderId = document.WorkOrderId,
|
||||
FieldName = "Completion Document",
|
||||
OldValue = replaced?.OriginalFileName,
|
||||
NewValue = document.OriginalFileName,
|
||||
Action = replaced == null ? "vendor_document_uploaded" : "vendor_document_replaced",
|
||||
CreatedAt = now
|
||||
});
|
||||
await _db.SaveChangesAsync();
|
||||
var result = await _portalService.CancelUpliftRequestAsync(session, id, requestId, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
catch
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
System.IO.File.Delete(path);
|
||||
throw;
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
|
||||
return Ok(new DataResponse
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
Status = "Success",
|
||||
Data = new
|
||||
{
|
||||
document.Id,
|
||||
document.OriginalFileName,
|
||||
document.SizeBytes,
|
||||
document.ScanStatus,
|
||||
document.ReviewStatus,
|
||||
document.Version,
|
||||
document.ReplacesDocumentId
|
||||
}
|
||||
});
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The requested action could not be completed for this dispatch") });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("dispatches/{id:int}/documents/{documentId:int}")]
|
||||
public async Task<IActionResult> DownloadCompletionDocument(int id, int documentId)
|
||||
[HttpPost("dispatches/{id:int}/completion-documents")]
|
||||
[RequestSizeLimit(10_000_000)]
|
||||
public async Task<IActionResult> UploadCompletionDocument(int id, [FromForm] IFormFile file, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var vendor = await ResolveVendorAsync();
|
||||
if (vendor == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
var document = await _db.VendorCompletionDocuments.AsNoTracking().FirstOrDefaultAsync(item =>
|
||||
item.Id == documentId && item.DispatchId == id && item.VendorId == vendor.Id);
|
||||
if (document == null) return NotFound();
|
||||
if (document.ScanStatus != "Passed")
|
||||
return StatusCode(StatusCodes.Status423Locked,
|
||||
new Response { Status = "Processing", Message = "This file remains quarantined until malware scanning passes" });
|
||||
var path = VendorDocumentStorage.ResolvePath(_environment.ContentRootPath, document);
|
||||
if (!System.IO.File.Exists(path)) return NotFound();
|
||||
return PhysicalFile(path, document.ContentType, document.OriginalFileName);
|
||||
}
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
private async Task NotifyDispatcherOfUpliftAsync(Dispatch dispatch, DispatchUpliftRequest req, Vendor vendor)
|
||||
{
|
||||
try
|
||||
{
|
||||
var dispatchAudit = await _db.WorkOrderAuditLogs
|
||||
.Where(a => a.WorkOrderId == (dispatch.WorkOrderId ?? 0) && a.Action == "dispatch" && !string.IsNullOrEmpty(a.UserId))
|
||||
.OrderByDescending(a => a.CreatedAt)
|
||||
.FirstOrDefaultAsync();
|
||||
if (dispatchAudit == null || string.IsNullOrWhiteSpace(dispatchAudit.UserId)) return;
|
||||
|
||||
var dispatcher = await _db.Users.FindAsync(dispatchAudit.UserId);
|
||||
if (dispatcher == null || string.IsNullOrWhiteSpace(dispatcher.Email)) return;
|
||||
|
||||
var frontendBase = _config.GetValue<string>("FrontendBaseUrl")?.TrimEnd('/') ?? "";
|
||||
var workOrderLink = dispatch.WorkOrderId.HasValue
|
||||
? $"{frontendBase}/workorders/{dispatch.WorkOrderId.Value}"
|
||||
: frontendBase;
|
||||
|
||||
var vendorName = System.Net.WebUtility.HtmlEncode(vendor.CompanyName ?? "Vendor");
|
||||
var reason = System.Net.WebUtility.HtmlEncode(req.VendorReason ?? "(no reason provided)");
|
||||
var dispatchNum = System.Net.WebUtility.HtmlEncode(dispatch.DispatchNumber ?? "");
|
||||
var tierText = req.RequiredTier == 2 ? "Tier 2 (Manager approval required)" : "Tier 1";
|
||||
|
||||
var subject = $"[Uplift Request] {dispatch.DispatchNumber} — {vendor.CompanyName} requests ${req.RequestedNTE:F2} (was ${req.CurrentNTE ?? 0m:F2})";
|
||||
var body = $@"
|
||||
<h2>Vendor Uplift Request</h2>
|
||||
<p><strong>Dispatch:</strong> {dispatchNum}</p>
|
||||
<p><strong>Vendor:</strong> {vendorName}</p>
|
||||
<table style='border-collapse:collapse;font-family:Arial,sans-serif;'>
|
||||
<tr><td style='padding:4px 10px;'><strong>Current NTE</strong></td><td style='padding:4px 10px;'>${req.CurrentNTE ?? 0m:F2}</td></tr>
|
||||
<tr><td style='padding:4px 10px;'><strong>Requested NTE</strong></td><td style='padding:4px 10px;'>${req.RequestedNTE:F2}</td></tr>
|
||||
<tr><td style='padding:4px 10px;'><strong>Delta</strong></td><td style='padding:4px 10px;'>${(req.RequestedNTE - (req.CurrentNTE ?? 0m)):F2}</td></tr>
|
||||
<tr><td style='padding:4px 10px;'><strong>Required Approval</strong></td><td style='padding:4px 10px;'>{tierText}</td></tr>
|
||||
</table>
|
||||
<h3>Vendor Reason</h3>
|
||||
<p>{reason}</p>
|
||||
<div style='margin:20px 0;'>
|
||||
<a href='{workOrderLink}' style='display:inline-block;padding:10px 22px;background:#2563eb;color:white;text-decoration:none;border-radius:6px;font-weight:bold;'>Review in SHOC</a>
|
||||
</div>";
|
||||
|
||||
await _sendMessage.SendEMail(dispatcher.Email, subject, body);
|
||||
var result = await _portalService.UploadCompletionDocumentAsync(session, id, file, cancellationToken);
|
||||
return Ok(new DataResponse { Status = "Success", Data = result });
|
||||
}
|
||||
catch
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The completion document could not be uploaded") });
|
||||
}
|
||||
}
|
||||
|
||||
private static async Task<bool> HasExpectedSignature(Stream stream, string contentType)
|
||||
[HttpGet("dispatches/{id:int}/completion-documents/{documentId:int}")]
|
||||
public async Task<IActionResult> DownloadCompletionDocument(int id, int documentId, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var bytes = new byte[8];
|
||||
var count = await stream.ReadAsync(bytes);
|
||||
if (string.Equals(contentType, "application/pdf", StringComparison.OrdinalIgnoreCase))
|
||||
return count >= 5 && bytes[0] == 0x25 && bytes[1] == 0x50 && bytes[2] == 0x44 && bytes[3] == 0x46 && bytes[4] == 0x2D;
|
||||
if (string.Equals(contentType, "image/jpeg", StringComparison.OrdinalIgnoreCase))
|
||||
return count >= 3 && bytes[0] == 0xFF && bytes[1] == 0xD8 && bytes[2] == 0xFF;
|
||||
if (string.Equals(contentType, "image/png", StringComparison.OrdinalIgnoreCase))
|
||||
return count >= 8 && bytes.SequenceEqual(new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A });
|
||||
return false;
|
||||
var session = await ResolveSessionAsync(cancellationToken);
|
||||
if (session == null) return Unauthorized(new Response { Status = "Error", Message = "Invalid or expired token" });
|
||||
|
||||
var result = await _portalService.DownloadCompletionDocumentAsync(session, id, documentId, cancellationToken);
|
||||
return result.Outcome switch
|
||||
{
|
||||
VendorDocumentDownloadOutcome.Ok => File(result.Content!, result.ContentType!, result.FileName!),
|
||||
VendorDocumentDownloadOutcome.Locked => StatusCode(StatusCodes.Status423Locked, new Response { Status = "Locked", Message = "The completion document is not available for download yet." }),
|
||||
_ => NotFound(new Response { Status = "Error", Message = "Completion document not found" })
|
||||
};
|
||||
}
|
||||
|
||||
private async Task<Vendor?> ResolveVendorAsync()
|
||||
private async Task<VendorPortalSession?> ResolveSessionAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
if (!Request.Headers.TryGetValue(TokenHeader, out var values)) return null;
|
||||
var token = values.ToString();
|
||||
return await _tokens.ResolveVendorAsync(token);
|
||||
}
|
||||
|
||||
private Task<Dispatch?> LoadVendorDispatchAsync(int id, int vendorId)
|
||||
{
|
||||
return _db.Dispatches
|
||||
.Include(d => d.WorkOrder).ThenInclude(w => w!.Locations)
|
||||
.FirstOrDefaultAsync(d => d.Id == id
|
||||
&& d.VendorId == vendorId
|
||||
&& (d.IsDeleted == null || d.IsDeleted == false));
|
||||
}
|
||||
|
||||
private static bool IsAllowedVendorTransition(string? from, string? to)
|
||||
{
|
||||
if (from == "Acknowledged" && to == "In Progress") return true;
|
||||
if (from == "In Progress" && to == "Completed") return true;
|
||||
return false;
|
||||
return await _portalService.ResolveSessionAsync(token, cancellationToken);
|
||||
}
|
||||
|
||||
public class ChangeStatusRequest
|
||||
|
|
|
|||
216
Api.SeaHavenIndustries/Controllers/WorkOrderBoardController.cs
Normal file
216
Api.SeaHavenIndustries/Controllers/WorkOrderBoardController.cs
Normal file
|
|
@ -0,0 +1,216 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Data.SeaHavenIndustries.Enums;
|
||||
using FluentValidation;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.ModelBinding;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Exceptions;
|
||||
using SeaHaven.Services.Helpers;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
[Authorize]
|
||||
[ApiController]
|
||||
[Route("api/WorkOrder")]
|
||||
[Route("api/workorders")]
|
||||
public class WorkOrderBoardController : Controller
|
||||
{
|
||||
private readonly IWorkOrderBoardService _workOrderBoardService;
|
||||
private readonly IWorkOrderBoardUpdateService _boardUpdateService;
|
||||
private readonly IWorkOrderBoardCreateService _boardCreateService;
|
||||
private readonly IWorkOrderBoardCancelService _boardCancelService;
|
||||
private readonly IWorkOrderAdvancedSearchService _advancedSearchService;
|
||||
|
||||
public WorkOrderBoardController(
|
||||
IWorkOrderBoardService workOrderBoardService,
|
||||
IWorkOrderBoardUpdateService boardUpdateService,
|
||||
IWorkOrderBoardCreateService boardCreateService,
|
||||
IWorkOrderBoardCancelService boardCancelService,
|
||||
IWorkOrderAdvancedSearchService advancedSearchService)
|
||||
{
|
||||
_workOrderBoardService = workOrderBoardService;
|
||||
_boardUpdateService = boardUpdateService;
|
||||
_boardCreateService = boardCreateService;
|
||||
_boardCancelService = boardCancelService;
|
||||
_advancedSearchService = advancedSearchService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Weekly board payload.
|
||||
/// When <paramref name="myWorkOrders"/> is true, the authenticated user filter wins and
|
||||
/// <paramref name="dispatchers"/> is ignored (not AND-combined).
|
||||
/// Weekend WOs in a Mon–Sun window may have <c>dayGroup = null</c>; FE should handle that.
|
||||
/// </summary>
|
||||
[HttpGet("board")]
|
||||
public async Task<IActionResult> GetBoard(
|
||||
[FromQuery, BindRequired] DateOnly weekStart,
|
||||
[FromQuery] DateOnly? weekEnd = null,
|
||||
[FromQuery] List<string>? dispatchers = null,
|
||||
[FromQuery] bool myWorkOrders = false,
|
||||
[FromQuery] List<WorkOrderType>? types = null,
|
||||
[FromQuery] string? search = null)
|
||||
{
|
||||
var resolvedWeekEnd = weekEnd ?? weekStart.AddDays(4);
|
||||
var weekValidationError = WorkOrderOperationalWeek.ValidateWeekWindow(weekStart, resolvedWeekEnd);
|
||||
if (weekValidationError != null)
|
||||
return BadRequest(weekValidationError);
|
||||
|
||||
try
|
||||
{
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var query = new WorkOrderBoardQueryDto
|
||||
{
|
||||
WeekStart = weekStart,
|
||||
WeekEnd = weekEnd,
|
||||
Dispatchers = dispatchers,
|
||||
MyWorkOrders = myWorkOrders,
|
||||
Types = types,
|
||||
Search = search
|
||||
};
|
||||
|
||||
var result = await _workOrderBoardService.GetBoardAsync(query, userId);
|
||||
return Ok(result);
|
||||
}
|
||||
catch (ArgumentException ex)
|
||||
{
|
||||
return BadRequest(ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("board/search")]
|
||||
public async Task<IActionResult> SearchBoard([FromQuery] WorkOrderAdvancedSearchQueryDto query)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var result = await _advancedSearchService.SearchAsync(query, userId);
|
||||
return Ok(result);
|
||||
}
|
||||
catch (ArgumentException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Dispatcher dropdown options. Currently returns all non-deleted users
|
||||
/// (role-filtered assignee list deferred until roles settle).
|
||||
/// </summary>
|
||||
[HttpGet("lookups/dispatchers")]
|
||||
public async Task<IActionResult> GetDispatcherLookups()
|
||||
{
|
||||
var result = await _workOrderBoardService.GetDispatcherLookupsAsync();
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPatch("{id:int}/board")]
|
||||
public async Task<IActionResult> PatchBoardField(int id, [FromBody] WorkOrderBoardPatchRequestDto request)
|
||||
{
|
||||
try
|
||||
{
|
||||
var actorId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var row = await _boardUpdateService.PatchFieldAsync(id, request, actorId);
|
||||
return Ok(row);
|
||||
}
|
||||
catch (WorkOrderBoardConcurrencyException ex)
|
||||
{
|
||||
return Conflict(new WorkOrderBoardConflictDto
|
||||
{
|
||||
CurrentState = ex.CurrentState
|
||||
});
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto
|
||||
{
|
||||
Code = ex.Code,
|
||||
Message = ex.Message
|
||||
});
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto
|
||||
{
|
||||
Code = ex.Code,
|
||||
Message = ex.Message
|
||||
});
|
||||
}
|
||||
catch (ArgumentException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("board")]
|
||||
public async Task<IActionResult> CreateBoardWorkOrder([FromBody] WorkOrderBoardCreateRequestDto request)
|
||||
{
|
||||
try
|
||||
{
|
||||
var actorId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var row = await _boardCreateService.CreateAsync(request, actorId);
|
||||
return Ok(row);
|
||||
}
|
||||
catch (ValidationException vex)
|
||||
{
|
||||
var errors = string.Join(", ", vex.Errors.Select(e => e.ErrorMessage));
|
||||
return BadRequest(new Response { Status = "Validation Error", Message = errors });
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "DuplicateWoNumber")
|
||||
{
|
||||
return Conflict(new WorkOrderBoardValidationErrorDto
|
||||
{
|
||||
Code = ex.Code,
|
||||
Message = ex.Message
|
||||
});
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto
|
||||
{
|
||||
Code = ex.Code,
|
||||
Message = ex.Message
|
||||
});
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto
|
||||
{
|
||||
Code = ex.Code,
|
||||
Message = ex.Message
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/cancel")]
|
||||
public async Task<IActionResult> CancelBoardWorkOrder(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var actorId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var row = await _boardCancelService.CancelAsync(id, actorId);
|
||||
return Ok(row);
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto
|
||||
{
|
||||
Code = ex.Code,
|
||||
Message = ex.Message
|
||||
});
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto
|
||||
{
|
||||
Code = ex.Code,
|
||||
Message = ex.Message
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Data.SeaHavenIndustries.Enums;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Exceptions;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
[Authorize]
|
||||
[ApiController]
|
||||
[Route("api/WorkOrder")]
|
||||
[Route("api/workorders")]
|
||||
public class WorkOrderCompletionController : Controller
|
||||
{
|
||||
private readonly IWorkOrderCompletionService _workOrderCompletionService;
|
||||
private readonly IFileStoragePort _fileStorage;
|
||||
|
||||
public WorkOrderCompletionController(
|
||||
IWorkOrderCompletionService workOrderCompletionService,
|
||||
IFileStoragePort fileStorage)
|
||||
{
|
||||
_workOrderCompletionService = workOrderCompletionService;
|
||||
_fileStorage = fileStorage;
|
||||
}
|
||||
|
||||
[HttpGet("completion-templates")]
|
||||
public async Task<IActionResult> GetCompletionTemplates(
|
||||
[FromQuery] string? serviceKey = null,
|
||||
[FromQuery] WorkOrderType? workOrderType = null)
|
||||
{
|
||||
var templates = await _workOrderCompletionService.GetTemplatesAsync(serviceKey, workOrderType);
|
||||
return Ok(templates);
|
||||
}
|
||||
|
||||
[HttpGet("completion-templates/{id:int}")]
|
||||
public async Task<IActionResult> GetCompletionTemplate(int id)
|
||||
{
|
||||
var template = await _workOrderCompletionService.GetTemplateByIdAsync(id);
|
||||
if (template == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Template not found." });
|
||||
return Ok(template);
|
||||
}
|
||||
|
||||
[Authorize(Roles = "Admin")]
|
||||
[HttpPost("completion-templates")]
|
||||
public async Task<IActionResult> CreateCompletionTemplate([FromBody] CompletionDocTemplateCreateDto request)
|
||||
{
|
||||
try
|
||||
{
|
||||
var created = await _workOrderCompletionService.CreateTemplateAsync(request);
|
||||
return Ok(created);
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
[Authorize(Roles = "Admin")]
|
||||
[HttpPut("completion-templates/{id:int}")]
|
||||
public async Task<IActionResult> UpdateCompletionTemplate(int id, [FromBody] CompletionDocTemplateCreateDto request)
|
||||
{
|
||||
try
|
||||
{
|
||||
var updated = await _workOrderCompletionService.UpdateTemplateAsync(id, request);
|
||||
return Ok(updated);
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
[Authorize(Roles = "Admin")]
|
||||
[HttpDelete("completion-templates/{id:int}")]
|
||||
public async Task<IActionResult> DeleteCompletionTemplate(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _workOrderCompletionService.DeleteTemplateAsync(id);
|
||||
return NoContent();
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/completion-doc")]
|
||||
[RequestSizeLimit(30_000_000)]
|
||||
public async Task<IActionResult> UploadCompletionDoc(
|
||||
int id,
|
||||
[FromForm] IFormFile file,
|
||||
[FromForm] string? signOffName = null,
|
||||
[FromForm] string? signOffSignature = null,
|
||||
[FromForm] string? workOrderVersion = null)
|
||||
{
|
||||
if (file == null || file.Length == 0)
|
||||
return BadRequest(new Response { Status = "Error", Message = "file is required." });
|
||||
|
||||
try
|
||||
{
|
||||
var actorId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var fileUrl = await _fileStorage.SaveFileAsync(file);
|
||||
var result = await _workOrderCompletionService.UploadCompletionDocAsync(
|
||||
id,
|
||||
new WorkOrderCompletionDocUploadDto
|
||||
{
|
||||
SignOffName = signOffName,
|
||||
SignOffSignature = signOffSignature,
|
||||
WorkOrderVersion = workOrderVersion
|
||||
},
|
||||
fileUrl,
|
||||
actorId);
|
||||
return Ok(result);
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code is "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code is "ConcurrencyConflict")
|
||||
{
|
||||
return Conflict(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,75 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Exceptions;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
[Authorize]
|
||||
[ApiController]
|
||||
[Route("api/WorkOrder")]
|
||||
[Route("api/workorders")]
|
||||
public class WorkOrderDetailController : Controller
|
||||
{
|
||||
private readonly IWorkOrderDetailService _workOrderDetailService;
|
||||
private readonly IWorkOrderCommentService _workOrderCommentService;
|
||||
|
||||
public WorkOrderDetailController(
|
||||
IWorkOrderDetailService workOrderDetailService,
|
||||
IWorkOrderCommentService workOrderCommentService)
|
||||
{
|
||||
_workOrderDetailService = workOrderDetailService;
|
||||
_workOrderCommentService = workOrderCommentService;
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}/detail")]
|
||||
public async Task<IActionResult> GetDetail(int id)
|
||||
{
|
||||
var detail = await _workOrderDetailService.GetDetailAsync(id);
|
||||
if (detail == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Work order not found." });
|
||||
return Ok(detail);
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}/audit")]
|
||||
public async Task<IActionResult> GetAudit(int id, [FromQuery] int limit = 50)
|
||||
{
|
||||
var audit = await _workOrderDetailService.GetAuditAsync(id, limit);
|
||||
if (audit == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Work order not found." });
|
||||
return Ok(audit);
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}/comments")]
|
||||
public async Task<IActionResult> GetBoardComments(int id)
|
||||
{
|
||||
var comments = await _workOrderCommentService.GetCommentsAsync(id);
|
||||
if (comments == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Work order not found." });
|
||||
return Ok(comments);
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/comments")]
|
||||
public async Task<IActionResult> AddBoardComment(int id, [FromBody] WorkOrderCommentCreateDto request)
|
||||
{
|
||||
try
|
||||
{
|
||||
var actorId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var comment = await _workOrderCommentService.AddCommentAsync(id, request, actorId);
|
||||
return Ok(comment);
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,214 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Api.SeaHavenIndustries.Helper;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Exceptions;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
[Authorize]
|
||||
[ApiController]
|
||||
[Route("api/WorkOrder")]
|
||||
[Route("api/workorders")]
|
||||
public class WorkOrderDispatchController : Controller
|
||||
{
|
||||
private readonly IWorkOrderDispatchService _dispatchService;
|
||||
private readonly ILogger<WorkOrderDispatchController> _logger;
|
||||
|
||||
public WorkOrderDispatchController(
|
||||
IWorkOrderDispatchService dispatchService,
|
||||
ILogger<WorkOrderDispatchController> logger)
|
||||
{
|
||||
_dispatchService = dispatchService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("DispatchToVendor")]
|
||||
public async Task<IActionResult> DispatchToVendor([FromBody] Dispatch_DTO model, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
|
||||
var input = new DispatchToVendorInput
|
||||
{
|
||||
WorkOrderIds = model.WorkOrderIds,
|
||||
VendorIds = model.VendorIds,
|
||||
NTEAmount = model.NTEAmount,
|
||||
Description = model.Description,
|
||||
ScheduledDate = model.ScheduledDate,
|
||||
TaskListTemplateId = model.TaskListTemplateId,
|
||||
CustomChecklistItems = model.CustomChecklistItems,
|
||||
UserId = userId
|
||||
};
|
||||
|
||||
var result = await _dispatchService.DispatchToVendorAsync(input, cancellationToken);
|
||||
return Ok(result);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpGet("GetDispatches/{workOrderId}")]
|
||||
public async Task<IActionResult> GetDispatches(int workOrderId)
|
||||
{
|
||||
var data = await _dispatchService.GetDispatchesAsync(workOrderId);
|
||||
return Ok(data);
|
||||
}
|
||||
|
||||
[HttpGet("GetDispatch/{id}")]
|
||||
public async Task<IActionResult> GetDispatchById(int id)
|
||||
{
|
||||
var d = await _dispatchService.GetDispatchDetailAsync(id);
|
||||
if (d == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
return Ok(d);
|
||||
}
|
||||
|
||||
[HttpPost("UpdateDispatch")]
|
||||
public async Task<IActionResult> UpdateDispatch([FromBody] UpdateDispatch_DTO model)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var input = new UpdateDispatchInput
|
||||
{
|
||||
Id = model.Id,
|
||||
Status = model.Status,
|
||||
NTEAmount = model.NTEAmount,
|
||||
ScheduledDate = model.ScheduledDate,
|
||||
CompletedDate = model.CompletedDate,
|
||||
Description = model.Description,
|
||||
UserId = userId
|
||||
};
|
||||
|
||||
var success = await _dispatchService.UpdateDispatchAsync(input);
|
||||
if (!success)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
return Ok(new { message = "Dispatch updated" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("AddDispatchComment")]
|
||||
public async Task<IActionResult> AddDispatchComment([FromBody] DispatchComment_DTO model)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var input = new AddDispatchCommentInput
|
||||
{
|
||||
DispatchId = model.DispatchId,
|
||||
Text = model.Text,
|
||||
SendEmail = model.SendEmail,
|
||||
UserId = userId
|
||||
};
|
||||
|
||||
var result = await _dispatchService.AddDispatchCommentAsync(input);
|
||||
if (result == null)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("VerifyDispatch")]
|
||||
public async Task<IActionResult> VerifyDispatch(int dispatchId)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var result = await _dispatchService.VerifyDispatchAsync(dispatchId, userId!);
|
||||
if (result == null)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
catch (DispatchVerificationException ex)
|
||||
{
|
||||
return BadRequest(new { status = "Error", message = "Cannot verify", missing = ex.Missing });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("AddDispatchSignoff")]
|
||||
public async Task<IActionResult> AddDispatchSignoff([FromBody] DispatchSignoff_DTO model)
|
||||
{
|
||||
try
|
||||
{
|
||||
var input = new AddDispatchSignoffInput
|
||||
{
|
||||
DispatchId = model.DispatchId,
|
||||
SignoffType = model.SignoffType,
|
||||
Name = model.Name,
|
||||
Signature = model.Signature,
|
||||
SignatureMethod = model.SignatureMethod
|
||||
};
|
||||
|
||||
var result = await _dispatchService.AddDispatchSignoffAsync(input);
|
||||
if (result == null)
|
||||
return BadRequest(new Response { Status = "Error", Message = "Dispatch not found" });
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
catch (InvalidOperationException ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex, "The dispatch signoff could not be added") });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return BadRequest(new Response { Status = "Error", Message = _logger.Sanitize(ex) });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpPost("UpdateChecklistItem")]
|
||||
public async Task<IActionResult> UpdateChecklistItem([FromBody] ChecklistItemUpdate_DTO model)
|
||||
{
|
||||
var input = new ChecklistItemUpdateInput
|
||||
{
|
||||
Id = model.Id,
|
||||
IsCompleted = model.IsCompleted,
|
||||
CompletedBy = model.CompletedBy
|
||||
};
|
||||
|
||||
var result = await _dispatchService.UpdateChecklistItemAsync(input);
|
||||
if (result == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Checklist item not found" });
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost("AddChecklistItem")]
|
||||
public async Task<IActionResult> AddChecklistItem([FromBody] AddChecklistItem_DTO model)
|
||||
{
|
||||
var input = new AddChecklistItemInput
|
||||
{
|
||||
DispatchId = model.DispatchId,
|
||||
WorkOrderId = model.WorkOrderId,
|
||||
ItemText = model.ItemText
|
||||
};
|
||||
|
||||
var result = await _dispatchService.AddChecklistItemAsync(input);
|
||||
return Ok(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,85 @@
|
|||
using Api.SeaHavenIndustries.DTOs;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Data.SeaHavenIndustries.Enums;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using SeaHaven.Services.DTOs;
|
||||
using SeaHaven.Services.Exceptions;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using System.Security.Claims;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Controllers
|
||||
{
|
||||
[Authorize]
|
||||
[ApiController]
|
||||
[Route("api/WorkOrder")]
|
||||
[Route("api/workorders")]
|
||||
public class WorkOrderMediaController : Controller
|
||||
{
|
||||
private readonly IWorkOrderMediaService _workOrderMediaService;
|
||||
private readonly IFileStoragePort _fileStorage;
|
||||
|
||||
public WorkOrderMediaController(
|
||||
IWorkOrderMediaService workOrderMediaService,
|
||||
IFileStoragePort fileStorage)
|
||||
{
|
||||
_workOrderMediaService = workOrderMediaService;
|
||||
_fileStorage = fileStorage;
|
||||
}
|
||||
|
||||
[HttpGet("{id:int}/media")]
|
||||
public async Task<IActionResult> GetMedia(int id)
|
||||
{
|
||||
var media = await _workOrderMediaService.GetMediaAsync(id);
|
||||
if (media == null)
|
||||
return NotFound(new Response { Status = "Error", Message = "Work order not found." });
|
||||
return Ok(media);
|
||||
}
|
||||
|
||||
[HttpPost("{id:int}/media")]
|
||||
[RequestSizeLimit(30_000_000)]
|
||||
public async Task<IActionResult> AddMedia(
|
||||
int id,
|
||||
[FromForm] WorkOrderMediaCategory category,
|
||||
[FromForm] IFormFile file)
|
||||
{
|
||||
if (file == null || file.Length == 0)
|
||||
return BadRequest(new Response { Status = "Error", Message = "file is required." });
|
||||
|
||||
try
|
||||
{
|
||||
var actorId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var fileUrl = await _fileStorage.SaveFileAsync(file);
|
||||
var media = await _workOrderMediaService.AddMediaAsync(id, category, fileUrl, actorId);
|
||||
return Ok(media);
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
}
|
||||
|
||||
[HttpDelete("{id:int}/media/{mediaId:int}")]
|
||||
public async Task<IActionResult> DeleteMedia(int id, int mediaId)
|
||||
{
|
||||
try
|
||||
{
|
||||
var actorId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
await _workOrderMediaService.DeleteMediaAsync(id, mediaId, actorId);
|
||||
return NoContent();
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex) when (ex.Code == "NotFound")
|
||||
{
|
||||
return NotFound(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
catch (WorkOrderBoardValidationException ex)
|
||||
{
|
||||
return UnprocessableEntity(new WorkOrderBoardValidationErrorDto { Code = ex.Code, Message = ex.Message });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
12
Api.SeaHavenIndustries/DTOs/DropdownOption_DTO.cs
Normal file
12
Api.SeaHavenIndustries/DTOs/DropdownOption_DTO.cs
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
namespace Api.SeaHavenIndustries.DTOs
|
||||
{
|
||||
public class DropdownOption_DTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string Category { get; set; } = "";
|
||||
public string Value { get; set; } = "";
|
||||
public string? ParentValue { get; set; }
|
||||
public int SortOrder { get; set; }
|
||||
public bool IsActive { get; set; } = true;
|
||||
}
|
||||
}
|
||||
27
Api.SeaHavenIndustries/Helper/SanitizedErrors.cs
Normal file
27
Api.SeaHavenIndustries/Helper/SanitizedErrors.cs
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
using System.Globalization;
|
||||
using System.Runtime.CompilerServices;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Helper;
|
||||
|
||||
internal static class SanitizedErrors
|
||||
{
|
||||
private const string DefaultPublicMessage = "An unexpected error occurred";
|
||||
|
||||
public static string Sanitize(
|
||||
this ILogger logger,
|
||||
Exception exception,
|
||||
string? publicMessage = null,
|
||||
[CallerMemberName] string operation = "")
|
||||
{
|
||||
var correlationId = Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture);
|
||||
|
||||
logger.LogError(
|
||||
exception,
|
||||
"Unhandled exception in {Operation}. CorrelationId: {CorrelationId}",
|
||||
operation,
|
||||
correlationId);
|
||||
|
||||
return $"{publicMessage ?? DefaultPublicMessage} (reference {correlationId}).";
|
||||
}
|
||||
}
|
||||
20
Api.SeaHavenIndustries/Helper/SendGridEmailSender.cs
Normal file
20
Api.SeaHavenIndustries/Helper/SendGridEmailSender.cs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
using Api.SeaHavenIndustries.Helper;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Helper
|
||||
{
|
||||
public class SendGridEmailSender : IEmailSender
|
||||
{
|
||||
private readonly SendMessage _sendMessage;
|
||||
|
||||
public SendGridEmailSender(SendMessage sendMessage)
|
||||
{
|
||||
_sendMessage = sendMessage;
|
||||
}
|
||||
|
||||
public Task<bool> SendEmailAsync(string emailTo, string subject, string body)
|
||||
{
|
||||
return _sendMessage.SendEMail(emailTo, subject, body);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
|
||||
|
||||
using SeaHaven.Services.Interfaces;
|
||||
using SendGrid;
|
||||
using SendGrid.Helpers.Mail;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Helper
|
||||
{
|
||||
public class SendMessage
|
||||
public class SendMessage : IEmailSender
|
||||
{
|
||||
private IConfiguration _configuration;
|
||||
//string keysapi = "";
|
||||
|
|
@ -58,6 +59,8 @@ namespace Api.SeaHavenIndustries.Helper
|
|||
return false;
|
||||
}
|
||||
}
|
||||
public async Task<bool> SendEmailAsync(string emailTo, string subject, string htmlBody)
|
||||
=> await SendEMail(emailTo, subject, htmlBody);
|
||||
public async Task<bool> SendEMailAttachment(string emailTo, string subject, byte[] pdfBytes)
|
||||
{
|
||||
try
|
||||
|
|
|
|||
|
|
@ -69,7 +69,10 @@ namespace Api.SeaHavenIndustries.Helper
|
|||
public static string Root(string contentRoot) =>
|
||||
Path.Combine(contentRoot, "App_Data", "vendor-documents");
|
||||
|
||||
public static string ResolvePath(string contentRoot, int vendorId, int dispatchId, string storedFileName) =>
|
||||
Path.Combine(Root(contentRoot), vendorId.ToString(), dispatchId.ToString(), storedFileName);
|
||||
|
||||
public static string ResolvePath(string contentRoot, VendorCompletionDocument document) =>
|
||||
Path.Combine(Root(contentRoot), document.VendorId.ToString(), document.DispatchId.ToString(), document.StoredFileName);
|
||||
ResolvePath(contentRoot, document.VendorId, document.DispatchId, document.StoredFileName);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
using System.Security.Cryptography;
|
||||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Helper
|
||||
{
|
||||
public class VendorPortalTokenService
|
||||
{
|
||||
private readonly ApplicationDbContext _db;
|
||||
private readonly int _lifetimeDays;
|
||||
|
||||
public VendorPortalTokenService(ApplicationDbContext db, IConfiguration config)
|
||||
{
|
||||
_db = db;
|
||||
_lifetimeDays = config.GetValue<int?>("VendorPortal:TokenLifetimeDays") ?? 365;
|
||||
}
|
||||
|
||||
public async Task<VendorAccessToken> GetOrCreateActiveTokenAsync(int vendorId)
|
||||
{
|
||||
var now = DateTime.UtcNow;
|
||||
var existing = await _db.VendorAccessTokens
|
||||
.Where(t => t.VendorId == vendorId
|
||||
&& t.RevokedAt == null
|
||||
&& t.ExpiresAt > now
|
||||
&& (t.IsDeleted == null || t.IsDeleted == false))
|
||||
.OrderByDescending(t => t.IssuedAt)
|
||||
.FirstOrDefaultAsync();
|
||||
|
||||
if (existing != null) return existing;
|
||||
|
||||
var token = new VendorAccessToken
|
||||
{
|
||||
VendorId = vendorId,
|
||||
Token = GenerateToken(),
|
||||
IssuedAt = now,
|
||||
ExpiresAt = now.AddDays(_lifetimeDays),
|
||||
CreatedDate = now
|
||||
};
|
||||
_db.VendorAccessTokens.Add(token);
|
||||
await _db.SaveChangesAsync();
|
||||
return token;
|
||||
}
|
||||
|
||||
public async Task<Vendor?> ResolveVendorAsync(string? token)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(token)) return null;
|
||||
var now = DateTime.UtcNow;
|
||||
var record = await _db.VendorAccessTokens
|
||||
.Include(t => t.Vendor)
|
||||
.FirstOrDefaultAsync(t => t.Token == token
|
||||
&& t.RevokedAt == null
|
||||
&& t.ExpiresAt > now
|
||||
&& (t.IsDeleted == null || t.IsDeleted == false));
|
||||
|
||||
if (record?.Vendor == null) return null;
|
||||
|
||||
record.LastUsedAt = now;
|
||||
await _db.SaveChangesAsync();
|
||||
return record.Vendor;
|
||||
}
|
||||
|
||||
public async Task<VendorAccessToken> RotateAsync(int vendorId)
|
||||
{
|
||||
var now = DateTime.UtcNow;
|
||||
var active = await _db.VendorAccessTokens
|
||||
.Where(t => t.VendorId == vendorId && t.RevokedAt == null)
|
||||
.ToListAsync();
|
||||
foreach (var t in active) t.RevokedAt = now;
|
||||
await _db.SaveChangesAsync();
|
||||
return await GetOrCreateActiveTokenAsync(vendorId);
|
||||
}
|
||||
|
||||
public async Task RevokeAllAsync(int vendorId)
|
||||
{
|
||||
var now = DateTime.UtcNow;
|
||||
var active = await _db.VendorAccessTokens
|
||||
.Where(t => t.VendorId == vendorId && t.RevokedAt == null)
|
||||
.ToListAsync();
|
||||
foreach (var t in active) t.RevokedAt = now;
|
||||
await _db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private static string GenerateToken()
|
||||
{
|
||||
var bytes = RandomNumberGenerator.GetBytes(32);
|
||||
return Convert.ToBase64String(bytes)
|
||||
.Replace("+", "-")
|
||||
.Replace("/", "_")
|
||||
.TrimEnd('=');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Helper
|
||||
{
|
||||
public class ZipCodeDistance
|
||||
public class ZipCodeDistance : IZipCodeDistance
|
||||
{
|
||||
private readonly Dictionary<string, (double lat, double lng)> _coords = new();
|
||||
private bool _loaded;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,90 @@
|
|||
using Amazon.DynamoDBv2;
|
||||
using Amazon.DynamoDBv2.Model;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Infrastructure
|
||||
{
|
||||
public class DynamoSyncExternalSource : ISyncExternalSource
|
||||
{
|
||||
private readonly AmazonDynamoDBClient _dynamo;
|
||||
private const string WO_TABLE = "WorkOrders";
|
||||
private const string COMMENTS_TABLE = "WorkOrderComments";
|
||||
private const string VENDOR_REPLIES_TABLE = "VendorReplies";
|
||||
|
||||
public DynamoSyncExternalSource()
|
||||
{
|
||||
_dynamo = new AmazonDynamoDBClient(Amazon.RegionEndpoint.USEast1);
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Dictionary<string, string?>> ScanWorkOrdersAsync(
|
||||
[System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken)
|
||||
{
|
||||
Dictionary<string, AttributeValue>? lastKey = null;
|
||||
do
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
var request = new ScanRequest
|
||||
{
|
||||
TableName = WO_TABLE,
|
||||
Limit = 100,
|
||||
ExclusiveStartKey = lastKey
|
||||
};
|
||||
var response = await _dynamo.ScanAsync(request);
|
||||
foreach (var item in response.Items)
|
||||
yield return ConvertItem(item);
|
||||
lastKey = response.LastEvaluatedKey;
|
||||
} while (lastKey != null && lastKey.Count > 0);
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Dictionary<string, string?>> ScanCommentsAsync(
|
||||
[System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken)
|
||||
{
|
||||
Dictionary<string, AttributeValue>? lastKey = null;
|
||||
do
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
var request = new ScanRequest
|
||||
{
|
||||
TableName = COMMENTS_TABLE,
|
||||
Limit = 100,
|
||||
ExclusiveStartKey = lastKey
|
||||
};
|
||||
var response = await _dynamo.ScanAsync(request);
|
||||
foreach (var item in response.Items)
|
||||
yield return ConvertItem(item);
|
||||
lastKey = response.LastEvaluatedKey;
|
||||
} while (lastKey != null && lastKey.Count > 0);
|
||||
}
|
||||
|
||||
public async IAsyncEnumerable<Dictionary<string, string?>> ScanVendorRepliesAsync(
|
||||
[System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken)
|
||||
{
|
||||
Dictionary<string, AttributeValue>? lastKey = null;
|
||||
do
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
var request = new ScanRequest
|
||||
{
|
||||
TableName = VENDOR_REPLIES_TABLE,
|
||||
Limit = 100,
|
||||
ExclusiveStartKey = lastKey
|
||||
};
|
||||
var response = await _dynamo.ScanAsync(request);
|
||||
foreach (var item in response.Items)
|
||||
yield return ConvertItem(item);
|
||||
lastKey = response.LastEvaluatedKey;
|
||||
} while (lastKey != null && lastKey.Count > 0);
|
||||
}
|
||||
|
||||
private static Dictionary<string, string?> ConvertItem(Dictionary<string, AttributeValue> item)
|
||||
{
|
||||
var result = new Dictionary<string, string?>();
|
||||
foreach (var kvp in item)
|
||||
{
|
||||
if (kvp.Value.S != null)
|
||||
result[kvp.Key] = kvp.Value.S;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
108
Api.SeaHavenIndustries/Infrastructure/PortAdapters.cs
Normal file
108
Api.SeaHavenIndustries/Infrastructure/PortAdapters.cs
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
namespace Api.SeaHavenIndustries.Infrastructure
|
||||
{
|
||||
public class FileStorageAdapter : IFileStoragePort
|
||||
{
|
||||
private readonly IWebHostEnvironment _webHostEnvironment;
|
||||
private readonly IHttpContextAccessor _httpContext;
|
||||
|
||||
public FileStorageAdapter(IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContext)
|
||||
{
|
||||
_webHostEnvironment = webHostEnvironment;
|
||||
_httpContext = httpContext;
|
||||
}
|
||||
|
||||
public async Task<string> SaveFileAsync(IFormFile file)
|
||||
{
|
||||
var fileName = Path.GetFileName(file.FileName);
|
||||
if (string.IsNullOrWhiteSpace(fileName))
|
||||
throw new InvalidDataException("The uploaded file must have a valid name.");
|
||||
|
||||
var uniqueFileName = $"{Guid.NewGuid()}_{fileName}";
|
||||
var uploadPath = Path.Combine("Assets", "Documents");
|
||||
var webRoot = _webHostEnvironment.WebRootPath
|
||||
?? Path.Combine(_webHostEnvironment.ContentRootPath, "wwwroot");
|
||||
var fullPath = Path.Combine(webRoot, uploadPath, uniqueFileName);
|
||||
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(fullPath)!);
|
||||
|
||||
using (var stream = System.IO.File.Create(fullPath))
|
||||
{
|
||||
await file.CopyToAsync(stream);
|
||||
}
|
||||
|
||||
var request = _httpContext.HttpContext?.Request
|
||||
?? throw new InvalidOperationException("An active HTTP request is required to build the file URL.");
|
||||
var domain = $"{request.Scheme}://{request.Host}";
|
||||
return $"{domain}/{uploadPath.Replace("\\", "/")}/{uniqueFileName}";
|
||||
}
|
||||
}
|
||||
|
||||
public class DispatchEmailAdapter : IDispatchEmailPort
|
||||
{
|
||||
private readonly Helper.SendMessage _sendMessage;
|
||||
|
||||
public DispatchEmailAdapter(Helper.SendMessage sendMessage)
|
||||
{
|
||||
_sendMessage = sendMessage;
|
||||
}
|
||||
|
||||
public async Task<bool> SendDispatchEmailAsync(string emailTo, string subject, string htmlBody, string? replyTo)
|
||||
{
|
||||
return await _sendMessage.SendDispatchEmail(emailTo, subject, htmlBody, replyTo);
|
||||
}
|
||||
}
|
||||
|
||||
public class VendorTokenAdapter : IVendorTokenPort
|
||||
{
|
||||
private readonly IVendorPortalTokenService _tokenService;
|
||||
|
||||
public VendorTokenAdapter(IVendorPortalTokenService tokenService)
|
||||
{
|
||||
_tokenService = tokenService;
|
||||
}
|
||||
|
||||
public async Task<string> GetOrCreateActiveTokenAsync(int vendorId)
|
||||
{
|
||||
var token = await _tokenService.GetOrCreateActiveTokenAsync(
|
||||
vendorId, CancellationToken.None);
|
||||
return token.Token;
|
||||
}
|
||||
}
|
||||
|
||||
public class VendorDocumentStorageAdapter : IVendorDocumentStoragePort
|
||||
{
|
||||
private readonly IWebHostEnvironment _environment;
|
||||
|
||||
public VendorDocumentStorageAdapter(IWebHostEnvironment environment)
|
||||
{
|
||||
_environment = environment;
|
||||
}
|
||||
|
||||
public async Task SaveAsync(int vendorId, int dispatchId, string storedFileName, Stream content, CancellationToken cancellationToken)
|
||||
{
|
||||
var path = Helper.VendorDocumentStorage.ResolvePath(_environment.ContentRootPath, vendorId, dispatchId, storedFileName);
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(path)!);
|
||||
await using var file = File.Create(path);
|
||||
await content.CopyToAsync(file, cancellationToken);
|
||||
}
|
||||
|
||||
public Stream OpenRead(int vendorId, int dispatchId, string storedFileName)
|
||||
{
|
||||
var path = Helper.VendorDocumentStorage.ResolvePath(_environment.ContentRootPath, vendorId, dispatchId, storedFileName);
|
||||
return File.OpenRead(path);
|
||||
}
|
||||
|
||||
public void Delete(int vendorId, int dispatchId, string storedFileName)
|
||||
{
|
||||
var path = Helper.VendorDocumentStorage.ResolvePath(_environment.ContentRootPath, vendorId, dispatchId, storedFileName);
|
||||
if (File.Exists(path))
|
||||
{
|
||||
File.Delete(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -13,6 +13,7 @@ using System.Text;
|
|||
using SeaHaven.DataServices.DependencyInjection;
|
||||
using SeaHaven.Services.DependencyInjection;
|
||||
using SeaHaven.Services.Implementation;
|
||||
using SeaHaven.Services.Interfaces;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
ConfigurationManager configuration = builder.Configuration;
|
||||
|
|
@ -43,7 +44,8 @@ builder.Services.AddCors(option =>
|
|||
option.AddDefaultPolicy(builder => builder.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod()));
|
||||
|
||||
builder.Services.AddScoped<SendMessage>();
|
||||
builder.Services.AddScoped<Api.SeaHavenIndustries.Helper.VendorPortalTokenService>();
|
||||
builder.Services.AddScoped<Api.SeaHavenIndustries.Helper.SendGridEmailSender>();
|
||||
builder.Services.AddScoped<SeaHaven.Services.Interfaces.IEmailSender, Api.SeaHavenIndustries.Helper.SendGridEmailSender>();
|
||||
builder.Services.AddSingleton(TimeProvider.System);
|
||||
builder.Services.AddScoped<IDocumentScanner, ClamAvDocumentScanner>();
|
||||
builder.Services.AddHostedService<VendorDocumentScanWorker>();
|
||||
|
|
@ -55,9 +57,16 @@ builder.Services.AddSingleton<Api.SeaHavenIndustries.Helper.ZipCodeDistance>(sp
|
|||
if (File.Exists(csvPath)) zipService.Load(csvPath);
|
||||
return zipService;
|
||||
});
|
||||
builder.Services.AddSingleton<SeaHaven.Services.Interfaces.IZipCodeDistance>(
|
||||
serviceProvider => serviceProvider.GetRequiredService<Api.SeaHavenIndustries.Helper.ZipCodeDistance>());
|
||||
|
||||
builder.Services.AddDataServices();
|
||||
builder.Services.AddBusinessServices();
|
||||
builder.Services.AddBusinessServices(configuration);
|
||||
builder.Services.AddScoped<SeaHaven.Services.Interfaces.ISyncExternalSource, Api.SeaHavenIndustries.Infrastructure.DynamoSyncExternalSource>();
|
||||
builder.Services.AddScoped<SeaHaven.Services.Interfaces.IFileStoragePort, Api.SeaHavenIndustries.Infrastructure.FileStorageAdapter>();
|
||||
builder.Services.AddScoped<SeaHaven.Services.Interfaces.IDispatchEmailPort, Api.SeaHavenIndustries.Infrastructure.DispatchEmailAdapter>();
|
||||
builder.Services.AddScoped<SeaHaven.Services.Interfaces.IVendorTokenPort, Api.SeaHavenIndustries.Infrastructure.VendorTokenAdapter>();
|
||||
builder.Services.AddScoped<SeaHaven.Services.Interfaces.IVendorDocumentStoragePort, Api.SeaHavenIndustries.Infrastructure.VendorDocumentStorageAdapter>();
|
||||
|
||||
builder.Services.Configure<WorkOrderJobsOptions>(
|
||||
builder.Configuration.GetSection(WorkOrderJobsOptions.SectionName));
|
||||
|
|
@ -75,6 +84,8 @@ builder.Services.Configure<SyncOptions>(
|
|||
builder.Services.Configure<LegacyEndpointOptions>(
|
||||
builder.Configuration.GetSection(LegacyEndpointOptions.SectionName));
|
||||
builder.Services.AddSingleton<WorkOrderJobRunStateAccessor>();
|
||||
builder.Services.AddSingleton<IWorkOrderJobRunStateAccessor>(
|
||||
sp => sp.GetRequiredService<WorkOrderJobRunStateAccessor>());
|
||||
builder.Services.AddSingleton(sp => sp.GetRequiredService<WorkOrderJobRunStateAccessor>().State);
|
||||
builder.Services.AddScoped<Api.SeaHavenIndustries.Filters.IngestApiKeyFilter>();
|
||||
builder.Services.AddHostedService<WorkOrderWeekRolledHostedService>();
|
||||
|
|
@ -107,7 +118,9 @@ builder.Services.AddAuthentication(options =>
|
|||
ValidateAudience = true,
|
||||
ValidAudience = configuration["JWT:ValidAudience"],
|
||||
ValidIssuer = configuration["JWT:ValidIssuer"],
|
||||
IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration["JWT:Secret"]))
|
||||
IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(
|
||||
configuration["JWT:Secret"]
|
||||
?? throw new InvalidOperationException("JWT:Secret configuration is required")))
|
||||
};
|
||||
});
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
|
|
|
|||
|
|
@ -1,564 +1,106 @@
|
|||
# Backend Architecture Guide
|
||||
# Backend Architecture and Quality Rules
|
||||
|
||||
## 🏗️ Clean Architecture Overview
|
||||
This repository uses a feature-oriented service boundary over Entity Framework Core:
|
||||
|
||||
The backend follows **Clean Architecture** with strict layer separation:
|
||||
|
||||
```
|
||||
┌─────────────────────────────────────────────────────────────┐
|
||||
│ API LAYER (Controllers) │
|
||||
│ - HTTP Request/Response │
|
||||
│ - Authentication & Authorization │
|
||||
│ - Exception Handling │
|
||||
│ - Input Validation (basic) │
|
||||
└─────────────────┬───────────────────────────────────────────┘
|
||||
│ Calls
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────┐
|
||||
│ SERVICE LAYER (Business Logic) │
|
||||
│ - Business Rules │
|
||||
│ - FluentValidation (detailed validation) │
|
||||
│ - Data Transformation │
|
||||
│ - Orchestration │
|
||||
└─────────────────┬───────────────────────────────────────────┘
|
||||
│ Calls
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────┐
|
||||
│ DATA SERVICE LAYER (Persistence) │
|
||||
│ - Database Access │
|
||||
│ - Entity Operations (CRUD) │
|
||||
│ - Query Building │
|
||||
│ - Transaction Management │
|
||||
└─────────────────┬───────────────────────────────────────────┘
|
||||
│ Uses
|
||||
▼
|
||||
┌─────────────────────────────────────────────────────────────┐
|
||||
│ DATA LAYER (EF Core) │
|
||||
│ - DbContext │
|
||||
│ - Entity Models │
|
||||
│ - Database Schema │
|
||||
└─────────────────────────────────────────────────────────────┘
|
||||
```text
|
||||
HTTP controller -> I{Feature}Service -> I{Feature}DataService -> ApplicationDbContext
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📁 Project Structure
|
||||
|
||||
```
|
||||
backend/shoc-backend/
|
||||
│
|
||||
├── Api.SeaHavenIndustries/ # 🌐 API Layer
|
||||
│ ├── Controllers/ # HTTP endpoints
|
||||
│ ├── DTOs/ # Data Transfer Objects (API contracts)
|
||||
│ ├── Program.cs # App startup & DI registration
|
||||
│ └── appsettings.json # Configuration
|
||||
│
|
||||
├── SeaHaven.Services/ # 💼 Service Layer (Business Logic)
|
||||
│ ├── Interfaces/ # Service contracts (IContactService, etc.)
|
||||
│ ├── Implementation/ # Service implementations
|
||||
│ ├── DTOs/ # Internal DTOs for service layer
|
||||
│ └── Validators/ # FluentValidation validators
|
||||
│
|
||||
├── SeaHaven.DataServices/ # 💾 Data Access Layer
|
||||
│ ├── Interfaces/ # DataService contracts (IContactDataService, etc.)
|
||||
│ ├── Implementation/ # DataService implementations
|
||||
│ └── DTOs/ # Data layer DTOs
|
||||
│
|
||||
└── Data.SeaHavenIndustries/ # 🗄️ Data Layer (EF Core)
|
||||
├── Models/ # Entity models (Contact, Employee, etc.)
|
||||
├── ApplicationDbContext.cs # EF Core DbContext
|
||||
└── Migrations/ # Database migrations
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔄 Data Flow Example (Creating a Contact)
|
||||
|
||||
### 1️⃣ **API Layer** (`ContactController.cs`)
|
||||
```csharp
|
||||
[HttpPost("Create")]
|
||||
public async Task<IActionResult> AddContacts(Contact_DTO dto)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Get authenticated user ID
|
||||
var userId = _userManager.GetUserId(User);
|
||||
if (userId == null)
|
||||
return Unauthorized(new Response { Status = "Error", Message = "User not authenticated" });
|
||||
|
||||
// Convert API DTO → Service DTO
|
||||
var serviceDto = dto.ToServiceCreateDTO();
|
||||
|
||||
// Call Service Layer
|
||||
await _contactService.CreateContactAsync(serviceDto, userId);
|
||||
|
||||
return Ok(new Response { Status = "Success", Message = "Contact created" });
|
||||
}
|
||||
catch (ValidationException vex)
|
||||
{
|
||||
var errors = string.Join(", ", vex.Errors.Select(e => e.ErrorMessage));
|
||||
return BadRequest(new Response { Status = "Validation Error", Message = errors });
|
||||
}
|
||||
catch (KeyNotFoundException)
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = "Resource not found" });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Responsibilities:**
|
||||
- ✅ Authenticate user
|
||||
- ✅ Extract user ID from claims
|
||||
- ✅ Map API DTO to Service DTO
|
||||
- ✅ Catch exceptions and return proper HTTP status codes
|
||||
- ❌ NO business logic
|
||||
- ❌ NO database access
|
||||
|
||||
---
|
||||
|
||||
### 2️⃣ **Service Layer** (`ContactService.cs`)
|
||||
|
||||
```csharp
|
||||
public class ContactService : IContactService
|
||||
{
|
||||
private readonly IContactDataService _dataService;
|
||||
private readonly IValidator<CreateContactDTO> _createValidator;
|
||||
|
||||
public ContactService(
|
||||
IContactDataService dataService,
|
||||
IValidator<CreateContactDTO> createValidator)
|
||||
{
|
||||
_dataService = dataService;
|
||||
_createValidator = createValidator;
|
||||
}
|
||||
|
||||
public async Task<ContactDTO> CreateContactAsync(CreateContactDTO dto, string userId)
|
||||
{
|
||||
// STEP 1: Validate using FluentValidation
|
||||
var validationResult = await _createValidator.ValidateAsync(dto);
|
||||
if (!validationResult.IsValid)
|
||||
{
|
||||
throw new ValidationException(validationResult.Errors);
|
||||
}
|
||||
|
||||
// STEP 2: Business logic (if any)
|
||||
// Example: Check for duplicates, apply business rules, etc.
|
||||
|
||||
// STEP 3: Map Service DTO → Data DTO
|
||||
var dataDto = new CreateContactDataDTO
|
||||
{
|
||||
FirstName = dto.FirstName,
|
||||
LastName = dto.LastName,
|
||||
Email = dto.Email,
|
||||
Phone = dto.Phone
|
||||
};
|
||||
|
||||
// STEP 4: Call Data Service Layer
|
||||
var createdContact = await _dataService.CreateAsync(dataDto, userId);
|
||||
|
||||
// STEP 5: Map Data DTO → Service DTO and return
|
||||
return new ContactDTO
|
||||
{
|
||||
Id = createdContact.Id,
|
||||
FirstName = createdContact.FirstName,
|
||||
LastName = createdContact.LastName,
|
||||
Email = createdContact.Email,
|
||||
Phone = createdContact.Phone
|
||||
};
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Responsibilities:**
|
||||
- ✅ Validate input using FluentValidation
|
||||
- ✅ Apply business rules
|
||||
- ✅ Orchestrate operations
|
||||
- ✅ Transform data between layers
|
||||
- ❌ NO HTTP concerns
|
||||
- ❌ NO direct database access
|
||||
|
||||
---
|
||||
|
||||
### 3️⃣ **Data Service Layer** (`ContactDataService.cs`)
|
||||
|
||||
```csharp
|
||||
public class ContactDataService : IContactDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _db;
|
||||
|
||||
public ContactDataService(ApplicationDbContext db)
|
||||
{
|
||||
_db = db;
|
||||
}
|
||||
|
||||
public async Task<ContactDataDTO> CreateAsync(CreateContactDataDTO dto, string userId)
|
||||
{
|
||||
// STEP 1: Create entity from DTO
|
||||
var contact = new Contact
|
||||
{
|
||||
FirstName = dto.FirstName,
|
||||
LastName = dto.LastName,
|
||||
Email = dto.Email,
|
||||
Phone = dto.Phone,
|
||||
CreatedBy = userId,
|
||||
CreatedDate = DateTime.UtcNow,
|
||||
ModifiedBy = userId,
|
||||
ModifiedDate = DateTime.UtcNow
|
||||
};
|
||||
|
||||
// STEP 2: Add to database
|
||||
_db.Contacts.Add(contact);
|
||||
await _db.SaveChangesAsync();
|
||||
|
||||
// STEP 3: Map entity → Data DTO and return
|
||||
return new ContactDataDTO
|
||||
{
|
||||
Id = contact.Id,
|
||||
FirstName = contact.FirstName,
|
||||
LastName = contact.LastName,
|
||||
Email = contact.Email,
|
||||
Phone = contact.Phone
|
||||
};
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**Responsibilities:**
|
||||
- ✅ Direct database operations (CRUD)
|
||||
- ✅ Entity mapping
|
||||
- ✅ Set audit fields (CreatedBy, CreatedDate, etc.)
|
||||
- ✅ Transaction management
|
||||
- ❌ NO validation
|
||||
- ❌ NO business logic
|
||||
|
||||
---
|
||||
|
||||
## 🔌 Dependency Injection (DI)
|
||||
|
||||
### Automatic Assembly Scanning
|
||||
|
||||
Services are **automatically registered** by scanning assemblies using naming convention.
|
||||
|
||||
**In `Program.cs`:**
|
||||
```csharp
|
||||
builder.Services.AddDataServices(); // Auto-register all Data Services
|
||||
builder.Services.AddBusinessServices(); // Auto-register all Business Services + Validators
|
||||
```
|
||||
|
||||
### How It Works
|
||||
|
||||
**Module Files:**
|
||||
- `SeaHaven.DataServices/DependencyInjection/DataServicesModule.cs`
|
||||
- `SeaHaven.Services/DependencyInjection/ServicesModule.cs`
|
||||
|
||||
**Process:**
|
||||
1. Scans assembly for all classes
|
||||
2. Finds interface matching pattern `I{ClassName}`
|
||||
3. Registers as Scoped service
|
||||
4. Also auto-registers FluentValidation validators
|
||||
|
||||
### Naming Convention Required
|
||||
|
||||
| Interface | Implementation | Registered? |
|
||||
|-----------|---------------|-------------|
|
||||
| `IContactService` | `ContactService` | ✅ YES |
|
||||
| `IContactDataService` | `ContactDataService` | ✅ YES |
|
||||
| `ISomething` | `SomethingDifferent` | ❌ NO |
|
||||
|
||||
**Rule**: Interface must be `I` + Class name exactly
|
||||
|
||||
### Usage in Code
|
||||
|
||||
Once registered, inject via constructor:
|
||||
|
||||
```csharp
|
||||
public class ContactController : Controller
|
||||
{
|
||||
private readonly IContactService _contactService;
|
||||
|
||||
public ContactController(IContactService contactService)
|
||||
{
|
||||
_contactService = contactService;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Benefits
|
||||
|
||||
✅ No manual registration - just follow naming convention
|
||||
✅ Auto-discovery - new services work automatically
|
||||
✅ FluentValidation auto-registered
|
||||
|
||||
---
|
||||
|
||||
## ✅ FluentValidation
|
||||
|
||||
### Validator Example (`CreateContactDTOValidator.cs`)
|
||||
|
||||
```csharp
|
||||
public class CreateContactDTOValidator : AbstractValidator<CreateContactDTO>
|
||||
{
|
||||
public CreateContactDTOValidator()
|
||||
{
|
||||
RuleFor(x => x.FirstName)
|
||||
.NotEmpty().WithMessage("First name is required")
|
||||
.MaximumLength(50).WithMessage("First name cannot exceed 50 characters");
|
||||
|
||||
RuleFor(x => x.LastName)
|
||||
.NotEmpty().WithMessage("Last name is required")
|
||||
.MaximumLength(50).WithMessage("Last name cannot exceed 50 characters");
|
||||
|
||||
RuleFor(x => x.Email)
|
||||
.NotEmpty().WithMessage("Email is required")
|
||||
.EmailAddress().WithMessage("Invalid email format")
|
||||
.MaximumLength(100).WithMessage("Email cannot exceed 100 characters");
|
||||
|
||||
RuleFor(x => x.Phone)
|
||||
.Matches(@"^\+?[1-9]\d{1,14}$").When(x => !string.IsNullOrEmpty(x.Phone))
|
||||
.WithMessage("Invalid phone number format");
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Where Validation Happens
|
||||
|
||||
```
|
||||
❌ Controller → NO detailed validation (only catches ValidationException)
|
||||
✅ Service → YES - FluentValidation runs here
|
||||
❌ DataService → NO validation
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Interface Examples
|
||||
|
||||
### Service Interface (`IContactService.cs`)
|
||||
```csharp
|
||||
public interface IContactService
|
||||
{
|
||||
Task<ContactDTO> CreateContactAsync(CreateContactDTO dto, string userId);
|
||||
Task<ContactDTO> UpdateContactAsync(int id, UpdateContactDTO dto, string userId);
|
||||
Task DeleteContactAsync(int id, string userId);
|
||||
Task<ContactDTO> GetContactByIdAsync(int id);
|
||||
Task<PagedResult<ContactDTO>> GetContactsPagedAsync(int page, int pageSize, string? search);
|
||||
}
|
||||
```
|
||||
|
||||
### Data Service Interface (`IContactDataService.cs`)
|
||||
```csharp
|
||||
public interface IContactDataService
|
||||
{
|
||||
Task<ContactDataDTO> CreateAsync(CreateContactDataDTO dto, string userId);
|
||||
Task<ContactDataDTO> UpdateAsync(int id, UpdateContactDataDTO dto, string userId);
|
||||
Task DeleteAsync(int id, string userId);
|
||||
Task<ContactDataDTO?> GetByIdAsync(int id);
|
||||
Task<PagedResult<ContactDataDTO>> GetPagedAsync(int page, int pageSize, string? search);
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📦 DTO Types
|
||||
|
||||
### 1. **API DTOs** (`Api.SeaHavenIndustries/DTOs/`)
|
||||
- Used for HTTP requests/responses
|
||||
- Map to frontend JSON structure
|
||||
- Example: `Contact_DTO`, `EditContact_DTO`
|
||||
|
||||
### 2. **Service DTOs** (`SeaHaven.Services/DTOs/`)
|
||||
- Used between Controller ↔ Service
|
||||
- Business-focused structure
|
||||
- Example: `CreateContactDTO`, `UpdateContactDTO`, `ContactDTO`
|
||||
|
||||
### 3. **Data DTOs** (`SeaHaven.DataServices/DTOs/`)
|
||||
- Used between Service ↔ DataService
|
||||
- Database-focused structure
|
||||
- Example: `CreateContactDataDTO`, `ContactDataDTO`
|
||||
|
||||
### DTO Mapping Flow
|
||||
```
|
||||
API DTO → Service DTO → Data DTO → Entity
|
||||
(HTTP) (Business) (Data) (Database)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚨 Exception Handling Pattern
|
||||
|
||||
### Controller Exception Handling (STANDARD PATTERN)
|
||||
|
||||
```csharp
|
||||
[HttpPost("Create")]
|
||||
public async Task<IActionResult> Create([FromBody] SomeDTO dto)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Get user ID
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (userId == null)
|
||||
return Unauthorized(new Response { Status = "Error", Message = "User not authenticated" });
|
||||
|
||||
// Call service
|
||||
await _service.CreateAsync(dto, userId);
|
||||
|
||||
return Ok(new Response { Status = "Success", Message = "Created successfully" });
|
||||
}
|
||||
catch (ValidationException vex) // ⚠️ CATCH THIS FIRST
|
||||
{
|
||||
var errors = string.Join(", ", vex.Errors.Select(e => e.ErrorMessage));
|
||||
return BadRequest(new Response { Status = "Validation Error", Message = errors });
|
||||
}
|
||||
catch (KeyNotFoundException) // ⚠️ THEN THIS
|
||||
{
|
||||
return NotFound(new Response { Status = "Error", Message = "Not found" });
|
||||
}
|
||||
catch (Exception ex) // ⚠️ GENERIC LAST
|
||||
{
|
||||
return StatusCode(500, new Response { Status = "Error", Message = ex.Message });
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### HTTP Status Code Mapping
|
||||
- **200 OK** → Success
|
||||
- **400 Bad Request** → Validation errors
|
||||
- **401 Unauthorized** → Not authenticated
|
||||
- **404 Not Found** → Resource not found
|
||||
- **500 Internal Server Error** → Unexpected errors
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Authentication & User ID
|
||||
|
||||
### Getting User ID (Two Methods)
|
||||
|
||||
**Method 1: Using Claims (Preferred)**
|
||||
```csharp
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
if (userId == null)
|
||||
return Unauthorized(new Response { Status = "Error", Message = "User not authenticated" });
|
||||
```
|
||||
|
||||
**Method 2: Using UserManager (for Identity)**
|
||||
```csharp
|
||||
var userId = _userManager.GetUserId(User);
|
||||
if (userId == null)
|
||||
return Unauthorized(new Response { Status = "Error", Message = "User not authenticated" });
|
||||
```
|
||||
|
||||
### Audit Fields
|
||||
Every entity should track:
|
||||
- `CreatedBy` (string - User ID GUID)
|
||||
- `CreatedDate` (DateTime)
|
||||
- `ModifiedBy` (string - User ID GUID)
|
||||
- `ModifiedDate` (DateTime)
|
||||
|
||||
---
|
||||
|
||||
## 📋 Naming Conventions
|
||||
|
||||
### Controllers
|
||||
- Named after entity + "Controller"
|
||||
- Example: `ContactController`, `EmployeeController`
|
||||
|
||||
### Services
|
||||
- Interface: `I[Entity]Service`
|
||||
- Implementation: `[Entity]Service`
|
||||
- Example: `IContactService`, `ContactService`
|
||||
|
||||
### Data Services
|
||||
- Interface: `I[Entity]DataService`
|
||||
- Implementation: `[Entity]DataService`
|
||||
- Example: `IContactDataService`, `ContactDataService`
|
||||
|
||||
### DTOs
|
||||
- API Layer: `[Entity]_DTO`, `Edit[Entity]_DTO`
|
||||
- Service Layer: `Create[Entity]DTO`, `Update[Entity]DTO`, `[Entity]DTO`
|
||||
- Data Layer: `Create[Entity]DataDTO`, `[Entity]DataDTO`
|
||||
|
||||
---
|
||||
|
||||
## ✅ Best Practices Checklist
|
||||
|
||||
### Controllers
|
||||
- [ ] Use dependency injection for services
|
||||
- [ ] Get user ID from `User.FindFirstValue(ClaimTypes.NameIdentifier)`
|
||||
- [ ] Return 401 if userId is null
|
||||
- [ ] Catch `ValidationException` BEFORE generic `Exception`
|
||||
- [ ] Return appropriate HTTP status codes
|
||||
- [ ] NO business logic in controllers
|
||||
- [ ] NO direct database access (`_db`)
|
||||
|
||||
### Services
|
||||
- [ ] Validate using FluentValidation
|
||||
- [ ] Throw `ValidationException` for validation errors
|
||||
- [ ] Throw `KeyNotFoundException` for not found
|
||||
- [ ] Pass userId to DataService
|
||||
- [ ] Transform DTOs between layers
|
||||
- [ ] Implement business rules here
|
||||
|
||||
### Data Services
|
||||
- [ ] Direct database access only
|
||||
- [ ] Set audit fields (CreatedBy, CreatedDate, ModifiedBy, ModifiedDate)
|
||||
- [ ] Use async/await for all database operations
|
||||
- [ ] NO validation logic
|
||||
- [ ] NO business logic
|
||||
|
||||
---
|
||||
|
||||
## 🎓 Quick Reference
|
||||
|
||||
| Layer | Purpose | Can Access | Cannot Access |
|
||||
|-------|---------|-----------|---------------|
|
||||
| **Controller** | HTTP handling, auth | Service layer | Database directly |
|
||||
| **Service** | Business logic, validation | DataService layer | Database directly |
|
||||
| **DataService** | Database operations | DbContext, Entities | HTTP context |
|
||||
| **Data** | Entity definitions | Nothing (POCOs) | Application logic |
|
||||
|
||||
---
|
||||
|
||||
## 📚 Example: Full CRUD Implementation
|
||||
|
||||
See these files for complete examples:
|
||||
- **Contact**: `ContactController.cs`, `ContactService.cs`, `ContactDataService.cs`
|
||||
- **Employee**: `EmployeeController.cs`, `EmployeeService.cs`, `EmployeeDataService.cs`
|
||||
- **Asset**: `AssetController.cs`, `AssetService.cs`, `AssetDataService.cs`
|
||||
|
||||
All follow the same Clean Architecture pattern!
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Configuration & Secrets
|
||||
|
||||
No secrets are stored in source. The committed `appsettings*.json` files hold only
|
||||
`${PLACEHOLDER}` tokens; real values must be supplied at runtime through one of the
|
||||
standard .NET configuration sources (later sources win):
|
||||
|
||||
1. `appsettings.json` / `appsettings.{Environment}.json` — committed, placeholders only.
|
||||
2. **User Secrets** (local dev): `dotnet user-secrets set "Section:Key" "value"`.
|
||||
3. **Environment variables** — use `__` (double underscore) as the section separator.
|
||||
In AWS Elastic Beanstalk these are the environment properties.
|
||||
|
||||
See `.env.example` in the repo root for the full list. Required values:
|
||||
|
||||
| Setting | Env-var form | Used by | Notes |
|
||||
|---|---|---|---|
|
||||
| `ConnectionStrings:DefaultConnection` | `ConnectionStrings__DefaultConnection` | Both projects | SQL Server connection string |
|
||||
| `SendGrid:ApiKey` | `SendGrid__ApiKey` | Both projects | Transactional email |
|
||||
| `JWT:Secret` | `JWT__Secret` | `Api.SeaHavenIndustries` | JWT signing key |
|
||||
| `GoogleMaps:ApiKey` | `GoogleMaps__ApiKey` | `SeaHavenIndustries` (Blazor) | Maps/Places; read in `App.razor` + `Home.razor` |
|
||||
|
||||
### AWS credentials
|
||||
|
||||
`UploadFileHp` (S3 uploads) uses the **AWS SDK default credential chain** — it no longer
|
||||
hardcodes access keys. Credentials resolve from `AWS_ACCESS_KEY_ID` / `AWS_SECRET_ACCESS_KEY`
|
||||
env vars, the shared profile/SSO, or (preferred in production) the EC2/ECS instance role.
|
||||
The region comes from `AddDefaultAWSOptions` in `Program.cs`.
|
||||
|
||||
> ⚠️ The secrets previously committed to this repo (DB password, SendGrid key, JWT secret,
|
||||
> Google Maps keys, AWS access key) should be considered compromised and **rotated**.
|
||||
|
||||
The interfaces are architectural seams, not a requirement to wrap every class or every
|
||||
EF method. Add an interface when it separates HTTP, business, persistence, or external
|
||||
I/O responsibilities and enables behavior-focused testing.
|
||||
|
||||
## Layer responsibilities
|
||||
|
||||
### API controllers
|
||||
|
||||
- Parse HTTP input, authorize the caller, invoke a business-service interface, and map
|
||||
the result to the established HTTP contract.
|
||||
- Do not inject `ApplicationDbContext`, concrete service implementations, or concrete
|
||||
data-service implementations.
|
||||
- Do not contain persistence queries or business workflows.
|
||||
- Do not expose exception messages to clients. Map known failures explicitly and let the
|
||||
centralized exception boundary handle unexpected failures.
|
||||
|
||||
### Business services
|
||||
|
||||
- Own validation, business decisions, orchestration, and transaction intent.
|
||||
- Depend on interfaces for persistence and external I/O.
|
||||
- Use `IOptions<T>` for typed configuration. Do not inject `IConfiguration`.
|
||||
- Keep feature responsibilities cohesive. Split a service when it has independently
|
||||
changing business reasons, not because it crossed an arbitrary line count.
|
||||
- Preserve existing API and board-backed behavior unless the accepted requirement
|
||||
explicitly changes it.
|
||||
|
||||
### Data services
|
||||
|
||||
- Own EF Core query shape, persistence, batching, and transaction implementation.
|
||||
- Accept cancellation tokens on new I/O methods and pass them to EF Core.
|
||||
- Use `AsNoTracking()` for read-only queries.
|
||||
- Project only required columns for list/read models; include full graphs only when the
|
||||
caller needs them.
|
||||
- Page unbounded collections at the database.
|
||||
- Avoid query-in-loop and save-in-loop patterns. Prefer set-based reads and batched writes
|
||||
while preserving the workflow's failure and transaction semantics.
|
||||
- Do not introduce a generic repository over EF Core. Feature data services should expose
|
||||
intent-revealing operations.
|
||||
|
||||
## Performance review
|
||||
|
||||
For each changed hot path, document and test:
|
||||
|
||||
- input size variables;
|
||||
- CPU and memory complexity;
|
||||
- database round trips;
|
||||
- whether filtering, ordering, and paging execute in SQL;
|
||||
- whether tracking is necessary;
|
||||
- whether repeated work can be hoisted out of loops;
|
||||
- the partial-failure and transaction behavior.
|
||||
|
||||
Prefer dictionary or hash-set reconstruction when database results must follow caller
|
||||
order. A query followed by dictionary reconstruction is normally `O(n)` CPU and memory;
|
||||
repeated `First`/`Single` scans over the result are `O(n²)`.
|
||||
|
||||
Do not optimize by weakening correctness. In particular, batching all writes into one
|
||||
final save can change partial-success behavior, and adding a transaction can change
|
||||
locking and retry semantics. Those are business decisions, not mechanical cleanup.
|
||||
|
||||
## Configuration
|
||||
|
||||
Configuration is bound once during composition in
|
||||
`SeaHaven.Services/DependencyInjection/ServicesModule.cs`. Business services receive
|
||||
typed options such as `FrontendOptions`, `JwtOptions`, `ApprovalsOptions`, and
|
||||
`VendorPortalOptions`.
|
||||
|
||||
Defaults must preserve current behavior. Startup validation should be introduced only
|
||||
when every deployed environment is known to provide the required value.
|
||||
|
||||
## Enforcement
|
||||
|
||||
`ArchitectureTests` enforces mechanical dependency rules:
|
||||
|
||||
- controllers cannot inject EF contexts or concrete service/data-service classes;
|
||||
- business services cannot inject EF contexts or raw `IConfiguration`.
|
||||
|
||||
The pull-request quality workflow runs those tests and verifies formatting for changed
|
||||
C# files. The normal CI workflow builds the solution and runs the full test suite.
|
||||
|
||||
Architecture tests are appropriate for dependency direction. Behavior belongs in tests
|
||||
through public interfaces. Do not add tests merely to prove a linter or analyzer itself
|
||||
works; test the product behavior the rule protects.
|
||||
|
||||
## Review checklist
|
||||
|
||||
- Controller depends only on service abstractions.
|
||||
- Business logic is in a cohesive feature service.
|
||||
- EF operations are behind a feature data-service abstraction.
|
||||
- No raw `IConfiguration` in a business service.
|
||||
- No unbounded load followed by in-memory filtering.
|
||||
- No query/save loop where a set-based operation preserves semantics.
|
||||
- Read-only EF queries use no tracking.
|
||||
- New async I/O accepts and propagates cancellation where the public contract permits.
|
||||
- Errors do not leak internal exception details.
|
||||
- Tests cover behavior, authorization, data contracts, ordering, duplicates, missing
|
||||
records, and relevant failure boundaries.
|
||||
- Changed behavior has been checked against the authoritative ticket board. Missing board
|
||||
access blocks readiness and merge claims.
|
||||
|
|
|
|||
101
Data.SeaHavenIndustries/Models/VendorPortalReadModels.cs
Normal file
101
Data.SeaHavenIndustries/Models/VendorPortalReadModels.cs
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
namespace Data.SeaHavenIndustries
|
||||
{
|
||||
public class VendorDispatchSummaryData
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? DispatchNumber { get; set; }
|
||||
public string? PONumber { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public decimal? NTEAmount { get; set; }
|
||||
public DateTime? ScheduledDate { get; set; }
|
||||
public DateTime? CompletedDate { get; set; }
|
||||
public DateTime? DispatchedAt { get; set; }
|
||||
public DateTime? AcknowledgedAt { get; set; }
|
||||
public string? WorkOrderTitle { get; set; }
|
||||
public string? InternalWONumber { get; set; }
|
||||
public string? LocationName { get; set; }
|
||||
public string? LocationCity { get; set; }
|
||||
public string? LocationState { get; set; }
|
||||
}
|
||||
|
||||
public class PortalChecklistItemData
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? ItemText { get; set; }
|
||||
public bool IsCompleted { get; set; }
|
||||
public string? CompletedBy { get; set; }
|
||||
public DateTime? CompletedAt { get; set; }
|
||||
}
|
||||
|
||||
public class PortalSignoffData
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? SignoffType { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public string? SignatureMethod { get; set; }
|
||||
public DateTime? SignedAt { get; set; }
|
||||
}
|
||||
|
||||
public class PortalUpliftData
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public decimal? CurrentNTE { get; set; }
|
||||
public decimal RequestedNTE { get; set; }
|
||||
public string? VendorReason { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public int RequiredTier { get; set; }
|
||||
public string? RequestedByVendorName { get; set; }
|
||||
public DateTime? CreatedDate { get; set; }
|
||||
public DateTime? DecidedAt { get; set; }
|
||||
public string? DecisionNote { get; set; }
|
||||
public string? DecidedByFirstName { get; set; }
|
||||
public string? DecidedByLastName { get; set; }
|
||||
}
|
||||
|
||||
public class PortalCommentData
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? Commenttext { get; set; }
|
||||
public string? Commenter { get; set; }
|
||||
public string? CommentType { get; set; }
|
||||
public DateTime? CreatedDate { get; set; }
|
||||
public string? UserId { get; set; }
|
||||
public string? UserFirstName { get; set; }
|
||||
public string? UserLastName { get; set; }
|
||||
}
|
||||
|
||||
public class UpliftListItemData
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int DispatchId { get; set; }
|
||||
public string? DispatchNumber { get; set; }
|
||||
public string? PONumber { get; set; }
|
||||
public int? WorkOrderId { get; set; }
|
||||
public string? VendorCompanyName { get; set; }
|
||||
public decimal? CurrentNTE { get; set; }
|
||||
public decimal RequestedNTE { get; set; }
|
||||
public string? VendorReason { get; set; }
|
||||
public int RequiredTier { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public DateTime? CreatedDate { get; set; }
|
||||
public DateTime? DecidedAt { get; set; }
|
||||
public string? DecisionNote { get; set; }
|
||||
}
|
||||
|
||||
public class UpliftForDispatchData
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int DispatchId { get; set; }
|
||||
public decimal? CurrentNTE { get; set; }
|
||||
public decimal RequestedNTE { get; set; }
|
||||
public string? VendorReason { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public int RequiredTier { get; set; }
|
||||
public string? RequestedByVendorName { get; set; }
|
||||
public DateTime? CreatedDate { get; set; }
|
||||
public DateTime? DecidedAt { get; set; }
|
||||
public string? DecisionNote { get; set; }
|
||||
public string? DecidedByFirstName { get; set; }
|
||||
public string? DecidedByLastName { get; set; }
|
||||
}
|
||||
}
|
||||
169
SeaHaven.DataServices/Dto/DispatchReadModels.cs
Normal file
169
SeaHaven.DataServices/Dto/DispatchReadModels.cs
Normal file
|
|
@ -0,0 +1,169 @@
|
|||
namespace SeaHaven.DataServices.Dto
|
||||
{
|
||||
public class DispatchListItemDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? DispatchNumber { get; set; }
|
||||
public string? PONumber { get; set; }
|
||||
public decimal? NTEAmount { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public DateTime? DispatchedAt { get; set; }
|
||||
public DateTime? ScheduledDate { get; set; }
|
||||
public DateTime? CompletedDate { get; set; }
|
||||
public DateTime? AcknowledgedAt { get; set; }
|
||||
public DateTime? VerifiedAt { get; set; }
|
||||
public int? VendorId { get; set; }
|
||||
public string? VendorName { get; set; }
|
||||
public int? WorkOrderId { get; set; }
|
||||
public string? PrimaryWOInternalNumber { get; set; }
|
||||
public string? PrimaryWOTitle { get; set; }
|
||||
public string? LocationName { get; set; }
|
||||
public int WorkOrderCount { get; set; }
|
||||
public int PendingUpliftCount { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchListResult
|
||||
{
|
||||
public IReadOnlyList<DispatchListItemDTO> Items { get; set; } = Array.Empty<DispatchListItemDTO>();
|
||||
public int Total { get; set; }
|
||||
public int Page { get; set; }
|
||||
public int PageSize { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchListQuery
|
||||
{
|
||||
public string? Search { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public int? VendorId { get; set; }
|
||||
public DateTime? DateFrom { get; set; }
|
||||
public DateTime? DateTo { get; set; }
|
||||
public string? SortBy { get; set; }
|
||||
public string? SortDir { get; set; }
|
||||
public int Page { get; set; }
|
||||
public int PageSize { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchDetailVendorDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? CompanyName { get; set; }
|
||||
public string? ContactName { get; set; }
|
||||
public string? Email { get; set; }
|
||||
public string? Phone { get; set; }
|
||||
public string? Address { get; set; }
|
||||
public string? City { get; set; }
|
||||
public string? State { get; set; }
|
||||
public string? Zip { get; set; }
|
||||
public string? TradeSpecialties { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchPrimaryLocationDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public string? Address1 { get; set; }
|
||||
public string? City { get; set; }
|
||||
public string? State { get; set; }
|
||||
public string? Zip { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchLinkedWorkOrderDTO
|
||||
{
|
||||
public int WorkOrderId { get; set; }
|
||||
public string? InternalWONumber { get; set; }
|
||||
public string? Title { get; set; }
|
||||
public string? Priority { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public string? LocationName { get; set; }
|
||||
public string? Trade { get; set; }
|
||||
public string? SubTrade { get; set; }
|
||||
public string? Problem { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchChecklistDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? ItemText { get; set; }
|
||||
public bool IsCompleted { get; set; }
|
||||
public string? CompletedBy { get; set; }
|
||||
public DateTime? CompletedAt { get; set; }
|
||||
public int SortOrder { get; set; }
|
||||
public int? WorkOrderId { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchSignoffDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? SignoffType { get; set; }
|
||||
public string? Name { get; set; }
|
||||
public string? Signature { get; set; }
|
||||
public string? SignatureMethod { get; set; }
|
||||
public DateTime? SignedAt { get; set; }
|
||||
}
|
||||
|
||||
public class DispatchCommentDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? Commenttext { get; set; }
|
||||
public string? Commenter { get; set; }
|
||||
public string? CommentType { get; set; }
|
||||
public string? RecordType { get; set; }
|
||||
public DateTime? CreatedDate { get; set; }
|
||||
public string? UserId { get; set; }
|
||||
public string UserName { get; set; } = "";
|
||||
}
|
||||
|
||||
public class DispatchUpliftRequestDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public decimal? CurrentNTE { get; set; }
|
||||
public decimal RequestedNTE { get; set; }
|
||||
public decimal Delta { get; set; }
|
||||
public string? VendorReason { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public int RequiredTier { get; set; }
|
||||
public string? RequestedByVendorName { get; set; }
|
||||
public DateTime? RequestedAt { get; set; }
|
||||
public DateTime? DecidedAt { get; set; }
|
||||
public string? DecisionNote { get; set; }
|
||||
public string DecidedByName { get; set; } = "";
|
||||
}
|
||||
|
||||
public class DispatchAuditLogDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? Action { get; set; }
|
||||
public string? FieldName { get; set; }
|
||||
public string? OldValue { get; set; }
|
||||
public string? NewValue { get; set; }
|
||||
public DateTime? CreatedAt { get; set; }
|
||||
public string? UserId { get; set; }
|
||||
public string UserName { get; set; } = "";
|
||||
}
|
||||
|
||||
public class DispatchDetailDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? DispatchNumber { get; set; }
|
||||
public string? PONumber { get; set; }
|
||||
public decimal? NTEAmount { get; set; }
|
||||
public string? Description { get; set; }
|
||||
public string? Status { get; set; }
|
||||
public DateTime? ScheduledDate { get; set; }
|
||||
public DateTime? CompletedDate { get; set; }
|
||||
public DateTime? DispatchedAt { get; set; }
|
||||
public DateTime? AcknowledgedAt { get; set; }
|
||||
public DateTime? VerifiedAt { get; set; }
|
||||
public string? VerifiedBy { get; set; }
|
||||
public bool EmailSent { get; set; }
|
||||
public int? WorkOrderId { get; set; }
|
||||
public DispatchDetailVendorDTO? Vendor { get; set; }
|
||||
public DispatchPrimaryLocationDTO? PrimaryLocation { get; set; }
|
||||
public IReadOnlyList<DispatchLinkedWorkOrderDTO> WorkOrders { get; set; } = Array.Empty<DispatchLinkedWorkOrderDTO>();
|
||||
public IReadOnlyList<DispatchChecklistDTO> Checklist { get; set; } = Array.Empty<DispatchChecklistDTO>();
|
||||
public IReadOnlyList<DispatchSignoffDTO> Signoffs { get; set; } = Array.Empty<DispatchSignoffDTO>();
|
||||
public IReadOnlyList<DispatchCommentDTO> Comments { get; set; } = Array.Empty<DispatchCommentDTO>();
|
||||
public IReadOnlyList<DispatchUpliftRequestDTO> UpliftRequests { get; set; } = Array.Empty<DispatchUpliftRequestDTO>();
|
||||
public IReadOnlyList<DispatchAuditLogDTO> AuditLog { get; set; } = Array.Empty<DispatchAuditLogDTO>();
|
||||
}
|
||||
}
|
||||
8
SeaHaven.DataServices/Dto/SettingsReadModels.cs
Normal file
8
SeaHaven.DataServices/Dto/SettingsReadModels.cs
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
namespace SeaHaven.DataServices.Dto
|
||||
{
|
||||
public class SettingsCategoryItemDTO
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string? Name { get; set; }
|
||||
}
|
||||
}
|
||||
21
SeaHaven.DataServices/Dto/UserReadModels.cs
Normal file
21
SeaHaven.DataServices/Dto/UserReadModels.cs
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
namespace SeaHaven.DataServices.Dto
|
||||
{
|
||||
public sealed class UserListRowData
|
||||
{
|
||||
public required string Id { get; init; }
|
||||
public string? RoleName { get; init; }
|
||||
public string? Email { get; init; }
|
||||
public string? Name { get; init; }
|
||||
public DateTime? CreatedDate { get; init; }
|
||||
public string? Status { get; init; }
|
||||
}
|
||||
|
||||
public sealed class UserProfileData
|
||||
{
|
||||
public required string Id { get; init; }
|
||||
public string? FirstName { get; init; }
|
||||
public string? Email { get; init; }
|
||||
public string? Contact { get; init; }
|
||||
public DateTime? CreatedDate { get; init; }
|
||||
}
|
||||
}
|
||||
85
SeaHaven.DataServices/Implementation/CalendarDataService.cs
Normal file
85
SeaHaven.DataServices/Implementation/CalendarDataService.cs
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -71,5 +71,32 @@ namespace SeaHaven.DataServices.Implementation
|
|||
{
|
||||
return await _context.Comments.AnyAsync(c => c.Id == id);
|
||||
}
|
||||
|
||||
public async Task StageAsync(Comments comment, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.Comments.AddAsync(comment, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<PortalCommentData>> GetVendorViewableForDispatchAsync(int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await (from c in _context.Comments
|
||||
where c.DispatchId == dispatchId
|
||||
&& c.CommentType != "internal"
|
||||
&& (c.IsDeleted == null || c.IsDeleted == false)
|
||||
join u in _context.Users on c.UserId equals u.Id into users
|
||||
from u in users.DefaultIfEmpty()
|
||||
orderby c.CreatedDate
|
||||
select new PortalCommentData
|
||||
{
|
||||
Id = c.Id,
|
||||
Commenttext = c.Commenttext,
|
||||
Commenter = c.Commenter,
|
||||
CommentType = c.CommentType,
|
||||
CreatedDate = c.CreatedDate,
|
||||
UserId = c.UserId,
|
||||
UserFirstName = u != null ? u.FirstName : null,
|
||||
UserLastName = u != null ? u.LastName : null
|
||||
}).ToListAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
81
SeaHaven.DataServices/Implementation/CommonDataService.cs
Normal file
81
SeaHaven.DataServices/Implementation/CommonDataService.cs
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class CommonDataService : ICommonDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public CommonDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<(IEnumerable<ApplicationUser> Items, int TotalCount)> GetUsersPagedAsync(int page, int pageSize, string search, CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.Users
|
||||
.Where(w => (w.FirstName ?? "").ToLower().Contains((search ?? "").ToLower()))
|
||||
.OrderByDescending(d => d.Id);
|
||||
|
||||
var totalCount = await query.CountAsync(cancellationToken);
|
||||
|
||||
var paginatedUsers = await query
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.AsNoTracking()
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return (paginatedUsers, totalCount);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<string?>> GetRoleNamesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Roles
|
||||
.AsNoTracking()
|
||||
.Select(s => s.Name)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Locations>> GetSiteNamesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Locations
|
||||
.AsNoTracking()
|
||||
.Select(n => new Locations
|
||||
{
|
||||
Id = n.Id,
|
||||
Name = n.Name,
|
||||
Title = n.Title
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Contacts>> GetContactsAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Contacts
|
||||
.AsNoTracking()
|
||||
.Select(n => new Contacts
|
||||
{
|
||||
Id = n.Id,
|
||||
FirstName = n.FirstName,
|
||||
LastName = n.LastName,
|
||||
Email = n.Email,
|
||||
PhoneNumber = n.PhoneNumber
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Category>> GetCategoriesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Categories
|
||||
.AsNoTracking()
|
||||
.Select(s => new Category
|
||||
{
|
||||
Id = s.Id,
|
||||
Name = s.Name
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
34
SeaHaven.DataServices/Implementation/DashboardDataService.cs
Normal file
34
SeaHaven.DataServices/Implementation/DashboardDataService.cs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class DashboardDataService : IDashboardDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public DashboardDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<DashboardCounts> GetWorkOrderCountsAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.workOrders.Where(w => w.istemplate != true);
|
||||
|
||||
var total = await query.CountAsync(cancellationToken);
|
||||
var open = await query.CountAsync(w => w.Status == "Open" || w.Status == "In Progress" || w.Status == "On Hold", cancellationToken);
|
||||
var notDispatched = await query.CountAsync(w => (w.Status == "Open") && (w.AssignTo == null || w.AssignTo == ""), cancellationToken);
|
||||
var completed = await query.CountAsync(w => w.Status == "Done", cancellationToken);
|
||||
|
||||
return new DashboardCounts
|
||||
{
|
||||
Total = total,
|
||||
Open = open,
|
||||
NotDispatched = notDispatched,
|
||||
Completed = completed
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Dto;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.DataServices.Models;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
|
|
@ -25,6 +27,14 @@ namespace SeaHaven.DataServices.Implementation
|
|||
.FirstOrDefaultAsync(d => d.Id == id);
|
||||
}
|
||||
|
||||
public async Task<Dispatch?> GetByIdWithVendorAndWorkOrderAsync(int id)
|
||||
{
|
||||
return await _context.Dispatches
|
||||
.Include(dispatch => dispatch.Vendor)
|
||||
.Include(dispatch => dispatch.WorkOrder)
|
||||
.FirstOrDefaultAsync(dispatch => dispatch.Id == id);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Dispatch>> GetAllAsync()
|
||||
{
|
||||
return await _context.Dispatches.ToListAsync();
|
||||
|
|
@ -45,9 +55,9 @@ namespace SeaHaven.DataServices.Implementation
|
|||
}
|
||||
|
||||
public async Task<(IEnumerable<Dispatch> Items, int TotalCount)> GetPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
string? search = null,
|
||||
int page,
|
||||
int pageSize,
|
||||
string? search = null,
|
||||
string? status = null)
|
||||
{
|
||||
var query = _context.Dispatches.AsQueryable();
|
||||
|
|
@ -216,5 +226,576 @@ namespace SeaHaven.DataServices.Implementation
|
|||
await _context.DispatchWorkOrders.AddAsync(dispatchWorkOrder);
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public async Task<DispatchListResult> GetListAsync(DispatchListQuery query, CancellationToken cancellationToken)
|
||||
{
|
||||
var q = _context.Dispatches
|
||||
.Include(d => d.Vendor)
|
||||
.Include(d => d.WorkOrder).ThenInclude(w => w!.Locations)
|
||||
.AsNoTracking()
|
||||
.Where(d => d.IsDeleted == null || d.IsDeleted == false);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(query.Search))
|
||||
{
|
||||
var s = query.Search.ToLower();
|
||||
q = q.Where(d =>
|
||||
(d.DispatchNumber ?? "").ToLower().Contains(s) ||
|
||||
(d.PONumber ?? "").ToLower().Contains(s) ||
|
||||
(d.Vendor != null && (d.Vendor.CompanyName ?? "").ToLower().Contains(s)) ||
|
||||
(d.WorkOrder != null && (d.WorkOrder.InternalWONumber ?? "").ToLower().Contains(s)) ||
|
||||
(d.WorkOrder != null && (d.WorkOrder.WorkerOrderTitle ?? "").ToLower().Contains(s)) ||
|
||||
(d.WorkOrder != null && d.WorkOrder.Locations != null && (d.WorkOrder.Locations.Name ?? "").ToLower().Contains(s))
|
||||
);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(query.Status))
|
||||
q = q.Where(d => d.Status == query.Status);
|
||||
|
||||
if (query.VendorId.HasValue)
|
||||
q = q.Where(d => d.VendorId == query.VendorId.Value);
|
||||
|
||||
if (query.DateFrom.HasValue)
|
||||
q = q.Where(d => d.DispatchedAt >= query.DateFrom.Value);
|
||||
|
||||
if (query.DateTo.HasValue)
|
||||
{
|
||||
var end = query.DateTo.Value.Date.AddDays(1);
|
||||
q = q.Where(d => d.DispatchedAt < end);
|
||||
}
|
||||
|
||||
var total = await q.CountAsync(cancellationToken);
|
||||
|
||||
var dir = (query.SortDir ?? "desc").ToLowerInvariant() == "asc";
|
||||
switch ((query.SortBy ?? "").ToLowerInvariant())
|
||||
{
|
||||
case "ponumber":
|
||||
q = dir ? q.OrderBy(d => d.PONumber) : q.OrderByDescending(d => d.PONumber);
|
||||
break;
|
||||
case "dispatchnumber":
|
||||
q = dir ? q.OrderBy(d => d.DispatchNumber) : q.OrderByDescending(d => d.DispatchNumber);
|
||||
break;
|
||||
case "vendor":
|
||||
q = dir ? q.OrderBy(d => d.Vendor!.CompanyName) : q.OrderByDescending(d => d.Vendor!.CompanyName);
|
||||
break;
|
||||
case "nte":
|
||||
case "nteamount":
|
||||
q = dir ? q.OrderBy(d => d.NTEAmount) : q.OrderByDescending(d => d.NTEAmount);
|
||||
break;
|
||||
case "status":
|
||||
q = dir ? q.OrderBy(d => d.Status) : q.OrderByDescending(d => d.Status);
|
||||
break;
|
||||
case "scheduleddate":
|
||||
q = dir ? q.OrderBy(d => d.ScheduledDate) : q.OrderByDescending(d => d.ScheduledDate);
|
||||
break;
|
||||
case "completeddate":
|
||||
q = dir ? q.OrderBy(d => d.CompletedDate) : q.OrderByDescending(d => d.CompletedDate);
|
||||
break;
|
||||
default:
|
||||
q = dir ? q.OrderBy(d => d.DispatchedAt) : q.OrderByDescending(d => d.DispatchedAt);
|
||||
break;
|
||||
}
|
||||
|
||||
var rows = await q
|
||||
.Skip((Math.Max(query.Page, 1) - 1) * query.PageSize)
|
||||
.Take(query.PageSize)
|
||||
.Select(d => new DispatchListItemDTO
|
||||
{
|
||||
Id = d.Id,
|
||||
DispatchNumber = d.DispatchNumber,
|
||||
PONumber = d.PONumber,
|
||||
NTEAmount = d.NTEAmount,
|
||||
Status = d.Status,
|
||||
DispatchedAt = d.DispatchedAt,
|
||||
ScheduledDate = d.ScheduledDate,
|
||||
CompletedDate = d.CompletedDate,
|
||||
AcknowledgedAt = d.AcknowledgedAt,
|
||||
VerifiedAt = d.VerifiedAt,
|
||||
VendorId = d.VendorId,
|
||||
VendorName = d.Vendor != null ? d.Vendor.CompanyName : null,
|
||||
WorkOrderId = d.WorkOrderId,
|
||||
PrimaryWOInternalNumber = d.WorkOrder != null ? d.WorkOrder.InternalWONumber : null,
|
||||
PrimaryWOTitle = d.WorkOrder != null ? d.WorkOrder.WorkerOrderTitle : null,
|
||||
LocationName = d.WorkOrder != null && d.WorkOrder.Locations != null ? d.WorkOrder.Locations.Name : null,
|
||||
WorkOrderCount = _context.DispatchWorkOrders.Count(dwo => dwo.DispatchId == d.Id),
|
||||
PendingUpliftCount = _context.DispatchUpliftRequests.Count(u => u.DispatchId == d.Id && u.Status == "Pending" && (u.IsDeleted == null || u.IsDeleted == false))
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return new DispatchListResult
|
||||
{
|
||||
Items = rows,
|
||||
Total = total,
|
||||
Page = query.Page,
|
||||
PageSize = query.PageSize
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<DispatchDetailDTO?> GetDetailAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var dispatch = await _context.Dispatches
|
||||
.Include(d => d.Vendor)
|
||||
.Include(d => d.WorkOrder).ThenInclude(w => w!.Locations)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(d => d.Id == id, cancellationToken);
|
||||
if (dispatch == null) return null;
|
||||
|
||||
var linked = await _context.DispatchWorkOrders
|
||||
.AsNoTracking()
|
||||
.Where(dwo => dwo.DispatchId == id)
|
||||
.Select(dwo => new DispatchLinkedWorkOrderDTO
|
||||
{
|
||||
WorkOrderId = dwo.WorkOrderId,
|
||||
InternalWONumber = dwo.WorkOrder != null ? dwo.WorkOrder.InternalWONumber : null,
|
||||
Title = dwo.WorkOrder != null ? dwo.WorkOrder.WorkerOrderTitle : null,
|
||||
Priority = dwo.WorkOrder != null ? dwo.WorkOrder.Priority : null,
|
||||
Status = dwo.WorkOrder != null ? dwo.WorkOrder.Status : null,
|
||||
LocationName = dwo.WorkOrder != null && dwo.WorkOrder.Locations != null ? dwo.WorkOrder.Locations.Name : null,
|
||||
Trade = dwo.WorkOrder != null ? dwo.WorkOrder.Trade : null,
|
||||
SubTrade = dwo.WorkOrder != null ? dwo.WorkOrder.SubTrade : null,
|
||||
Problem = dwo.WorkOrder != null ? dwo.WorkOrder.Problem : null
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var linkedWOs = linked;
|
||||
if (linkedWOs.Count == 0 && dispatch.WorkOrderId.HasValue)
|
||||
{
|
||||
var wo = await _context.workOrders
|
||||
.Include(w => w.Locations)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(w => w.Id == dispatch.WorkOrderId.Value, cancellationToken);
|
||||
if (wo != null)
|
||||
{
|
||||
linkedWOs = new List<DispatchLinkedWorkOrderDTO>
|
||||
{
|
||||
new DispatchLinkedWorkOrderDTO
|
||||
{
|
||||
WorkOrderId = wo.Id,
|
||||
InternalWONumber = wo.InternalWONumber,
|
||||
Title = wo.WorkerOrderTitle,
|
||||
Priority = wo.Priority,
|
||||
Status = wo.Status,
|
||||
LocationName = wo.Locations != null ? wo.Locations.Name : null,
|
||||
Trade = wo.Trade,
|
||||
SubTrade = wo.SubTrade,
|
||||
Problem = wo.Problem
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
var checklist = await _context.DispatchChecklistItems
|
||||
.AsNoTracking()
|
||||
.Where(c => c.DispatchId == id && (c.IsDeleted == null || c.IsDeleted == false))
|
||||
.OrderBy(c => c.SortOrder)
|
||||
.Select(c => new DispatchChecklistDTO
|
||||
{
|
||||
Id = c.Id,
|
||||
ItemText = c.ItemText,
|
||||
IsCompleted = c.IsCompleted,
|
||||
CompletedBy = c.CompletedBy,
|
||||
CompletedAt = c.CompletedAt,
|
||||
SortOrder = c.SortOrder,
|
||||
WorkOrderId = c.WorkOrderId
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var signoffs = await _context.DispatchSignoffs
|
||||
.AsNoTracking()
|
||||
.Where(s => s.DispatchId == id && (s.IsDeleted == null || s.IsDeleted == false))
|
||||
.Select(s => new DispatchSignoffDTO
|
||||
{
|
||||
Id = s.Id,
|
||||
SignoffType = s.SignoffType,
|
||||
Name = s.Name,
|
||||
Signature = s.Signature,
|
||||
SignatureMethod = s.SignatureMethod,
|
||||
SignedAt = s.SignedAt
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var rawComments = await (from c in _context.Comments
|
||||
where c.DispatchId == id && (c.IsDeleted == null || c.IsDeleted == false)
|
||||
join u in _context.Users on c.UserId equals u.Id into users
|
||||
from u in users.DefaultIfEmpty()
|
||||
orderby c.CreatedDate
|
||||
select new
|
||||
{
|
||||
c.Id,
|
||||
c.Commenttext,
|
||||
c.Commenter,
|
||||
c.CommentType,
|
||||
c.RecordType,
|
||||
c.CreatedDate,
|
||||
c.UserId,
|
||||
UserFirstName = u != null ? u.FirstName : null,
|
||||
UserLastName = u != null ? u.LastName : null
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var comments = rawComments.Select(c => new DispatchCommentDTO
|
||||
{
|
||||
Id = c.Id,
|
||||
Commenttext = c.Commenttext,
|
||||
Commenter = c.Commenter,
|
||||
CommentType = c.CommentType,
|
||||
RecordType = c.RecordType,
|
||||
CreatedDate = c.CreatedDate,
|
||||
UserId = c.UserId,
|
||||
UserName = string.Join(" ", new[] { c.UserFirstName, c.UserLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim()
|
||||
}).ToList();
|
||||
|
||||
var rawUplifts = await (from u in _context.DispatchUpliftRequests
|
||||
where u.DispatchId == id && (u.IsDeleted == null || u.IsDeleted == false)
|
||||
join dec in _context.Users on u.DecidedByUserId equals dec.Id into decs
|
||||
from dec in decs.DefaultIfEmpty()
|
||||
orderby u.CreatedDate descending
|
||||
select new
|
||||
{
|
||||
u.Id,
|
||||
u.CurrentNTE,
|
||||
u.RequestedNTE,
|
||||
u.VendorReason,
|
||||
u.Status,
|
||||
u.RequiredTier,
|
||||
u.RequestedByVendorName,
|
||||
RequestedAt = u.CreatedDate,
|
||||
u.DecidedAt,
|
||||
u.DecisionNote,
|
||||
DecidedByFirstName = dec != null ? dec.FirstName : null,
|
||||
DecidedByLastName = dec != null ? dec.LastName : null
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var upliftRequests = rawUplifts.Select(u => new DispatchUpliftRequestDTO
|
||||
{
|
||||
Id = u.Id,
|
||||
CurrentNTE = u.CurrentNTE,
|
||||
RequestedNTE = u.RequestedNTE,
|
||||
Delta = u.RequestedNTE - (u.CurrentNTE ?? 0m),
|
||||
VendorReason = u.VendorReason,
|
||||
Status = u.Status,
|
||||
RequiredTier = u.RequiredTier,
|
||||
RequestedByVendorName = u.RequestedByVendorName,
|
||||
RequestedAt = u.RequestedAt,
|
||||
DecidedAt = u.DecidedAt,
|
||||
DecisionNote = u.DecisionNote,
|
||||
DecidedByName = string.Join(" ", new[] { u.DecidedByFirstName, u.DecidedByLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim()
|
||||
}).ToList();
|
||||
|
||||
var dispatchNumber = dispatch.DispatchNumber ?? "";
|
||||
var workOrderIds = linkedWOs.Select(l => l.WorkOrderId).Where(wid => wid > 0).ToList();
|
||||
|
||||
var rawAudit = await (from a in _context.WorkOrderAuditLogs
|
||||
where workOrderIds.Contains(a.WorkOrderId)
|
||||
&& a.FieldName != null
|
||||
&& a.FieldName.Contains(dispatchNumber)
|
||||
join u in _context.Users on a.UserId equals u.Id into users
|
||||
from u in users.DefaultIfEmpty()
|
||||
orderby a.CreatedAt descending
|
||||
select new
|
||||
{
|
||||
a.Id,
|
||||
a.Action,
|
||||
a.FieldName,
|
||||
a.OldValue,
|
||||
a.NewValue,
|
||||
a.CreatedAt,
|
||||
a.UserId,
|
||||
UserFirstName = u != null ? u.FirstName : null,
|
||||
UserLastName = u != null ? u.LastName : null
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var auditLog = rawAudit.Select(a => new DispatchAuditLogDTO
|
||||
{
|
||||
Id = a.Id,
|
||||
Action = a.Action,
|
||||
FieldName = a.FieldName,
|
||||
OldValue = a.OldValue,
|
||||
NewValue = a.NewValue,
|
||||
CreatedAt = a.CreatedAt,
|
||||
UserId = a.UserId,
|
||||
UserName = string.Join(" ", new[] { a.UserFirstName, a.UserLastName }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))).Trim()
|
||||
}).ToList();
|
||||
|
||||
return new DispatchDetailDTO
|
||||
{
|
||||
Id = dispatch.Id,
|
||||
DispatchNumber = dispatch.DispatchNumber,
|
||||
PONumber = dispatch.PONumber,
|
||||
NTEAmount = dispatch.NTEAmount,
|
||||
Description = dispatch.Description,
|
||||
Status = dispatch.Status,
|
||||
ScheduledDate = dispatch.ScheduledDate,
|
||||
CompletedDate = dispatch.CompletedDate,
|
||||
DispatchedAt = dispatch.DispatchedAt,
|
||||
AcknowledgedAt = dispatch.AcknowledgedAt,
|
||||
VerifiedAt = dispatch.VerifiedAt,
|
||||
VerifiedBy = dispatch.VerifiedBy,
|
||||
EmailSent = dispatch.EmailSent,
|
||||
WorkOrderId = dispatch.WorkOrderId,
|
||||
Vendor = dispatch.Vendor == null ? null : new DispatchDetailVendorDTO
|
||||
{
|
||||
Id = dispatch.Vendor.Id,
|
||||
CompanyName = dispatch.Vendor.CompanyName,
|
||||
ContactName = dispatch.Vendor.ContactName,
|
||||
Email = dispatch.Vendor.Email,
|
||||
Phone = dispatch.Vendor.Phone,
|
||||
Address = dispatch.Vendor.Address,
|
||||
City = dispatch.Vendor.City,
|
||||
State = dispatch.Vendor.State,
|
||||
Zip = dispatch.Vendor.Zip,
|
||||
TradeSpecialties = dispatch.Vendor.TradeSpecialties
|
||||
},
|
||||
PrimaryLocation = dispatch.WorkOrder?.Locations == null ? null : new DispatchPrimaryLocationDTO
|
||||
{
|
||||
Id = dispatch.WorkOrder.Locations.Id,
|
||||
Name = dispatch.WorkOrder.Locations.Name,
|
||||
Address1 = dispatch.WorkOrder.Locations.Address1,
|
||||
City = dispatch.WorkOrder.Locations.City,
|
||||
State = dispatch.WorkOrder.Locations.State,
|
||||
Zip = dispatch.WorkOrder.Locations.Zip
|
||||
},
|
||||
WorkOrders = linkedWOs,
|
||||
Checklist = checklist,
|
||||
Signoffs = signoffs,
|
||||
Comments = comments,
|
||||
UpliftRequests = upliftRequests,
|
||||
AuditLog = auditLog
|
||||
};
|
||||
}
|
||||
|
||||
public async Task StageSignoffAsync(
|
||||
DispatchSignoff signoff, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.DispatchSignoffs.AddAsync(signoff, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<VendorDispatchSummaryData>> GetVendorDispatchSummariesAsync(
|
||||
int vendorId, string? status, CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.Dispatches
|
||||
.AsNoTracking()
|
||||
.Where(dispatch => dispatch.VendorId == vendorId
|
||||
&& (dispatch.IsDeleted == null || dispatch.IsDeleted == false));
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(status))
|
||||
query = query.Where(dispatch => dispatch.Status == status);
|
||||
|
||||
return await query
|
||||
.OrderByDescending(dispatch => dispatch.DispatchedAt ?? dispatch.CreatedDate)
|
||||
.Select(dispatch => new VendorDispatchSummaryData
|
||||
{
|
||||
Id = dispatch.Id,
|
||||
DispatchNumber = dispatch.DispatchNumber,
|
||||
PONumber = dispatch.PONumber,
|
||||
Status = dispatch.Status,
|
||||
NTEAmount = dispatch.NTEAmount,
|
||||
ScheduledDate = dispatch.ScheduledDate,
|
||||
CompletedDate = dispatch.CompletedDate,
|
||||
DispatchedAt = dispatch.DispatchedAt,
|
||||
AcknowledgedAt = dispatch.AcknowledgedAt,
|
||||
WorkOrderTitle = dispatch.WorkOrder != null
|
||||
? dispatch.WorkOrder.WorkerOrderTitle
|
||||
: null,
|
||||
InternalWONumber = dispatch.WorkOrder != null
|
||||
? dispatch.WorkOrder.InternalWONumber
|
||||
: null,
|
||||
LocationName = dispatch.WorkOrder != null && dispatch.WorkOrder.Locations != null
|
||||
? dispatch.WorkOrder.Locations.Name
|
||||
: null,
|
||||
LocationCity = dispatch.WorkOrder != null && dispatch.WorkOrder.Locations != null
|
||||
? dispatch.WorkOrder.Locations.City
|
||||
: null,
|
||||
LocationState = dispatch.WorkOrder != null && dispatch.WorkOrder.Locations != null
|
||||
? dispatch.WorkOrder.Locations.State
|
||||
: null
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<Dispatch?> GetVendorDispatchDetailAsync(
|
||||
int id, int vendorId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Dispatches
|
||||
.Include(dispatch => dispatch.WorkOrder)
|
||||
.ThenInclude(workOrder => workOrder!.Locations)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(dispatch => dispatch.Id == id
|
||||
&& dispatch.VendorId == vendorId
|
||||
&& (dispatch.IsDeleted == null || dispatch.IsDeleted == false),
|
||||
cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<Dispatch?> GetVendorDispatchForMutationAsync(
|
||||
int id, int vendorId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Dispatches
|
||||
.Include(dispatch => dispatch.WorkOrder)
|
||||
.ThenInclude(workOrder => workOrder!.Locations)
|
||||
.FirstOrDefaultAsync(dispatch => dispatch.Id == id
|
||||
&& dispatch.VendorId == vendorId
|
||||
&& (dispatch.IsDeleted == null || dispatch.IsDeleted == false),
|
||||
cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<PortalChecklistItemData>> GetPortalChecklistAsync(
|
||||
int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DispatchChecklistItems
|
||||
.AsNoTracking()
|
||||
.Where(item => item.DispatchId == dispatchId
|
||||
&& (item.IsDeleted == null || item.IsDeleted == false))
|
||||
.OrderBy(item => item.SortOrder)
|
||||
.Select(item => new PortalChecklistItemData
|
||||
{
|
||||
Id = item.Id,
|
||||
ItemText = item.ItemText,
|
||||
IsCompleted = item.IsCompleted,
|
||||
CompletedBy = item.CompletedBy,
|
||||
CompletedAt = item.CompletedAt
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<PortalSignoffData>> GetPortalSignoffsAsync(
|
||||
int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DispatchSignoffs
|
||||
.AsNoTracking()
|
||||
.Where(signoff => signoff.DispatchId == dispatchId
|
||||
&& (signoff.IsDeleted == null || signoff.IsDeleted == false))
|
||||
.Select(signoff => new PortalSignoffData
|
||||
{
|
||||
Id = signoff.Id,
|
||||
SignoffType = signoff.SignoffType,
|
||||
Name = signoff.Name,
|
||||
SignatureMethod = signoff.SignatureMethod,
|
||||
SignedAt = signoff.SignedAt
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<DispatchChecklistItem?> GetChecklistItemForDispatchAsync(
|
||||
int itemId, int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DispatchChecklistItems
|
||||
.FirstOrDefaultAsync(
|
||||
item => item.Id == itemId && item.DispatchId == dispatchId,
|
||||
cancellationToken);
|
||||
}
|
||||
|
||||
public async Task StageAuditLogAsync(
|
||||
WorkOrderAuditLog log, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.WorkOrderAuditLogs.AddAsync(log, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<string?> GetDispatchDispatcherUserIdAsync(
|
||||
int workOrderId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.WorkOrderAuditLogs
|
||||
.AsNoTracking()
|
||||
.Where(audit => audit.WorkOrderId == workOrderId
|
||||
&& audit.Action == "dispatch"
|
||||
&& audit.UserId != null
|
||||
&& audit.UserId != "")
|
||||
.OrderByDescending(audit => audit.CreatedAt)
|
||||
.Select(audit => audit.UserId)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task SaveChangesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<DispatchDetailReadModel?> GetDispatchDetailAsync(int id)
|
||||
{
|
||||
return await _context.Dispatches
|
||||
.AsNoTracking()
|
||||
.Where(dispatch => dispatch.Id == id)
|
||||
.Select(dispatch => new DispatchDetailReadModel
|
||||
{
|
||||
Id = dispatch.Id,
|
||||
DispatchNumber = dispatch.DispatchNumber,
|
||||
PONumber = dispatch.PONumber,
|
||||
NTEAmount = dispatch.NTEAmount,
|
||||
Description = dispatch.Description,
|
||||
Status = dispatch.Status,
|
||||
ScheduledDate = dispatch.ScheduledDate,
|
||||
CompletedDate = dispatch.CompletedDate,
|
||||
DispatchedAt = dispatch.DispatchedAt,
|
||||
EmailSent = dispatch.EmailSent,
|
||||
WorkOrderId = dispatch.WorkOrderId,
|
||||
AcknowledgedAt = dispatch.AcknowledgedAt,
|
||||
VerifiedBy = dispatch.VerifiedBy,
|
||||
VerifiedAt = dispatch.VerifiedAt,
|
||||
WoNumber = dispatch.WorkOrder != null
|
||||
? dispatch.WorkOrder.InternalWONumber
|
||||
: "",
|
||||
WoTitle = dispatch.WorkOrder != null
|
||||
? dispatch.WorkOrder.WorkerOrderTitle
|
||||
: "",
|
||||
VendorName = dispatch.Vendor != null ? dispatch.Vendor.CompanyName : "",
|
||||
VendorEmail = dispatch.Vendor != null ? dispatch.Vendor.Email : "",
|
||||
VendorId = dispatch.VendorId,
|
||||
WorkOrders = _context.DispatchWorkOrders
|
||||
.Where(link => link.DispatchId == dispatch.Id)
|
||||
.Select(link => new DispatchWorkOrderReadModel
|
||||
{
|
||||
WorkOrderId = link.WorkOrderId,
|
||||
WoNumber = link.WorkOrder != null
|
||||
? link.WorkOrder.InternalWONumber
|
||||
: "",
|
||||
WoTitle = link.WorkOrder != null
|
||||
? link.WorkOrder.WorkerOrderTitle
|
||||
: ""
|
||||
}).ToList(),
|
||||
ChecklistItems = _context.DispatchChecklistItems
|
||||
.Where(item => item.DispatchId == dispatch.Id)
|
||||
.OrderBy(item => item.SortOrder)
|
||||
.Select(item => new ChecklistItemReadModel
|
||||
{
|
||||
Id = item.Id,
|
||||
ItemText = item.ItemText,
|
||||
IsCompleted = item.IsCompleted,
|
||||
CompletedBy = item.CompletedBy,
|
||||
CompletedAt = item.CompletedAt,
|
||||
SortOrder = item.SortOrder,
|
||||
WorkOrderId = item.WorkOrderId
|
||||
}).ToList(),
|
||||
Signoffs = _context.DispatchSignoffs
|
||||
.Where(signoff => signoff.DispatchId == dispatch.Id)
|
||||
.Select(signoff => new SignoffReadModel
|
||||
{
|
||||
Id = signoff.Id,
|
||||
SignoffType = signoff.SignoffType,
|
||||
Name = signoff.Name,
|
||||
Signature = signoff.Signature,
|
||||
SignatureMethod = signoff.SignatureMethod,
|
||||
SignedAt = signoff.SignedAt
|
||||
}).ToList(),
|
||||
Comments = _context.Comments
|
||||
.Where(comment => comment.DispatchId == dispatch.Id)
|
||||
.OrderBy(comment => comment.CreatedDate)
|
||||
.Select(comment => new DispatchCommentReadModel
|
||||
{
|
||||
Id = comment.Id,
|
||||
CreatedDate = comment.CreatedDate,
|
||||
Commenttext = comment.Commenttext,
|
||||
Commenter = comment.Commenter,
|
||||
CommentType = comment.CommentType,
|
||||
UserName = comment.ApplicationUser != null
|
||||
? comment.ApplicationUser.FirstName + " "
|
||||
+ comment.ApplicationUser.LastName
|
||||
: ""
|
||||
}).ToList()
|
||||
})
|
||||
.FirstOrDefaultAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,71 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class DropdownOptionsDataService : IDropdownOptionsDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public DropdownOptionsDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<DropdownOption>> GetAllActiveAsync(string? category, CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.DropdownOptions.Where(d => d.IsActive);
|
||||
if (!string.IsNullOrWhiteSpace(category))
|
||||
query = query.Where(d => d.Category == category);
|
||||
|
||||
return await query
|
||||
.AsNoTracking()
|
||||
.OrderBy(d => d.Category).ThenBy(d => d.SortOrder).ThenBy(d => d.Value)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<DropdownOption>> GetByCategoryAsync(string category, string? parent, CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.DropdownOptions.Where(d => d.IsActive && d.Category == category);
|
||||
if (!string.IsNullOrWhiteSpace(parent))
|
||||
query = query.Where(d => d.ParentValue == parent);
|
||||
|
||||
return await query
|
||||
.AsNoTracking()
|
||||
.OrderBy(d => d.SortOrder).ThenBy(d => d.Value)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> ExistsAsync(string category, string value, string? parentValue, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DropdownOptions
|
||||
.AsNoTracking()
|
||||
.AnyAsync(d => d.Category == category && d.Value == value && d.ParentValue == parentValue, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<DropdownOption> AddAsync(DropdownOption option, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.DropdownOptions.AddAsync(option, cancellationToken);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return option;
|
||||
}
|
||||
|
||||
public async Task<DropdownOption?> GetByIdAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DropdownOptions.FindAsync(new object[] { id }, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task UpdateAsync(DropdownOption option, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.DropdownOptions.Update(option);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task RemoveAsync(DropdownOption option, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.DropdownOptions.Remove(option);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -120,5 +120,138 @@ namespace SeaHaven.DataServices.Implementation
|
|||
{
|
||||
return await _context.FollowUps.CountAsync();
|
||||
}
|
||||
|
||||
public async Task<List<FollowUps>> GetListPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
string? search,
|
||||
string? status,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
search ??= "";
|
||||
status = string.IsNullOrWhiteSpace(status) ? "Open" : status;
|
||||
|
||||
var query = _context.FollowUps
|
||||
.Include(x => x.Employee)
|
||||
.Include(x => x.Account)
|
||||
.Include(x => x.Location)
|
||||
.AsNoTracking()
|
||||
.Where(x => x.Status == status);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(search))
|
||||
{
|
||||
var s = search.ToLower();
|
||||
query = query.Where(x =>
|
||||
(x.Reason ?? "").ToLower().Contains(s) ||
|
||||
(x.Account != null && (x.Account.Name ?? "").ToLower().Contains(s)) ||
|
||||
(x.Employee != null &&
|
||||
(((x.Employee.FirstName ?? "") + " " + (x.Employee.LastName ?? ""))
|
||||
.ToLower().Contains(s))
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return await query
|
||||
.OrderByDescending(f => f.Id)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<int> GetListTotalAsync(string? search, string? status, CancellationToken cancellationToken)
|
||||
{
|
||||
search ??= "";
|
||||
status = string.IsNullOrWhiteSpace(status) ? "Open" : status;
|
||||
|
||||
var query = _context.FollowUps
|
||||
.AsNoTracking()
|
||||
.Where(x => x.Status == status);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(search))
|
||||
{
|
||||
var s = search.ToLower();
|
||||
query = query.Where(x =>
|
||||
(x.Reason ?? "").ToLower().Contains(s) ||
|
||||
(x.Account != null && (x.Account.Name ?? "").ToLower().Contains(s)) ||
|
||||
(x.Employee != null &&
|
||||
(((x.Employee.FirstName ?? "") + " " + (x.Employee.LastName ?? ""))
|
||||
.ToLower().Contains(s))
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return await query.CountAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<FollowUps?> GetDetailByIdAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.FollowUps
|
||||
.Include(x => x.Employee)
|
||||
.Include(x => x.Account)
|
||||
.Include(x => x.Location)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(f => f.Id == id, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<FollowUps?> GetByIdForUpdateAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.FollowUps.FindAsync(new object[] { id }, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<string> GetUserNameAsync(string? userId, CancellationToken cancellationToken)
|
||||
{
|
||||
if (string.IsNullOrEmpty(userId))
|
||||
return "";
|
||||
|
||||
var u = await _context.Users
|
||||
.AsNoTracking()
|
||||
.Where(x => x.Id == userId)
|
||||
.Select(x => new { x.FirstName, x.LastName, x.UserName })
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
if (u == null)
|
||||
return "";
|
||||
|
||||
var n = ((u.FirstName ?? "") + " " + (u.LastName ?? "")).Trim();
|
||||
return string.IsNullOrWhiteSpace(n) ? (u.UserName ?? "") : n;
|
||||
}
|
||||
|
||||
public async Task<FollowUps> AddAsync(FollowUps followUp, CancellationToken cancellationToken)
|
||||
{
|
||||
followUp.CreatedDate = DateTime.Now;
|
||||
await _context.FollowUps.AddAsync(followUp, cancellationToken);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return followUp;
|
||||
}
|
||||
|
||||
public async Task UpdateAsync(FollowUps followUp, CancellationToken cancellationToken)
|
||||
{
|
||||
followUp.LastModificationTime = DateTime.Now;
|
||||
_context.FollowUps.Update(followUp);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> SetStatusAsync(int id, string status, CancellationToken cancellationToken)
|
||||
{
|
||||
var entity = await _context.FollowUps.FindAsync(new object[] { id }, cancellationToken);
|
||||
if (entity == null)
|
||||
return false;
|
||||
|
||||
entity.Status = status;
|
||||
entity.LastModificationTime = DateTime.Now;
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<bool> RemoveByIdAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var entity = await _context.FollowUps.FindAsync(new object[] { id }, cancellationToken);
|
||||
if (entity == null)
|
||||
return false;
|
||||
|
||||
_context.FollowUps.Remove(entity);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,83 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class ForgetPasswordDataService : IForgetPasswordDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public ForgetPasswordDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task ReplaceCodeAsync(string email, string userId, string code, CancellationToken cancellationToken)
|
||||
{
|
||||
var normalizedEmail = email.ToLower().Trim();
|
||||
|
||||
var existing = await _context.ForgetPasswordCodes
|
||||
.Where(u => u.Email.ToLower().Trim() == normalizedEmail)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
if (existing != null)
|
||||
{
|
||||
_context.ForgetPasswordCodes.Remove(existing);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
var forgetPasswordCode = new ForgetPasswordCode
|
||||
{
|
||||
Email = email,
|
||||
UserId = userId,
|
||||
Code = code
|
||||
};
|
||||
|
||||
_context.ForgetPasswordCodes.Add(forgetPasswordCode);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> CodeExistsAsync(string code, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.ForgetPasswordCodes
|
||||
.AsNoTracking()
|
||||
.Where(u => u.Code == code)
|
||||
.AnyAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> ExistsByEmailAndCodeAsync(string email, string code, CancellationToken cancellationToken)
|
||||
{
|
||||
var normalizedEmail = email.ToLower().Trim();
|
||||
var trimmedCode = code.Trim();
|
||||
|
||||
return await _context.ForgetPasswordCodes
|
||||
.AsNoTracking()
|
||||
.Where(u => u.Email.ToLower().Trim() == normalizedEmail && u.Code == trimmedCode)
|
||||
.AnyAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<ForgetPasswordCode?> GetByEmailAsync(string email, CancellationToken cancellationToken)
|
||||
{
|
||||
var normalizedEmail = email.ToLower().Trim();
|
||||
|
||||
return await _context.ForgetPasswordCodes
|
||||
.Where(u => u.Email.ToLower().Trim() == normalizedEmail)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task RemoveByEmailAsync(string email, CancellationToken cancellationToken)
|
||||
{
|
||||
var normalizedEmail = email.ToLower().Trim();
|
||||
var records = await _context.ForgetPasswordCodes
|
||||
.Where(code => code.Email.ToLower().Trim() == normalizedEmail)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
if (records.Count == 0)
|
||||
return;
|
||||
|
||||
_context.ForgetPasswordCodes.RemoveRange(records);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -37,16 +37,16 @@ namespace SeaHaven.DataServices.Implementation
|
|||
}
|
||||
|
||||
public async Task<(IEnumerable<Locations> Items, int TotalCount)> GetPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
int page,
|
||||
int pageSize,
|
||||
string? search = null)
|
||||
{
|
||||
var query = _context.Locations.AsQueryable();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(search))
|
||||
{
|
||||
query = query.Where(l =>
|
||||
l.Name!.Contains(search) ||
|
||||
query = query.Where(l =>
|
||||
l.Name!.Contains(search) ||
|
||||
l.City!.Contains(search));
|
||||
}
|
||||
|
||||
|
|
@ -113,6 +113,69 @@ namespace SeaHaven.DataServices.Implementation
|
|||
return await _context.Locations.CountAsync();
|
||||
}
|
||||
|
||||
public async Task<(List<Locations> Items, int TotalCount)> GetListPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
string? search,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.Locations.AsNoTracking();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(search))
|
||||
{
|
||||
query = query.Where(l =>
|
||||
l.Name!.Contains(search) ||
|
||||
l.City!.Contains(search));
|
||||
}
|
||||
|
||||
var totalCount = await query.CountAsync(cancellationToken);
|
||||
var items = await query
|
||||
.OrderBy(l => l.Name)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return (items, totalCount);
|
||||
}
|
||||
|
||||
public async Task<Locations?> GetDetailByIdAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Locations
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(l => l.Id == id, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<Locations?> GetByIdForUpdateAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Locations.FindAsync(new object[] { id }, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<Locations> AddAsync(Locations location, CancellationToken cancellationToken)
|
||||
{
|
||||
location.CreatedDate = DateTime.Now;
|
||||
await _context.Locations.AddAsync(location, cancellationToken);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return location;
|
||||
}
|
||||
|
||||
public async Task UpdateAsync(Locations location, CancellationToken cancellationToken)
|
||||
{
|
||||
location.LastModificationTime = DateTime.Now;
|
||||
_context.Locations.Update(location);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> DeleteByIdAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var entity = await _context.Locations.FindAsync(new object[] { id }, cancellationToken);
|
||||
if (entity == null)
|
||||
return false;
|
||||
|
||||
_context.Locations.Remove(entity);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<(IEnumerable<object> Items, int TotalCount)> GetAddressbookPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.DataServices.Models;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
|
|
@ -71,5 +72,108 @@ namespace SeaHaven.DataServices.Implementation
|
|||
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public async Task<(IReadOnlyList<QuoteListItemReadModel> Items, int TotalCount)> GetQuotesPagedAsync(
|
||||
int page, int pageSize, string search, CancellationToken cancellationToken)
|
||||
{
|
||||
var normalizedSearch = search.Trim();
|
||||
var query = _context.Quotes
|
||||
.AsNoTracking()
|
||||
.Where(w => normalizedSearch.Length == 0 ||
|
||||
(w.QuotId != null && w.QuotId.Contains(normalizedSearch)) ||
|
||||
(w.SiteName != null && w.SiteName.Contains(normalizedSearch)) ||
|
||||
(w.WorkOrder != null && w.WorkOrder.WorkerOrderTitle != null &&
|
||||
w.WorkOrder.WorkerOrderTitle.Contains(normalizedSearch)));
|
||||
|
||||
var totalCount = await query.CountAsync(cancellationToken);
|
||||
var data = await query
|
||||
.OrderByDescending(s => s.Id)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.Select(s => new QuoteListItemReadModel
|
||||
{
|
||||
Id = s.Id,
|
||||
QuoteId = "QO-" + s.QuotId,
|
||||
WorkOrder = s.WorkOrder != null ? s.WorkOrder.WorkerOrderNumber : "",
|
||||
ProjectName = s.ProjectName,
|
||||
TotalAmount = s.LineItems!.Sum(l => l.Lineitem ?? 0),
|
||||
SiteName = s.SiteName,
|
||||
SiteId = s.SiteId,
|
||||
PO = s.PO,
|
||||
TT = s.TT,
|
||||
BillingAddress = s.BillingAddress,
|
||||
Status = s.Status,
|
||||
ContactId = s.ContactId,
|
||||
Date = s.Date,
|
||||
Lineitems = s.LineItems!.Select(q => new QuoteLineItemReadModel
|
||||
{
|
||||
Descriptions = q.Descriptions,
|
||||
Lineitem = q.Lineitem,
|
||||
LineitemNumber = q.LineitemNumber
|
||||
}).ToList(),
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return (data, totalCount);
|
||||
}
|
||||
|
||||
public async Task<QuoteDetailReadModel?> GetQuoteDetailsByIdAsync(
|
||||
int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Quotes
|
||||
.Where(s => s.Id == id)
|
||||
.AsNoTracking()
|
||||
.Select(s => new QuoteDetailReadModel
|
||||
{
|
||||
Id = s.Id,
|
||||
QuotId = s.QuotId,
|
||||
Date = s.Date,
|
||||
Name = s.Contacts != null ? (s.Contacts.FirstName + " " + s.Contacts.LastName).Trim() : "",
|
||||
PO = s.PO,
|
||||
TT = s.TT,
|
||||
SiteName = s.SiteName,
|
||||
ProjectName = s.ProjectName,
|
||||
SiteId = s.SiteId,
|
||||
BillingAddress = s.BillingAddress,
|
||||
ShippingAddress = s.ShippingAddress,
|
||||
Lineitems = s.LineItems!.Select(q => new QuoteLineItemReadModel
|
||||
{
|
||||
Descriptions = q.Descriptions,
|
||||
Lineitem = q.Lineitem
|
||||
}).ToList(),
|
||||
TotalAmount = s.LineItems!.Sum(l => l.Lineitem ?? 0)
|
||||
})
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<WorkOrderQuoteDetailReadModel>> GetWorkOrderQuoteDetailsAsync(
|
||||
int woId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.workOrders
|
||||
.AsNoTracking()
|
||||
.Where(w => w.Id == woId)
|
||||
.Select(s => new WorkOrderQuoteDetailReadModel
|
||||
{
|
||||
Id = s.Id,
|
||||
PO = s.PO,
|
||||
TT = s.TT,
|
||||
Title = s.Locations != null ? s.Locations.Title : "",
|
||||
Name = s.Locations != null ? s.Locations.Name : ""
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task DeleteLineItemsByQuoteIdAsync(int quoteId, CancellationToken cancellationToken)
|
||||
{
|
||||
var items = await _context.QuotesLines
|
||||
.Where(w => w.QuoteId == quoteId)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
if (items.Any())
|
||||
{
|
||||
_context.QuotesLines.RemoveRange(items);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
125
SeaHaven.DataServices/Implementation/SettingsDataService.cs
Normal file
125
SeaHaven.DataServices/Implementation/SettingsDataService.cs
Normal file
|
|
@ -0,0 +1,125 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Dto;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class SettingsDataService : ISettingsDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public SettingsDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task AddCategoryAsync(string name, CancellationToken cancellationToken)
|
||||
{
|
||||
var category = new Category { Name = name };
|
||||
await _context.Categories.AddAsync(category, cancellationToken);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> UpdateCategoryAsync(int id, string name, CancellationToken cancellationToken)
|
||||
{
|
||||
var exist = await _context.Categories
|
||||
.Where(w => w.Id == id)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
if (exist == null)
|
||||
return false;
|
||||
|
||||
exist.Name = name;
|
||||
_context.Categories.Update(exist);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<bool> DeleteCategoryCascadeAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var exist = await _context.Categories
|
||||
.Where(w => w.Id == id)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
if (exist == null)
|
||||
return false;
|
||||
|
||||
var templates = await _context.Templates.Where(w => w.CategoryId == id).ToListAsync(cancellationToken);
|
||||
if (templates != null)
|
||||
{
|
||||
_context.RemoveRange(templates);
|
||||
}
|
||||
|
||||
var workOrderCategories = await _context.workOrderCategories.Where(w => w.CategoryId == id).ToListAsync(cancellationToken);
|
||||
if (workOrderCategories != null)
|
||||
{
|
||||
_context.RemoveRange(workOrderCategories);
|
||||
}
|
||||
|
||||
_context.Remove(exist);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
|
||||
public async Task<(IReadOnlyList<SettingsCategoryItemDTO> Items, int Total)> GetCategoryListPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var totalCount = await _context.Categories.CountAsync(cancellationToken);
|
||||
var data = await _context.Categories
|
||||
.AsNoTracking()
|
||||
.Select(s => new SettingsCategoryItemDTO
|
||||
{
|
||||
Id = s.Id,
|
||||
Name = s.Name
|
||||
})
|
||||
.OrderByDescending(d => d.Id)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return (data, totalCount);
|
||||
}
|
||||
|
||||
public async Task<(IReadOnlyList<WorkOrder> Items, int Total)> GetTemplatesPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var totalCount = await _context.workOrders.CountAsync(w => w.istemplate == true, cancellationToken);
|
||||
var data = await _context.workOrders
|
||||
.AsNoTracking()
|
||||
.Where(w => w.istemplate == true)
|
||||
.OrderByDescending(d => d.Id)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return (data, totalCount);
|
||||
}
|
||||
|
||||
public async Task<(IReadOnlyList<ApplicationUser> Users, int Total)> GetUsersPagedAsync(
|
||||
string? search,
|
||||
int page,
|
||||
int pageSize,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var totalCount = await _context.Users.CountAsync(cancellationToken);
|
||||
var users = await _context.Users
|
||||
.AsNoTracking()
|
||||
.Where(w => (w.FirstName ?? "").ToLower().Contains((search ?? "").ToLower()))
|
||||
.OrderByDescending(d => d.Id)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return (users, totalCount);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<string>> GetRoleNamesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
var roles = await _context.Roles.AsNoTracking().ToListAsync(cancellationToken);
|
||||
return roles.Select(r => r.Name!).ToList();
|
||||
}
|
||||
}
|
||||
}
|
||||
127
SeaHaven.DataServices/Implementation/SyncDataService.cs
Normal file
127
SeaHaven.DataServices/Implementation/SyncDataService.cs
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class SyncDataService : ISyncDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public SyncDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<string?> GetLastInternalWONumberAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.workOrders
|
||||
.Where(w => w.InternalWONumber != null && w.InternalWONumber != "")
|
||||
.OrderByDescending(w => w.InternalWONumber)
|
||||
.Select(w => w.InternalWONumber)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<WorkOrder?> GetWorkOrderByExternalIdAsync(string externalId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.workOrders
|
||||
.FirstOrDefaultAsync(w => w.ExternalWorkOrderId == externalId, cancellationToken);
|
||||
}
|
||||
|
||||
public void EnqueueWorkOrder(WorkOrder workOrder)
|
||||
{
|
||||
_context.workOrders.Add(workOrder);
|
||||
}
|
||||
|
||||
public void EnqueueComment(Comments comment)
|
||||
{
|
||||
_context.Comments.Add(comment);
|
||||
}
|
||||
|
||||
public async Task SaveChangesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<int?> ResolveLocationAsync(string? siteCode, string? building, string? address, CancellationToken cancellationToken)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(siteCode) && string.IsNullOrWhiteSpace(building))
|
||||
return null;
|
||||
|
||||
var matchCode = siteCode ?? building;
|
||||
var existing = await _context.Locations
|
||||
.FirstOrDefaultAsync(l => l.Name == matchCode || l.Title == matchCode, cancellationToken);
|
||||
|
||||
if (existing != null)
|
||||
return existing.Id;
|
||||
|
||||
var location = new Locations
|
||||
{
|
||||
Name = matchCode,
|
||||
Title = building,
|
||||
Address1 = address,
|
||||
Status = "Active"
|
||||
};
|
||||
|
||||
_context.Locations.Add(location);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
|
||||
return location.Id;
|
||||
}
|
||||
|
||||
public async Task<int> GetLocationCountAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Locations.CountAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> CommentExistsByExternalIdAsync(string externalId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Comments
|
||||
.AnyAsync(c => c.ExternalCommentId == externalId, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<WorkOrder?> GetWorkOrderByInternalNumberAsync(string internalNumber, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.workOrders
|
||||
.FirstOrDefaultAsync(w => w.InternalWONumber == internalNumber, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<Dispatch?> GetDispatchByNumberAndWorkOrderIdAsync(string dispatchNumber, int workOrderId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Dispatches
|
||||
.FirstOrDefaultAsync(d => d.DispatchNumber == dispatchNumber && d.WorkOrderId == workOrderId, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<List<WorkOrder>> GetWorkOrdersMissingInternalNumberAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.workOrders
|
||||
.Where(w => w.InternalWONumber == null || w.InternalWONumber == "")
|
||||
.OrderBy(w => w.Id)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<List<Dispatch>> GetDispatchesMissingNumberAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Dispatches
|
||||
.Where(d => d.DispatchNumber == null || d.DispatchNumber == "")
|
||||
.OrderBy(d => d.Id)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<int> ExecuteBackfillCommentTypesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Database.ExecuteSqlRawAsync(
|
||||
"UPDATE Comments SET CommentType = 'customer' WHERE ExternalCommentId IS NOT NULL AND (CommentType IS NULL OR CommentType = '')",
|
||||
cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<string?> GetLastDispatchNumberAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Dispatches
|
||||
.Where(d => d.DispatchNumber != null && d.DispatchNumber != "")
|
||||
.OrderByDescending(d => d.DispatchNumber)
|
||||
.Select(d => d.DispatchNumber)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -57,5 +57,58 @@ namespace SeaHaven.DataServices.Implementation
|
|||
{
|
||||
return await _context.TaskListTemplates.AnyAsync(t => t.Id == id);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<TaskListTemplate>> GetActiveTemplatesWithItemsAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.TaskListTemplates
|
||||
.Include(t => t.Items)
|
||||
.Where(t => t.IsActive)
|
||||
.OrderBy(t => t.Name)
|
||||
.AsNoTracking()
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<TaskListTemplate?> GetTemplateWithItemsReadOnlyAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.TaskListTemplates
|
||||
.Include(t => t.Items)
|
||||
.Where(t => t.Id == id)
|
||||
.AsNoTracking()
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<TaskListTemplate?> GetTemplateWithItemsForUpdateAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.TaskListTemplates
|
||||
.Include(t => t.Items)
|
||||
.FirstOrDefaultAsync(t => t.Id == id, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<TaskListTemplate> AddTemplateAsync(TaskListTemplate template, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.TaskListTemplates.AddAsync(template, cancellationToken);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return template;
|
||||
}
|
||||
|
||||
public async Task ReplaceTemplateItemsAsync(TaskListTemplate template, IEnumerable<TaskListTemplateItem> newItems, CancellationToken cancellationToken)
|
||||
{
|
||||
if (template.Items != null)
|
||||
_context.TaskListTemplateItems.RemoveRange(template.Items);
|
||||
|
||||
template.Items = newItems.ToList();
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> DeactivateTemplateAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var template = await _context.TaskListTemplates.FindAsync(new object[] { id }, cancellationToken);
|
||||
if (template == null)
|
||||
return false;
|
||||
|
||||
template.IsActive = false;
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
138
SeaHaven.DataServices/Implementation/UpliftDataService.cs
Normal file
138
SeaHaven.DataServices/Implementation/UpliftDataService.cs
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class UpliftDataService : IUpliftDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public UpliftDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<(int TotalCount, IReadOnlyList<UpliftListItemData> Items)> GetPagedAsync(
|
||||
string? status, int? tier, int page, int pageSize, CancellationToken cancellationToken)
|
||||
{
|
||||
var query = from u in _context.DispatchUpliftRequests
|
||||
join d in _context.Dispatches on u.DispatchId equals d.Id
|
||||
join v in _context.Vendors on d.VendorId equals v.Id into vendors
|
||||
from v in vendors.DefaultIfEmpty()
|
||||
where (u.IsDeleted == null || u.IsDeleted == false)
|
||||
select new { u, d, v };
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(status))
|
||||
query = query.Where(x => x.u.Status == status);
|
||||
if (tier.HasValue)
|
||||
query = query.Where(x => x.u.RequiredTier == tier.Value);
|
||||
|
||||
var total = await query.CountAsync(cancellationToken);
|
||||
|
||||
var items = await query
|
||||
.OrderByDescending(x => x.u.CreatedDate)
|
||||
.Skip((Math.Max(page, 1) - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.Select(x => new UpliftListItemData
|
||||
{
|
||||
Id = x.u.Id,
|
||||
DispatchId = x.d.Id,
|
||||
DispatchNumber = x.d.DispatchNumber,
|
||||
PONumber = x.d.PONumber,
|
||||
WorkOrderId = x.d.WorkOrderId,
|
||||
VendorCompanyName = x.v != null ? x.v.CompanyName : x.u.RequestedByVendorName,
|
||||
CurrentNTE = x.u.CurrentNTE,
|
||||
RequestedNTE = x.u.RequestedNTE,
|
||||
VendorReason = x.u.VendorReason,
|
||||
RequiredTier = x.u.RequiredTier,
|
||||
Status = x.u.Status,
|
||||
CreatedDate = x.u.CreatedDate,
|
||||
DecidedAt = x.u.DecidedAt,
|
||||
DecisionNote = x.u.DecisionNote
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
return (total, items);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<UpliftForDispatchData>> GetForDispatchAsync(int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await (from u in _context.DispatchUpliftRequests
|
||||
where u.DispatchId == dispatchId && (u.IsDeleted == null || u.IsDeleted == false)
|
||||
join dec in _context.Users on u.DecidedByUserId equals dec.Id into decs
|
||||
from dec in decs.DefaultIfEmpty()
|
||||
orderby u.CreatedDate descending
|
||||
select new UpliftForDispatchData
|
||||
{
|
||||
Id = u.Id,
|
||||
DispatchId = u.DispatchId,
|
||||
CurrentNTE = u.CurrentNTE,
|
||||
RequestedNTE = u.RequestedNTE,
|
||||
VendorReason = u.VendorReason,
|
||||
Status = u.Status,
|
||||
RequiredTier = u.RequiredTier,
|
||||
RequestedByVendorName = u.RequestedByVendorName,
|
||||
CreatedDate = u.CreatedDate,
|
||||
DecidedAt = u.DecidedAt,
|
||||
DecisionNote = u.DecisionNote,
|
||||
DecidedByFirstName = dec != null ? dec.FirstName : null,
|
||||
DecidedByLastName = dec != null ? dec.LastName : null
|
||||
}).ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<PortalUpliftData>> GetForVendorDispatchAsync(int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await (from u in _context.DispatchUpliftRequests
|
||||
where u.DispatchId == dispatchId && (u.IsDeleted == null || u.IsDeleted == false)
|
||||
join dec in _context.Users on u.DecidedByUserId equals dec.Id into decs
|
||||
from dec in decs.DefaultIfEmpty()
|
||||
orderby u.CreatedDate descending
|
||||
select new PortalUpliftData
|
||||
{
|
||||
Id = u.Id,
|
||||
CurrentNTE = u.CurrentNTE,
|
||||
RequestedNTE = u.RequestedNTE,
|
||||
VendorReason = u.VendorReason,
|
||||
Status = u.Status,
|
||||
RequiredTier = u.RequiredTier,
|
||||
RequestedByVendorName = u.RequestedByVendorName,
|
||||
CreatedDate = u.CreatedDate,
|
||||
DecidedAt = u.DecidedAt,
|
||||
DecisionNote = u.DecisionNote,
|
||||
DecidedByFirstName = dec != null ? dec.FirstName : null,
|
||||
DecidedByLastName = dec != null ? dec.LastName : null
|
||||
}).ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<DispatchUpliftRequest?> GetByIdAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DispatchUpliftRequests
|
||||
.FirstOrDefaultAsync(u => u.Id == id, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<DispatchUpliftRequest?> GetByIdAndDispatchAsync(int requestId, int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DispatchUpliftRequests
|
||||
.FirstOrDefaultAsync(u => u.Id == requestId && u.DispatchId == dispatchId, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> HasPendingAsync(int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.DispatchUpliftRequests
|
||||
.AnyAsync(u => u.DispatchId == dispatchId
|
||||
&& u.Status == "Pending"
|
||||
&& (u.IsDeleted == null || u.IsDeleted == false), cancellationToken);
|
||||
}
|
||||
|
||||
public async Task StageAsync(DispatchUpliftRequest request, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.DispatchUpliftRequests.AddAsync(request, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task SaveChangesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Dto;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
|
|
@ -34,6 +35,123 @@ namespace SeaHaven.DataServices.Implementation
|
|||
return await _context.Users.AnyAsync(u => u.Id == id);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<UserListRowData>> GetAllForListAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Users
|
||||
.AsNoTracking()
|
||||
.Select(user => new UserListRowData
|
||||
{
|
||||
Id = user.Id,
|
||||
RoleName = user.PhoneNumber,
|
||||
Email = user.Email,
|
||||
Name = user.FirstName,
|
||||
CreatedDate = user.CreatedDate,
|
||||
Status = user.UniqueName
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<UserProfileData?> GetProfileAsync(string id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Users
|
||||
.AsNoTracking()
|
||||
.Where(u => u.Id == id)
|
||||
.Select(user => new UserProfileData
|
||||
{
|
||||
Id = user.Id,
|
||||
FirstName = user.FirstName,
|
||||
Email = user.Email,
|
||||
Contact = user.Contact,
|
||||
CreatedDate = user.CreatedDate
|
||||
})
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<bool> UpdateProfileAsync(
|
||||
string id,
|
||||
string? name,
|
||||
string? email,
|
||||
string? contact,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var updated = await _context.Users
|
||||
.Where(user => user.Id == id)
|
||||
.ExecuteUpdateAsync(
|
||||
setters => setters
|
||||
.SetProperty(user => user.FirstName, name)
|
||||
.SetProperty(user => user.Email, email)
|
||||
.SetProperty(user => user.Contact, contact),
|
||||
cancellationToken);
|
||||
|
||||
return updated == 1;
|
||||
}
|
||||
|
||||
public async Task<ApplicationUser?> GetForEditAsync(string id, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Users
|
||||
.Where(w => w.Id == id)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<ApplicationUser?> GetByEmailNormalizedAsync(string email, CancellationToken cancellationToken)
|
||||
{
|
||||
var normalizedEmail = email.Trim().ToUpperInvariant();
|
||||
return await _context.Users
|
||||
.AsNoTracking()
|
||||
.Where(user => user.NormalizedEmail == normalizedEmail)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task UpdateUserAsync(ApplicationUser user, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.Users.Update(user);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task DeleteUserWithCascadeAsync(ApplicationUser user, CancellationToken cancellationToken)
|
||||
{
|
||||
var id = user.Id;
|
||||
await using var transaction = await _context.Database.BeginTransactionAsync(cancellationToken);
|
||||
|
||||
await _context.workOrders
|
||||
.Where(workOrder => workOrder.AssignTo == id)
|
||||
.ExecuteUpdateAsync(
|
||||
setters => setters.SetProperty(workOrder => workOrder.AssignTo, (string?)null),
|
||||
cancellationToken);
|
||||
|
||||
await _context.Comments
|
||||
.Where(comment => comment.UserId == id)
|
||||
.ExecuteUpdateAsync(
|
||||
setters => setters.SetProperty(comment => comment.UserId, (string?)null),
|
||||
cancellationToken);
|
||||
|
||||
await _context.Templates
|
||||
.Where(template => template.AssignTo == id)
|
||||
.ExecuteUpdateAsync(
|
||||
setters => setters.SetProperty(template => template.AssignTo, (string?)null),
|
||||
cancellationToken);
|
||||
|
||||
await _context.UserRoles
|
||||
.Where(role => role.UserId == id)
|
||||
.ExecuteDeleteAsync(cancellationToken);
|
||||
|
||||
await _context.Users
|
||||
.Where(existingUser => existingUser.Id == id)
|
||||
.ExecuteDeleteAsync(cancellationToken);
|
||||
|
||||
await transaction.CommitAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<string?> GetEmailByIdAsync(
|
||||
string userId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Users
|
||||
.AsNoTracking()
|
||||
.Where(user => user.Id == userId)
|
||||
.Select(user => user.Email)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyDictionary<string, string>> GetDisplayNamesByIdsAsync(IEnumerable<string> ids)
|
||||
{
|
||||
var idList = ids
|
||||
|
|
|
|||
|
|
@ -29,11 +29,56 @@ namespace SeaHaven.DataServices.Implementation
|
|||
.FirstOrDefaultAsync();
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<Vendor>> GetByIdsOrderedAsync(IReadOnlyCollection<int> ids, CancellationToken cancellationToken)
|
||||
{
|
||||
var orderedIds = ids.Distinct().ToList();
|
||||
if (orderedIds.Count == 0)
|
||||
return Array.Empty<Vendor>();
|
||||
|
||||
var loaded = await _context.Vendors
|
||||
.AsNoTracking()
|
||||
.Where(v => orderedIds.Contains(v.Id))
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var byId = loaded.ToDictionary(v => v.Id);
|
||||
var ordered = new List<Vendor>(orderedIds.Count);
|
||||
foreach (var id in orderedIds)
|
||||
{
|
||||
if (byId.TryGetValue(id, out var vendor))
|
||||
ordered.Add(vendor);
|
||||
}
|
||||
|
||||
return ordered;
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Vendor>> GetAllAsync()
|
||||
{
|
||||
return await _context.Vendors.ToListAsync();
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<Vendor>> GetActiveVendorsAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Vendors
|
||||
.AsNoTracking()
|
||||
.Where(v => v.IsActive)
|
||||
.OrderBy(v => v.CompanyName)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<Vendor>> GetVendorsForFacetsAsync(bool? isActive, CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.Vendors
|
||||
.AsNoTracking()
|
||||
.Where(v => v.IsDeleted == null || v.IsDeleted == false);
|
||||
|
||||
if (isActive.HasValue)
|
||||
query = query.Where(v => v.IsActive == isActive.Value);
|
||||
|
||||
return await query
|
||||
.OrderByDescending(v => v.Id)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<(IEnumerable<Vendor> Items, int TotalCount)> GetPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
|
|
@ -284,16 +329,47 @@ namespace SeaHaven.DataServices.Implementation
|
|||
return await _context.Vendors.AnyAsync(v => v.Id == id);
|
||||
}
|
||||
|
||||
public async Task<VendorAccessToken?> GetActiveTokenAsync(int vendorId)
|
||||
public async Task<VendorAccessToken?> GetActiveTokenForVendorAsync(int vendorId, CancellationToken cancellationToken)
|
||||
{
|
||||
var now = DateTime.UtcNow;
|
||||
return await _context.VendorAccessTokens
|
||||
.FirstOrDefaultAsync(t => t.VendorId == vendorId);
|
||||
.AsNoTracking()
|
||||
.Where(t => t.VendorId == vendorId
|
||||
&& t.RevokedAt == null
|
||||
&& t.ExpiresAt > now
|
||||
&& (t.IsDeleted == null || t.IsDeleted == false))
|
||||
.OrderByDescending(t => t.IssuedAt)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<VendorAccessToken?> GetTokenByStringAsync(string token)
|
||||
public async Task<VendorAccessToken?> GetTokenWithVendorAsync(string token, CancellationToken cancellationToken)
|
||||
{
|
||||
var now = DateTime.UtcNow;
|
||||
return await _context.VendorAccessTokens
|
||||
.Include(t => t.Vendor)
|
||||
.FirstOrDefaultAsync(t => t.Token == token
|
||||
&& t.RevokedAt == null
|
||||
&& t.ExpiresAt > now
|
||||
&& (t.IsDeleted == null || t.IsDeleted == false), cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<VendorAccessToken> AddTokenAsync(VendorAccessToken token, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.VendorAccessTokens.AddAsync(token, cancellationToken);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return token;
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<VendorAccessToken>> GetRevocableTokensAsync(int vendorId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.VendorAccessTokens
|
||||
.FirstOrDefaultAsync(t => t.Token == token);
|
||||
.Where(t => t.VendorId == vendorId && t.RevokedAt == null)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task SaveChangesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<int> CountAsync()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class VendorDocumentDataService : IVendorDocumentDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public VendorDocumentDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public Task<VendorCompletionDocument?> GetLatestForDispatchAsync(int dispatchId, CancellationToken cancellationToken)
|
||||
{
|
||||
return _context.VendorCompletionDocuments
|
||||
.Where(document => document.DispatchId == dispatchId)
|
||||
.OrderByDescending(document => document.Version)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public Task<VendorCompletionDocument?> GetForVendorDispatchAsync(int documentId, int dispatchId, int vendorId, CancellationToken cancellationToken)
|
||||
{
|
||||
return _context.VendorCompletionDocuments
|
||||
.FirstOrDefaultAsync(document => document.Id == documentId
|
||||
&& document.DispatchId == dispatchId
|
||||
&& document.VendorId == vendorId
|
||||
&& (document.IsDeleted == null || document.IsDeleted == false), cancellationToken);
|
||||
}
|
||||
|
||||
public async Task AddAsync(VendorCompletionDocument document, CancellationToken cancellationToken)
|
||||
{
|
||||
await _context.VendorCompletionDocuments.AddAsync(document, cancellationToken);
|
||||
}
|
||||
|
||||
public Task SaveChangesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,231 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Data.SeaHavenIndustries.Enums;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.DataServices.Models;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class VendorOperationsDataService : IVendorOperationsDataService
|
||||
{
|
||||
private static readonly string[] TerminalDispatchStatuses = { "Completed", "Verified", "Cancelled", "Canceled" };
|
||||
|
||||
private readonly ApplicationDbContext _context;
|
||||
private readonly IDispatchDataService _dispatchDataService;
|
||||
|
||||
public VendorOperationsDataService(ApplicationDbContext context, IDispatchDataService dispatchDataService)
|
||||
{
|
||||
_context = context;
|
||||
_dispatchDataService = dispatchDataService;
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<int>> GetAssignedWorkOrderIdsAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
var directlyAssignedIds = await _context.Dispatches
|
||||
.AsNoTracking()
|
||||
.Where(d => !TerminalDispatchStatuses.Contains(d.Status ?? "") && d.WorkOrderId.HasValue)
|
||||
.Select(d => d.WorkOrderId!.Value)
|
||||
.ToListAsync(cancellationToken);
|
||||
var multiplyAssignedIds = await _context.DispatchWorkOrders
|
||||
.AsNoTracking()
|
||||
.Where(link => link.Dispatch != null
|
||||
&& !TerminalDispatchStatuses.Contains(link.Dispatch.Status ?? ""))
|
||||
.Select(link => link.WorkOrderId)
|
||||
.ToListAsync(cancellationToken);
|
||||
return directlyAssignedIds.Concat(multiplyAssignedIds).Distinct().ToList();
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<NoVendorCandidateReadModel>> GetNoVendorWorkOrdersAsync(
|
||||
DateTime cutoff, IReadOnlyCollection<int> excludeIds, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.workOrders
|
||||
.AsNoTracking()
|
||||
.Where(wo => wo.ScheduledDate.HasValue
|
||||
&& wo.ScheduledDate.Value <= cutoff
|
||||
&& wo.LifecycleStatus != LifecycleStatus.Completed
|
||||
&& wo.LifecycleStatus != LifecycleStatus.Canceled
|
||||
&& !excludeIds.Contains(wo.Id))
|
||||
.OrderBy(wo => wo.ScheduledDate)
|
||||
.Select(wo => new NoVendorCandidateReadModel
|
||||
{
|
||||
Id = wo.Id,
|
||||
InternalWONumber = wo.InternalWONumber,
|
||||
WorkerOrderNumber = wo.WorkerOrderNumber,
|
||||
ScheduledDate = wo.ScheduledDate
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<ScheduledDispatchReadModel>> GetActiveScheduledDispatchesAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
var direct = _context.Dispatches.AsNoTracking()
|
||||
.Where(dispatch => !TerminalDispatchStatuses.Contains(dispatch.Status ?? "")
|
||||
&& (dispatch.IsDeleted == null || dispatch.IsDeleted == false)
|
||||
&& dispatch.WorkOrderId.HasValue
|
||||
&& (dispatch.ScheduledDate.HasValue
|
||||
|| (dispatch.WorkOrder != null && dispatch.WorkOrder.ScheduledStart.HasValue)))
|
||||
.Select(dispatch => new ScheduledDispatchReadModel
|
||||
{
|
||||
Id = dispatch.Id,
|
||||
VendorId = dispatch.VendorId,
|
||||
VendorName = dispatch.Vendor!.CompanyName,
|
||||
WorkOrderId = dispatch.WorkOrderId!.Value,
|
||||
WorkOrderNumber = dispatch.WorkOrder!.InternalWONumber ?? dispatch.WorkOrder.WorkerOrderNumber,
|
||||
Start = dispatch.WorkOrder!.ScheduledStart ?? dispatch.ScheduledDate!.Value,
|
||||
End = dispatch.WorkOrder.ScheduledEnd
|
||||
?? (dispatch.WorkOrder.ScheduledStart ?? dispatch.ScheduledDate!.Value).AddHours(2)
|
||||
});
|
||||
|
||||
var linked = _context.DispatchWorkOrders.AsNoTracking()
|
||||
.Where(link => link.Dispatch != null
|
||||
&& link.WorkOrder != null
|
||||
&& link.Dispatch.WorkOrderId != link.WorkOrderId
|
||||
&& !TerminalDispatchStatuses.Contains(link.Dispatch.Status ?? "")
|
||||
&& (link.Dispatch.IsDeleted == null || link.Dispatch.IsDeleted == false)
|
||||
&& (link.Dispatch.ScheduledDate.HasValue || link.WorkOrder.ScheduledStart.HasValue))
|
||||
.Select(link => new ScheduledDispatchReadModel
|
||||
{
|
||||
Id = link.DispatchId,
|
||||
VendorId = link.Dispatch!.VendorId,
|
||||
VendorName = link.Dispatch.Vendor!.CompanyName,
|
||||
WorkOrderId = link.WorkOrderId,
|
||||
WorkOrderNumber = link.WorkOrder!.InternalWONumber ?? link.WorkOrder.WorkerOrderNumber,
|
||||
Start = link.WorkOrder.ScheduledStart ?? link.Dispatch.ScheduledDate!.Value,
|
||||
End = link.WorkOrder.ScheduledEnd
|
||||
?? (link.WorkOrder.ScheduledStart ?? link.Dispatch.ScheduledDate!.Value).AddHours(2)
|
||||
});
|
||||
|
||||
return await direct.Concat(linked).ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<ActiveVendorReadModel>> GetActiveVendorsAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.Vendors.AsNoTracking()
|
||||
.Where(v => v.IsActive && (v.IsDeleted == null || v.IsDeleted == false))
|
||||
.Select(v => new ActiveVendorReadModel
|
||||
{
|
||||
Id = v.Id,
|
||||
CompanyName = v.CompanyName,
|
||||
ContactName = v.ContactName,
|
||||
TradeSpecialties = v.TradeSpecialties,
|
||||
AvailabilityStatus = v.AvailabilityStatus,
|
||||
AvailabilityUpdatedAt = v.AvailabilityUpdatedAt
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<SitePreferredVendor>> GetSitePreferredVendorsAsync(int locationId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.SitePreferredVendors
|
||||
.AsNoTracking()
|
||||
.Where(p => p.LocationId == locationId)
|
||||
.Include(p => p.Vendor)
|
||||
.OrderBy(p => p.SortOrder)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<List<SitePreferredVendor>> GetSitePreferredVendorsForReplaceAsync(int locationId, CancellationToken cancellationToken)
|
||||
{
|
||||
return await _context.SitePreferredVendors
|
||||
.Where(p => p.LocationId == locationId)
|
||||
.ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public Task<bool> LocationExistsAsync(int locationId, CancellationToken cancellationToken)
|
||||
=> _context.Locations.AnyAsync(location => location.Id == locationId, cancellationToken);
|
||||
|
||||
public async Task<Dictionary<int, Vendor>> GetVendorsByIdsAsync(IReadOnlyCollection<int> vendorIds, CancellationToken cancellationToken)
|
||||
=> await _context.Vendors.Where(vendor => vendorIds.Contains(vendor.Id))
|
||||
.ToDictionaryAsync(vendor => vendor.Id, cancellationToken);
|
||||
|
||||
public async Task<IReadOnlyList<InsightDispatchData>> GetInsightDispatchDataAsync(
|
||||
DateTime? from, DateTime? to, int? locationId, string? trade, int? vendorId, CancellationToken cancellationToken)
|
||||
{
|
||||
var query = _context.Dispatches.AsNoTracking()
|
||||
.Include(dispatch => dispatch.Vendor)
|
||||
.Include(dispatch => dispatch.WorkOrder)
|
||||
.Where(dispatch => dispatch.Vendor != null);
|
||||
if (from.HasValue) query = query.Where(dispatch => (dispatch.DispatchedAt ?? dispatch.CreatedDate) >= from);
|
||||
if (to.HasValue) query = query.Where(dispatch => (dispatch.DispatchedAt ?? dispatch.CreatedDate) <= to);
|
||||
if (locationId.HasValue) query = query.Where(dispatch => dispatch.WorkOrder!.LocationId == locationId);
|
||||
if (!string.IsNullOrWhiteSpace(trade)) query = query.Where(dispatch => dispatch.WorkOrder!.Trade == trade);
|
||||
if (vendorId.HasValue) query = query.Where(dispatch => dispatch.VendorId == vendorId);
|
||||
|
||||
return await query.Select(dispatch => new InsightDispatchData
|
||||
{
|
||||
VendorId = dispatch.VendorId,
|
||||
VendorName = dispatch.Vendor!.CompanyName,
|
||||
Status = dispatch.Status,
|
||||
DispatchedAt = dispatch.DispatchedAt,
|
||||
CreatedDate = dispatch.CreatedDate,
|
||||
ScheduledDate = dispatch.ScheduledDate,
|
||||
AcknowledgedAt = dispatch.AcknowledgedAt,
|
||||
CompletedDate = dispatch.CompletedDate,
|
||||
DueDate = dispatch.WorkOrder != null ? dispatch.WorkOrder.DueDate : null
|
||||
}).ToListAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public Task<Vendor?> GetVendorForUpdateAsync(int vendorId, CancellationToken cancellationToken)
|
||||
=> _context.Vendors.FirstOrDefaultAsync(v => v.Id == vendorId, cancellationToken);
|
||||
|
||||
public Task<VendorCompletionDocument?> GetCompletionDocumentForUpdateAsync(int documentId, CancellationToken cancellationToken)
|
||||
=> _context.VendorCompletionDocuments.FirstOrDefaultAsync(d => d.Id == documentId, cancellationToken);
|
||||
|
||||
public Task<Dispatch?> GetDispatchForUpdateAsync(int dispatchId, CancellationToken cancellationToken)
|
||||
=> _context.Dispatches.FirstOrDefaultAsync(d => d.Id == dispatchId, cancellationToken);
|
||||
|
||||
public Task<WorkOrder?> GetWorkOrderForUpdateAsync(int workOrderId, CancellationToken cancellationToken)
|
||||
=> _context.workOrders.FirstOrDefaultAsync(w => w.Id == workOrderId, cancellationToken);
|
||||
|
||||
public async Task<Dispatch?> GetExistingActiveDispatchForWorkOrderAsync(int workOrderId, CancellationToken cancellationToken)
|
||||
{
|
||||
var linkedDispatchIds = _context.DispatchWorkOrders
|
||||
.Where(link => link.WorkOrderId == workOrderId)
|
||||
.Select(link => link.DispatchId);
|
||||
return await _context.Dispatches
|
||||
.Where(item => (item.WorkOrderId == workOrderId || linkedDispatchIds.Contains(item.Id))
|
||||
&& !TerminalDispatchStatuses.Contains(item.Status ?? ""))
|
||||
.OrderByDescending(item => item.CreatedDate)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public Task<string> GenerateNextDispatchNumberAsync(CancellationToken cancellationToken)
|
||||
=> _dispatchDataService.GenerateNextDispatchNumberAsync();
|
||||
|
||||
public Task<string> GenerateNextPONumberAsync(CancellationToken cancellationToken)
|
||||
=> _dispatchDataService.GenerateNextPONumberAsync();
|
||||
|
||||
public Task AddDispatchAsync(Dispatch dispatch, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.Dispatches.Add(dispatch);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task StageWorkOrderAuditAsync(WorkOrderAuditLog log, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.WorkOrderAuditLogs.Add(log);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task StageVendorAuditAsync(VendorAuditLog log, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.VendorAuditLogs.Add(log);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task AddSitePreferredVendorAsync(SitePreferredVendor preference, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.SitePreferredVendors.Add(preference);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task RemoveSitePreferredVendorsAsync(IEnumerable<SitePreferredVendor> preferences, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.SitePreferredVendors.RemoveRange(preferences);
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public Task<int> SaveChangesAsync(CancellationToken cancellationToken)
|
||||
=> _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class WorkOrderAuditDataService : IWorkOrderAuditDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public WorkOrderAuditDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public void EnqueueAuditLog(WorkOrderAuditLog auditLog)
|
||||
{
|
||||
_context.WorkOrderAuditLogs.Add(auditLog);
|
||||
}
|
||||
|
||||
public async Task PersistAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
catch (DbUpdateException ex) when (IsUniqueConstraintViolation(ex))
|
||||
{
|
||||
foreach (var entry in ex.Entries.Where(e => e.Entity is WorkOrderFieldLock))
|
||||
entry.State = EntityState.Detached;
|
||||
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
|
||||
private static bool IsUniqueConstraintViolation(DbUpdateException ex)
|
||||
{
|
||||
var message = ex.InnerException?.Message ?? ex.Message;
|
||||
return message.Contains("duplicate", StringComparison.OrdinalIgnoreCase)
|
||||
|| message.Contains("UNIQUE", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class WorkOrderBoardMutationDataService : IWorkOrderBoardMutationDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public WorkOrderBoardMutationDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public Task<bool> VendorExistsAsync(int vendorId, CancellationToken cancellationToken)
|
||||
=> _context.Vendors.AnyAsync(v => v.Id == vendorId && v.IsDeleted != true, cancellationToken);
|
||||
|
||||
public async Task<int> GetMaxWorkOrderIdAsync(CancellationToken cancellationToken)
|
||||
=> await _context.workOrders.MaxAsync(w => (int?)w.Id, cancellationToken) ?? 0;
|
||||
|
||||
public Task<WorkOrder?> GetTrackedWorkOrderAsync(int workOrderId, CancellationToken cancellationToken)
|
||||
=> _context.workOrders.FirstOrDefaultAsync(
|
||||
w => w.Id == workOrderId && w.istemplate != true && (w.IsDeleted != true || w.IsDeleted == null),
|
||||
cancellationToken);
|
||||
|
||||
public Task<Dispatch?> GetTrackedDispatchAsync(int dispatchId, int workOrderId, CancellationToken cancellationToken)
|
||||
=> _context.Dispatches.FirstOrDefaultAsync(
|
||||
d => d.Id == dispatchId && d.WorkOrderId == workOrderId,
|
||||
cancellationToken);
|
||||
|
||||
public Task<Dispatch?> GetTrackedDispatchByIdAsync(int dispatchId, CancellationToken cancellationToken)
|
||||
=> _context.Dispatches.FirstOrDefaultAsync(d => d.Id == dispatchId, cancellationToken);
|
||||
|
||||
public void TrackNewWorkOrder(WorkOrder workOrder)
|
||||
=> _context.workOrders.Add(workOrder);
|
||||
|
||||
public void TrackNewDispatch(Dispatch dispatch)
|
||||
=> _context.Dispatches.Add(dispatch);
|
||||
|
||||
public void TrackWorkOrderContact(int workOrderId, int contactId, string? notes)
|
||||
=> _context.WorkOrderContacts.Add(new WorkOrderContacts
|
||||
{
|
||||
WorkorderId = workOrderId,
|
||||
ContactId = contactId,
|
||||
Notes = notes
|
||||
});
|
||||
|
||||
public void SetExpectedWorkOrderVersion(WorkOrder workOrder, byte[] version)
|
||||
=> _context.Entry(workOrder).Property(w => w.RowVersion).OriginalValue = version;
|
||||
|
||||
public void SetExpectedDispatchVersion(Dispatch dispatch, byte[] version)
|
||||
=> _context.Entry(dispatch).Property(d => d.RowVersion).OriginalValue = version;
|
||||
|
||||
public bool HasPendingChanges()
|
||||
=> _context.ChangeTracker.HasChanges();
|
||||
|
||||
public async Task ExecuteTransactionalAsync(Func<CancellationToken, Task> work, CancellationToken cancellationToken)
|
||||
{
|
||||
await using var transaction = _context.Database.IsRelational()
|
||||
? await _context.Database.BeginTransactionAsync(cancellationToken)
|
||||
: null;
|
||||
|
||||
try
|
||||
{
|
||||
await work(cancellationToken);
|
||||
if (transaction is not null)
|
||||
await transaction.CommitAsync(cancellationToken);
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (transaction is not null)
|
||||
await transaction.RollbackAsync(cancellationToken);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<BoardSaveOutcome> SaveAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
return BoardSaveOutcome.Saved;
|
||||
}
|
||||
catch (DbUpdateConcurrencyException)
|
||||
{
|
||||
_context.ChangeTracker.Clear();
|
||||
return BoardSaveOutcome.ConcurrencyConflict;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class WorkOrderCompletionDataService : IWorkOrderCompletionDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public WorkOrderCompletionDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public Task<WorkOrder?> GetTrackedWorkOrderAsync(int workOrderId, CancellationToken cancellationToken)
|
||||
=> _context.workOrders.FirstOrDefaultAsync(
|
||||
w => w.Id == workOrderId && w.istemplate != true && (w.IsDeleted != true || w.IsDeleted == null),
|
||||
cancellationToken);
|
||||
|
||||
public void SetExpectedWorkOrderVersion(WorkOrder workOrder, byte[] version)
|
||||
=> _context.Entry(workOrder).Property(w => w.RowVersion).OriginalValue = version;
|
||||
|
||||
public Task<CompletionDocTemplate?> GetTrackedTemplateAsync(int id, CancellationToken cancellationToken)
|
||||
=> _context.CompletionDocTemplates.FirstOrDefaultAsync(t => t.Id == id && t.IsDeleted != true, cancellationToken);
|
||||
|
||||
public Task SaveAsync(CancellationToken cancellationToken)
|
||||
=> _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
using SeaHaven.DataServices.Models;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
|
|
@ -101,7 +102,7 @@ namespace SeaHaven.DataServices.Implementation
|
|||
return (items, totalCount);
|
||||
}
|
||||
|
||||
public async Task<(IEnumerable<object> Items, int TotalCount)> GetWorkOrderListPagedAsync(
|
||||
public async Task<(IEnumerable<WorkOrderListItemReadModel> Items, int TotalCount)> GetWorkOrderListPagedAsync(
|
||||
int page,
|
||||
int pageSize,
|
||||
string? search = null,
|
||||
|
|
@ -131,13 +132,12 @@ namespace SeaHaven.DataServices.Implementation
|
|||
|
||||
if (!string.IsNullOrWhiteSpace(search))
|
||||
{
|
||||
var s = search.ToLower();
|
||||
query = query.Where(w =>
|
||||
(w.InternalWONumber ?? "").ToLower().Contains(s) ||
|
||||
(w.WorkerOrderNumber ?? "").ToLower().Contains(s) ||
|
||||
(w.WorkerOrderTitle ?? "").ToLower().Contains(s) ||
|
||||
(w.Locations.Title ?? "").ToLower().Contains(s) ||
|
||||
(w.Locations.Name ?? "").ToLower().Contains(s)
|
||||
(w.InternalWONumber != null && w.InternalWONumber.Contains(search)) ||
|
||||
(w.WorkerOrderNumber != null && w.WorkerOrderNumber.Contains(search)) ||
|
||||
(w.WorkerOrderTitle != null && w.WorkerOrderTitle.Contains(search)) ||
|
||||
(w.Locations != null && w.Locations.Title != null && w.Locations.Title.Contains(search)) ||
|
||||
(w.Locations != null && w.Locations.Name != null && w.Locations.Name.Contains(search))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -160,24 +160,24 @@ namespace SeaHaven.DataServices.Implementation
|
|||
var data = await ordered
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.Select(w => new
|
||||
.Select(w => new WorkOrderListItemReadModel
|
||||
{
|
||||
id = w.Id,
|
||||
internalWONumber = w.InternalWONumber,
|
||||
workOrderNumber = w.WorkerOrderNumber,
|
||||
number = w.InternalWONumber ?? w.WorkerOrderNumber,
|
||||
title = w.WorkerOrderTitle,
|
||||
location = w.Locations != null ? w.Locations.Name : "",
|
||||
locationName = w.Locations != null ? w.Locations.Name : "",
|
||||
priority = w.Priority,
|
||||
status = w.Status,
|
||||
createdDate = w.CreatedDate,
|
||||
dueDate = w.DueDate,
|
||||
assignedTo = w.AssignToUser != null ? w.AssignToUser.FirstName + " " + w.AssignToUser.LastName : "",
|
||||
employeeName = w.AssignToUser != null ? w.AssignToUser.FirstName + " " + w.AssignToUser.LastName : "",
|
||||
lastUpdated = new[] {
|
||||
Id = w.Id,
|
||||
InternalWONumber = w.InternalWONumber,
|
||||
WorkOrderNumber = w.WorkerOrderNumber,
|
||||
Number = w.InternalWONumber ?? w.WorkerOrderNumber,
|
||||
Title = w.WorkerOrderTitle,
|
||||
Location = w.Locations != null ? w.Locations.Name : "",
|
||||
LocationName = w.Locations != null ? w.Locations.Name : "",
|
||||
Priority = w.Priority,
|
||||
Status = w.Status,
|
||||
CreatedDate = w.CreatedDate,
|
||||
DueDate = w.DueDate,
|
||||
AssignedTo = w.AssignToUser != null ? w.AssignToUser.FirstName + " " + w.AssignToUser.LastName : "",
|
||||
EmployeeName = w.AssignToUser != null ? w.AssignToUser.FirstName + " " + w.AssignToUser.LastName : "",
|
||||
LastUpdated = new[] {
|
||||
w.LastModificationTime,
|
||||
w.Comments.Max(c => (DateTime?)c.CreatedDate),
|
||||
w.Comments!.Max(c => (DateTime?)c.CreatedDate),
|
||||
_context.WorkOrderAuditLogs.Where(a => a.WorkOrderId == w.Id).Max(a => (DateTime?)a.CreatedAt)
|
||||
}.Where(d => d.HasValue).Max()
|
||||
})
|
||||
|
|
@ -283,6 +283,15 @@ namespace SeaHaven.DataServices.Implementation
|
|||
await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public async Task AddAuditLogsAsync(IReadOnlyCollection<WorkOrderAuditLog> auditLogs)
|
||||
{
|
||||
if (auditLogs.Count == 0)
|
||||
return;
|
||||
|
||||
await _context.WorkOrderAuditLogs.AddRangeAsync(auditLogs);
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
|
||||
public async Task DeleteWorkOrderContactsAsync(int workOrderId)
|
||||
{
|
||||
var contacts = await _context.WorkOrderContacts
|
||||
|
|
@ -349,6 +358,11 @@ namespace SeaHaven.DataServices.Implementation
|
|||
return await _context.workOrders.CountAsync(w => w.Status == status);
|
||||
}
|
||||
|
||||
public async Task<int> CountByPriorityAsync(string priority)
|
||||
{
|
||||
return await _context.workOrders.CountAsync(w => w.Priority == priority);
|
||||
}
|
||||
|
||||
public async Task<int> CountByLocationAsync(int locationId)
|
||||
{
|
||||
return await _context.workOrders.CountAsync(w => w.LocationId == locationId);
|
||||
|
|
@ -363,5 +377,146 @@ namespace SeaHaven.DataServices.Implementation
|
|||
.AsSplitQuery()
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
public async Task<IReadOnlyList<WorkOrder>> GetByRequestedIdsWithDetailsAsync(
|
||||
IReadOnlyCollection<int> ids,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
var orderedIds = ids.Distinct().ToList();
|
||||
if (orderedIds.Count == 0)
|
||||
return Array.Empty<WorkOrder>();
|
||||
|
||||
var loaded = await _context.workOrders
|
||||
.AsNoTracking()
|
||||
.Where(w => orderedIds.Contains(w.Id) && w.istemplate != true)
|
||||
.Include(w => w.Locations)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
var byId = loaded.ToDictionary(w => w.Id);
|
||||
var ordered = new List<WorkOrder>(orderedIds.Count);
|
||||
foreach (var id in orderedIds)
|
||||
{
|
||||
if (byId.TryGetValue(id, out var workOrder))
|
||||
ordered.Add(workOrder);
|
||||
}
|
||||
|
||||
return ordered;
|
||||
}
|
||||
|
||||
public async Task<WorkOrderDetailReadModel?> GetWorkOrderDetailAsync(int id)
|
||||
{
|
||||
return await _context.workOrders
|
||||
.AsNoTracking()
|
||||
.Where(w => w.Id == id)
|
||||
.Select(s => new WorkOrderDetailReadModel
|
||||
{
|
||||
Id = s.Id,
|
||||
InternalWONumber = s.InternalWONumber,
|
||||
WorkerOrderNumber = s.WorkerOrderNumber,
|
||||
Title = s.WorkerOrderTitle,
|
||||
Description = s.Description,
|
||||
CreatedDate = s.CreatedDate,
|
||||
DueDate = s.DueDate,
|
||||
ScheduledDate = s.ScheduledDate,
|
||||
CompletedDate = s.CompletedDate,
|
||||
Status = s.Status,
|
||||
Assignee = s.AssignToUser != null ? s.AssignToUser.FirstName : "",
|
||||
Location = s.Locations != null ? s.Locations.Name : "",
|
||||
LocationId = s.LocationId,
|
||||
LocationZip = s.Locations != null ? (s.Locations.Zip ?? ExtractZip(s.Locations.Address1)) : "",
|
||||
Priority = s.Priority,
|
||||
Problem = s.Problem,
|
||||
Trade = s.Trade,
|
||||
SubTrade = s.SubTrade,
|
||||
VendorNTE = s.VendorNTE,
|
||||
Source = s.Source,
|
||||
PO = s.PO,
|
||||
TT = s.TT,
|
||||
Poc = s.WorkOrderContacts!.Select(c => new ContactReadModel
|
||||
{
|
||||
Id = c.Id,
|
||||
Name = c.POC != null ? (c.POC.FirstName + " " + c.POC.LastName).Trim() : "",
|
||||
Email = c.POC != null ? c.POC.Email : "",
|
||||
Phone = c.POC != null ? c.POC.PhoneNumber : ""
|
||||
}).ToList(),
|
||||
Category = s.WorkOrderCategories!.Select(c => new CategoryReadModel
|
||||
{
|
||||
Id = c.Id,
|
||||
Name = c.Category != null ? c.Category.Name : ""
|
||||
}).ToList(),
|
||||
Attachments = s.workOrderAttachments!.Select(a => new AttachmentReadModel
|
||||
{
|
||||
Id = a.Id,
|
||||
Attachment = a.Attachments
|
||||
}).ToList(),
|
||||
BeforPhotoIssue = s.BeforPhotoIssue,
|
||||
BeforPhotoAttachment = s.BeforPhotoAttachment,
|
||||
AfterPhotoIssue = s.AfterPhotoIssue,
|
||||
AfterPhotoAttachment = s.AfterPhotoAttachment,
|
||||
SignOffName = s.SignOffName,
|
||||
SignOffAttachment = s.SignOffAttachment,
|
||||
SignOffSignature = s.SignOffSignature,
|
||||
Comments = s.Comments!.Select(c => new CommentReadModel
|
||||
{
|
||||
Id = c.Id,
|
||||
CreatedDate = c.CreatedDate,
|
||||
Commenttext = c.Commenttext,
|
||||
Commenter = c.Commenter,
|
||||
RecordType = c.RecordType,
|
||||
CommentType = c.CommentType,
|
||||
Documents = c.Documents,
|
||||
UserName = c.ApplicationUser != null ? c.ApplicationUser.FirstName : ""
|
||||
}).ToList(),
|
||||
Quotes = s.Quotes!.Select(q => new QuoteRefReadModel
|
||||
{
|
||||
Code = q.QuotId,
|
||||
Id = q.Id
|
||||
}).ToList(),
|
||||
AuditLog = _context.WorkOrderAuditLogs
|
||||
.Where(a => a.WorkOrderId == s.Id)
|
||||
.OrderByDescending(a => a.CreatedAt)
|
||||
.Select(a => new AuditLogReadModel
|
||||
{
|
||||
Id = a.Id,
|
||||
FieldName = a.FieldName,
|
||||
OldValue = a.OldValue,
|
||||
NewValue = a.NewValue,
|
||||
Action = a.Action,
|
||||
CreatedAt = a.CreatedAt,
|
||||
UserName = a.User != null ? a.User.FirstName + " " + a.User.LastName : ""
|
||||
}).ToList(),
|
||||
Dispatches = s.Dispatches!.Select(d => new DispatchReadModel
|
||||
{
|
||||
Id = d.Id,
|
||||
DispatchNumber = d.DispatchNumber,
|
||||
PONumber = d.PONumber,
|
||||
NTEAmount = d.NTEAmount,
|
||||
Description = d.Description,
|
||||
Status = d.Status,
|
||||
ScheduledDate = d.ScheduledDate,
|
||||
CompletedDate = d.CompletedDate,
|
||||
DispatchedAt = d.DispatchedAt,
|
||||
EmailSent = d.EmailSent,
|
||||
VendorName = d.Vendor != null ? d.Vendor.CompanyName : "",
|
||||
VendorEmail = d.Vendor != null ? d.Vendor.Email : "",
|
||||
VendorId = d.VendorId
|
||||
}).ToList()
|
||||
}).FirstOrDefaultAsync();
|
||||
}
|
||||
|
||||
public async Task<List<WorkOrder>> GetNonTemplateWorkOrdersWithLocationsAsync()
|
||||
{
|
||||
return await _context.workOrders
|
||||
.Where(w => w.istemplate != true)
|
||||
.Include(w => w.Locations)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
private static string? ExtractZip(string? address)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(address)) return null;
|
||||
var match = System.Text.RegularExpressions.Regex.Match(address, @"\b(\d{5})(?:-\d{4})?\b");
|
||||
return match.Success ? match.Groups[1].Value : null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class WorkOrderFieldLockDataService : IWorkOrderFieldLockDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public WorkOrderFieldLockDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<bool> IsLockedAsync(int workOrderId, string fieldName, CancellationToken cancellationToken)
|
||||
{
|
||||
if (IsTracked(workOrderId, fieldName))
|
||||
return true;
|
||||
|
||||
return await _context.WorkOrderFieldLocks
|
||||
.AnyAsync(l => l.WorkOrderId == workOrderId && l.FieldName == fieldName, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task EnqueueLockAsync(
|
||||
int workOrderId,
|
||||
string fieldName,
|
||||
string? userId,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
if (await IsLockedAsync(workOrderId, fieldName, cancellationToken))
|
||||
return;
|
||||
|
||||
_context.WorkOrderFieldLocks.Add(new WorkOrderFieldLock
|
||||
{
|
||||
WorkOrderId = workOrderId,
|
||||
FieldName = fieldName,
|
||||
LockedAt = DateTime.UtcNow,
|
||||
LockedByUserId = userId
|
||||
});
|
||||
}
|
||||
|
||||
private bool IsTracked(int workOrderId, string fieldName)
|
||||
=> _context.WorkOrderFieldLocks.Local.Any(l =>
|
||||
l.WorkOrderId == workOrderId &&
|
||||
string.Equals(l.FieldName, fieldName, StringComparison.OrdinalIgnoreCase));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class WorkOrderIngestDataService : IWorkOrderIngestDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public WorkOrderIngestDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task<int> GetMaxWorkOrderIdAsync(CancellationToken cancellationToken)
|
||||
=> await _context.workOrders.MaxAsync(w => (int?)w.Id, cancellationToken) ?? 0;
|
||||
|
||||
public Task<WorkOrder?> GetTrackedByExternalIdAsync(string externalWorkOrderId, CancellationToken cancellationToken)
|
||||
=> _context.workOrders.FirstOrDefaultAsync(w => w.ExternalWorkOrderId == externalWorkOrderId, cancellationToken);
|
||||
|
||||
public void TrackWorkOrder(WorkOrder workOrder)
|
||||
=> _context.workOrders.Add(workOrder);
|
||||
|
||||
public Task<Locations?> FindLocationAsync(string name, CancellationToken cancellationToken)
|
||||
=> _context.Locations.FirstOrDefaultAsync(l => l.Name == name || l.Title == name, cancellationToken);
|
||||
|
||||
public async Task AddAndSaveLocationAsync(Locations location, CancellationToken cancellationToken)
|
||||
{
|
||||
_context.Locations.Add(location);
|
||||
await _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
|
||||
public async Task ExecuteTransactionalAsync(Func<CancellationToken, Task> work, CancellationToken cancellationToken)
|
||||
{
|
||||
await using var transaction = _context.Database.IsRelational()
|
||||
? await _context.Database.BeginTransactionAsync(cancellationToken)
|
||||
: null;
|
||||
|
||||
try
|
||||
{
|
||||
await work(cancellationToken);
|
||||
if (transaction is not null)
|
||||
await transaction.CommitAsync(cancellationToken);
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (transaction is not null)
|
||||
await transaction.RollbackAsync(cancellationToken);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
public Task SaveAsync(CancellationToken cancellationToken)
|
||||
=> _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class WorkOrderMediaDataService : IWorkOrderMediaDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public WorkOrderMediaDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public Task<WorkOrder?> GetTrackedWorkOrderAsync(int workOrderId, CancellationToken cancellationToken)
|
||||
=> _context.workOrders.FirstOrDefaultAsync(w => w.Id == workOrderId, cancellationToken);
|
||||
|
||||
public Task<WorkOrderAttachments?> GetTrackedAttachmentAsync(int mediaId, int workOrderId, CancellationToken cancellationToken)
|
||||
=> _context.workOrderAttachments.FirstOrDefaultAsync(
|
||||
a => a.Id == mediaId && a.WorkorderId == workOrderId && a.IsDeleted != true,
|
||||
cancellationToken);
|
||||
|
||||
public void TrackAttachment(WorkOrderAttachments attachment)
|
||||
=> _context.workOrderAttachments.Add(attachment);
|
||||
|
||||
public Task SaveAsync(CancellationToken cancellationToken)
|
||||
=> _context.SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SeaHaven.DataServices.Interfaces;
|
||||
|
||||
namespace SeaHaven.DataServices.Implementation
|
||||
{
|
||||
public class WorkOrderOpsHealthDataService : IWorkOrderOpsHealthDataService
|
||||
{
|
||||
private readonly ApplicationDbContext _context;
|
||||
|
||||
public WorkOrderOpsHealthDataService(ApplicationDbContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public Task<int> CountSyncRejectedSinceAsync(DateTime since, CancellationToken cancellationToken)
|
||||
=> _context.WorkOrderAuditLogs
|
||||
.CountAsync(l => l.Action == "SyncRejected" && l.CreatedAt >= since, cancellationToken);
|
||||
|
||||
public Task<int> CountFieldLocksAsync(CancellationToken cancellationToken)
|
||||
=> _context.WorkOrderFieldLocks.CountAsync(cancellationToken);
|
||||
|
||||
public async Task<DateTime?> GetLastWeekRolledProcessedAtAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
if (!await _context.WorkOrderWeekRolledLedgers.AnyAsync(cancellationToken))
|
||||
return null;
|
||||
|
||||
return await _context.WorkOrderWeekRolledLedgers
|
||||
.MaxAsync(l => (DateTime?)l.ProcessedAt, cancellationToken);
|
||||
}
|
||||
}
|
||||
}
|
||||
14
SeaHaven.DataServices/Interfaces/ICalendarDataService.cs
Normal file
14
SeaHaven.DataServices/Interfaces/ICalendarDataService.cs
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
using Data.SeaHavenIndustries;
|
||||
|
||||
namespace SeaHaven.DataServices.Interfaces
|
||||
{
|
||||
public interface ICalendarDataService
|
||||
{
|
||||
Task<Events?> GetEventByIdAsync(int id, CancellationToken cancellationToken);
|
||||
Task<Events?> GetEventForEditAsync(int id, CancellationToken cancellationToken);
|
||||
Task<Events> AddEventAsync(Events ev, CancellationToken cancellationToken);
|
||||
Task UpdateEventAsync(Events ev, CancellationToken cancellationToken);
|
||||
Task<(IEnumerable<Events> Items, int TotalCount)> GetEventListPagedAsync(int page, int pageSize, string? search, CancellationToken cancellationToken);
|
||||
Task<IEnumerable<Events>> GetEventsForCalendarAsync(DateTime? start, DateTime? end, CancellationToken cancellationToken);
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue