diff --git a/src/ReC.API/Controllers/RecActionController.cs b/src/ReC.API/Controllers/RecActionController.cs
index 3880f77..780e719 100644
--- a/src/ReC.API/Controllers/RecActionController.cs
+++ b/src/ReC.API/Controllers/RecActionController.cs
@@ -42,7 +42,7 @@ public class RecActionController(IMediator mediator) : ControllerBase
/// An HTTP 201 Created response.
[HttpPost]
[ProducesResponseType(StatusCodes.Status201Created)]
- public async Task Create([FromBody] InsertActionProcedure command, CancellationToken cancel)
+ public async Task Create([FromBody] InsertActionCommand command, CancellationToken cancel)
{
await mediator.Send(command, cancel);
@@ -57,7 +57,7 @@ public class RecActionController(IMediator mediator) : ControllerBase
/// No content on success.
[HttpPut("{id:long}")]
[ProducesResponseType(StatusCodes.Status204NoContent)]
- public async Task Update([FromBody] UpdateActionProcedure procedure, CancellationToken cancel)
+ public async Task Update([FromBody] UpdateActionCommand procedure, CancellationToken cancel)
{
await mediator.Send(procedure, cancel);
return NoContent();
@@ -71,7 +71,7 @@ public class RecActionController(IMediator mediator) : ControllerBase
/// An HTTP 204 No Content response upon successful deletion.
[HttpDelete]
[ProducesResponseType(StatusCodes.Status204NoContent)]
- public async Task Delete([FromBody] DeleteActionProcedure procedure, CancellationToken cancel)
+ public async Task Delete([FromBody] DeleteActionCommand 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 ccf3f33..6b00b96 100644
--- a/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs
+++ b/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs
@@ -24,7 +24,7 @@ public record InsertObjectProcedure : IRequest
//TODO: update to set in authentication middleware or similar, and remove from procedure properties
internal string? AddedWho { get; private set; } = "ReC.API";
- public InsertActionProcedure Action { get; set; } = new();
+ public InsertActionCommand Action { get; set; } = new();
public InsertEndpointCommand Endpoint { get; set; } = new();
public InsertEndpointAuthCommand EndpointAuth { get; set; } = new();
public InsertProfileCommand Profile { get; set; } = new();
diff --git a/src/ReC.Application/RecActions/Commands/DeleteActionProcedure.cs b/src/ReC.Application/RecActions/Commands/DeleteActionCommand.cs
similarity index 81%
rename from src/ReC.Application/RecActions/Commands/DeleteActionProcedure.cs
rename to src/ReC.Application/RecActions/Commands/DeleteActionCommand.cs
index 4875a20..bb5da83 100644
--- a/src/ReC.Application/RecActions/Commands/DeleteActionProcedure.cs
+++ b/src/ReC.Application/RecActions/Commands/DeleteActionCommand.cs
@@ -3,7 +3,7 @@ using ReC.Application.Common.Procedures.DeleteProcedure;
namespace ReC.Application.RecActions.Commands;
-public record DeleteActionProcedure : IDeleteProcedure
+public record DeleteActionCommand : IDeleteProcedure
{
///
/// Start GUID/ID (inclusive)
@@ -21,9 +21,9 @@ public record DeleteActionProcedure : IDeleteProcedure
public bool Force { get; set; }
}
-public class DeleteActionProcedureHandler(ISender sender) : IRequestHandler
+public class DeleteActionProcedureHandler(ISender sender) : IRequestHandler
{
- public async Task Handle(DeleteActionProcedure request, CancellationToken cancel)
+ public async Task Handle(DeleteActionCommand request, CancellationToken cancel)
{
return await sender.Send(new DeleteObjectProcedure
{
diff --git a/src/ReC.Application/RecActions/Commands/InsertActionProcedure.cs b/src/ReC.Application/RecActions/Commands/InsertActionCommand.cs
similarity index 83%
rename from src/ReC.Application/RecActions/Commands/InsertActionProcedure.cs
rename to src/ReC.Application/RecActions/Commands/InsertActionCommand.cs
index ee3fbba..255409e 100644
--- a/src/ReC.Application/RecActions/Commands/InsertActionProcedure.cs
+++ b/src/ReC.Application/RecActions/Commands/InsertActionCommand.cs
@@ -4,7 +4,7 @@ using ReC.Domain.Constants;
namespace ReC.Application.RecActions.Commands;
-public record InsertActionProcedure : IInsertProcedure
+public record InsertActionCommand : IInsertProcedure
{
public long? ProfileId { get; set; }
public bool? Active { get; set; }
@@ -21,9 +21,9 @@ public record InsertActionProcedure : IInsertProcedure
public byte? ErrorActionId { get; set; }
}
-public class InsertActionProcedureHandler(ISender sender) : IRequestHandler
+public class InsertActionProcedureHandler(ISender sender) : IRequestHandler
{
- public async Task Handle(InsertActionProcedure request, CancellationToken cancel)
+ public async Task Handle(InsertActionCommand request, CancellationToken cancel)
{
return await sender.Send(new InsertObjectProcedure
{
diff --git a/src/ReC.Application/RecActions/Commands/UpdateActionProcedure.cs b/src/ReC.Application/RecActions/Commands/UpdateActionCommand.cs
similarity index 72%
rename from src/ReC.Application/RecActions/Commands/UpdateActionProcedure.cs
rename to src/ReC.Application/RecActions/Commands/UpdateActionCommand.cs
index 8b3ec59..51be35d 100644
--- a/src/ReC.Application/RecActions/Commands/UpdateActionProcedure.cs
+++ b/src/ReC.Application/RecActions/Commands/UpdateActionCommand.cs
@@ -4,16 +4,16 @@ using ReC.Application.Common.Procedures.UpdateProcedure.Dto;
namespace ReC.Application.RecActions.Commands;
-public record UpdateActionProcedure : IUpdateProcedure
+public record UpdateActionCommand : IUpdateProcedure
{
public long Id { get; set; }
public UpdateActionDto Data { get; set; } = null!;
}
-public class UpdateActionProcedureHandler(ISender sender) : IRequestHandler
+public class UpdateActionProcedureHandler(ISender sender) : IRequestHandler
{
- public async Task Handle(UpdateActionProcedure request, CancellationToken cancel)
+ public async Task Handle(UpdateActionCommand request, CancellationToken cancel)
{
return await sender.Send(new UpdateObjectProcedure
{
diff --git a/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs b/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs
index fb06661..53d16bb 100644
--- a/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs
+++ b/tests/ReC.Tests/Application/RecActions/RecActionProcedureTests.cs
@@ -25,7 +25,7 @@ public class RecActionProcedureTests : RecApplicationTestBase
{
try
{
- var procedure = new InsertActionProcedure { ProfileId = 1, Active = true, Sequence = 1, EndpointId = 1 };
+ var procedure = new InsertActionCommand { ProfileId = 1, Active = true, Sequence = 1, EndpointId = 1 };
var (sender, scope) = CreateScopedSender();
using var _ = scope;
@@ -53,7 +53,7 @@ public class RecActionProcedureTests : RecApplicationTestBase
[Test]
public async Task UpdateActionProcedure_runs_via_mediator()
{
- var procedure = new UpdateActionProcedure { Data = { ProfileId = 2, Active = false, Sequence = 2 }, Id = 35 };
+ var procedure = new UpdateActionCommand { Data = { ProfileId = 2, Active = false, Sequence = 2 }, Id = 35 };
var (sender, scope) = CreateScopedSender();
using var _ = scope;
@@ -65,7 +65,7 @@ public class RecActionProcedureTests : RecApplicationTestBase
[Test]
public async Task DeleteActionProcedure_runs_via_mediator()
{
- var procedure = new DeleteActionProcedure { Start = 7, End = 8, Force = true };
+ var procedure = new DeleteActionCommand { Start = 7, End = 8, Force = true };
var (sender, scope) = CreateScopedSender();
using var _ = scope;