diff --git a/src/ReC.API/Controllers/ResultController.cs b/src/ReC.API/Controllers/ResultController.cs index c5448fb..b2a27d3 100644 --- a/src/ReC.API/Controllers/ResultController.cs +++ b/src/ReC.API/Controllers/ResultController.cs @@ -30,7 +30,7 @@ public class ResultController(IMediator mediator) : ControllerBase /// The created RESULT identifier. [HttpPost] [ProducesResponseType(StatusCodes.Status201Created)] - public async Task Post([FromBody] InsertResultProcedure procedure, CancellationToken cancel) + public async Task Post([FromBody] InsertResultCommand procedure, CancellationToken cancel) { var id = await mediator.Send(procedure, cancel); return CreatedAtAction(nameof(Get), new { actionId = procedure.ActionId }, new { id, procedure.ActionId }); @@ -44,7 +44,7 @@ public class ResultController(IMediator mediator) : ControllerBase /// No content on success. [HttpPut] [ProducesResponseType(StatusCodes.Status204NoContent)] - public async Task Put([FromBody] UpdateResultProcedure procedure, CancellationToken cancel) + public async Task Put([FromBody] UpdateResultCommand procedure, CancellationToken cancel) { await mediator.Send(procedure, cancel); return NoContent(); @@ -58,7 +58,7 @@ public class ResultController(IMediator mediator) : ControllerBase /// No content on success. [HttpDelete] [ProducesResponseType(StatusCodes.Status204NoContent)] - public async Task Delete([FromBody] DeleteResultProcedure procedure, CancellationToken cancel) + public async Task Delete([FromBody] DeleteResultCommand procedure, CancellationToken cancel) { await mediator.Send(procedure, cancel); return NoContent(); diff --git a/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs b/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs index 6b00b96..4f61af5 100644 --- a/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs +++ b/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs @@ -28,7 +28,7 @@ public record InsertObjectProcedure : IRequest public InsertEndpointCommand Endpoint { get; set; } = new(); public InsertEndpointAuthCommand EndpointAuth { get; set; } = new(); public InsertProfileCommand Profile { get; set; } = new(); - public InsertResultProcedure Result { get; set; } = new(); + public InsertResultCommand Result { get; set; } = new(); public InsertEndpointParamsCommand EndpointParams { get; set; } = new(); } diff --git a/src/ReC.Application/RecActions/Commands/InvokeRecActionViewCommand.cs b/src/ReC.Application/RecActions/Commands/InvokeRecActionViewCommand.cs index f252a8e..2cf7b89 100644 --- a/src/ReC.Application/RecActions/Commands/InvokeRecActionViewCommand.cs +++ b/src/ReC.Application/RecActions/Commands/InvokeRecActionViewCommand.cs @@ -148,7 +148,7 @@ public class InvokeRecActionViewCommandHandler( var statusCode = (short)response.StatusCode; - await sender.Send(new InsertResultProcedure() + await sender.Send(new InsertResultCommand() { StatusId = statusCode, ActionId = action.Id, diff --git a/src/ReC.Application/Results/Commands/DeleteResultProcedure.cs b/src/ReC.Application/Results/Commands/DeleteResultCommand.cs similarity index 81% rename from src/ReC.Application/Results/Commands/DeleteResultProcedure.cs rename to src/ReC.Application/Results/Commands/DeleteResultCommand.cs index 098f15f..c5fca0f 100644 --- a/src/ReC.Application/Results/Commands/DeleteResultProcedure.cs +++ b/src/ReC.Application/Results/Commands/DeleteResultCommand.cs @@ -3,7 +3,7 @@ using ReC.Application.Common.Procedures.DeleteProcedure; namespace ReC.Application.Results.Commands; -public record DeleteResultProcedure : IDeleteProcedure +public record DeleteResultCommand : IDeleteProcedure { /// /// Start GUID/ID (inclusive) @@ -21,9 +21,9 @@ public record DeleteResultProcedure : IDeleteProcedure public bool Force { get; set; } } -public class DeleteResultProcedureHandler(ISender sender) : IRequestHandler +public class DeleteResultProcedureHandler(ISender sender) : IRequestHandler { - public async Task Handle(DeleteResultProcedure request, CancellationToken cancel) + public async Task Handle(DeleteResultCommand request, CancellationToken cancel) { return await sender.Send(new DeleteObjectProcedure { diff --git a/src/ReC.Application/Results/Commands/InsertResultProcedure.cs b/src/ReC.Application/Results/Commands/InsertResultCommand.cs similarity index 75% rename from src/ReC.Application/Results/Commands/InsertResultProcedure.cs rename to src/ReC.Application/Results/Commands/InsertResultCommand.cs index 4904488..8df27c5 100644 --- a/src/ReC.Application/Results/Commands/InsertResultProcedure.cs +++ b/src/ReC.Application/Results/Commands/InsertResultCommand.cs @@ -3,7 +3,7 @@ using ReC.Application.Common.Procedures.InsertProcedure; namespace ReC.Application.Results.Commands; -public record InsertResultProcedure : IInsertProcedure +public record InsertResultCommand : IInsertProcedure { public long? ActionId { get; set; } public short? StatusId { get; set; } @@ -13,9 +13,9 @@ public record InsertResultProcedure : IInsertProcedure public string? Error { get; set; } } -public class InsertResultProcedureHandler(ISender sender) : IRequestHandler +public class InsertResultProcedureHandler(ISender sender) : IRequestHandler { - public async Task Handle(InsertResultProcedure request, CancellationToken cancel) + public async Task Handle(InsertResultCommand request, CancellationToken cancel) { return await sender.Send(new InsertObjectProcedure { diff --git a/src/ReC.Application/Results/Commands/UpdateResultProcedure.cs b/src/ReC.Application/Results/Commands/UpdateResultCommand.cs similarity index 72% rename from src/ReC.Application/Results/Commands/UpdateResultProcedure.cs rename to src/ReC.Application/Results/Commands/UpdateResultCommand.cs index caddf75..5847b4a 100644 --- a/src/ReC.Application/Results/Commands/UpdateResultProcedure.cs +++ b/src/ReC.Application/Results/Commands/UpdateResultCommand.cs @@ -4,16 +4,16 @@ using ReC.Application.Common.Procedures.UpdateProcedure.Dto; namespace ReC.Application.Results.Commands; -public record UpdateResultProcedure : IUpdateProcedure +public record UpdateResultCommand : IUpdateProcedure { public long Id { get; set; } public UpdateResultDto Data { get; set; } = null!; } -public class UpdateResultProcedureHandler(ISender sender) : IRequestHandler +public class UpdateResultProcedureHandler(ISender sender) : IRequestHandler { - public async Task Handle(UpdateResultProcedure request, CancellationToken cancel) + public async Task Handle(UpdateResultCommand request, CancellationToken cancel) { return await sender.Send(new UpdateObjectProcedure { diff --git a/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs b/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs index 3b30633..d5b2aa7 100644 --- a/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs +++ b/tests/ReC.Tests/Application/Results/ResultProcedureTests.cs @@ -23,7 +23,7 @@ public class ResultProcedureTests : RecApplicationTestBase [Test] public async Task InsertResultProcedure_runs_via_mediator() { - var procedure = new InsertResultProcedure { ActionId = 1, StatusId = 200, Header = "h", Body = "b" }; + var procedure = new InsertResultCommand { ActionId = 1, StatusId = 200, Header = "h", Body = "b" }; var (sender, scope) = CreateScopedSender(); using var _ = scope; @@ -35,7 +35,7 @@ public class ResultProcedureTests : RecApplicationTestBase [Test] public async Task UpdateResultProcedure_runs_via_mediator() { - var procedure = new UpdateResultProcedure { Data = { ActionId = 2, StatusId = 500, Header = "h2", Body = "b2" }, Id = 55 }; + var procedure = new UpdateResultCommand { Data = { ActionId = 2, StatusId = 500, Header = "h2", Body = "b2" }, Id = 55 }; var (sender, scope) = CreateScopedSender(); using var _ = scope; @@ -47,7 +47,7 @@ public class ResultProcedureTests : RecApplicationTestBase [Test] public async Task DeleteResultProcedure_runs_via_mediator() { - var procedure = new DeleteResultProcedure { Start = 11, End = 12, Force = false }; + var procedure = new DeleteResultCommand { Start = 11, End = 12, Force = false }; var (sender, scope) = CreateScopedSender(); using var _ = scope;