FEAT: single file commands and queries

src/Content/Backend/Solution/Monaco.Template.Backend.Api/Controllers/CompaniesController.cs

@@ -10,8 +10,7 @@
 using Monaco.Template.Backend.Api.Auth;
 #endif
 using Monaco.Template.Backend.Application.DTOs;
-using Monaco.Template.Backend.Application.Features.Company.Commands;
-using Monaco.Template.Backend.Application.Features.Company.Queries;
+using Monaco.Template.Backend.Application.Features.Company;
 using Monaco.Template.Backend.Common.Api.Application;
 using Monaco.Template.Backend.Common.Api.Application.Enums;
 using Monaco.Template.Backend.Common.Domain.Model;
@@ -34,14 +33,14 @@ public CompaniesController(IMediator mediator)
 	[Authorize(Scopes.CompaniesRead)]
 	#endif
 	public Task<ActionResult<Page<CompanyDto>>> Get() =>
-		_mediator.ExecuteQueryAsync(new GetCompanyPageQuery(Request.Query));
+		_mediator.ExecuteQueryAsync(new GetCompanyPage.Query(Request.Query));
 
 	[HttpGet("{id:guid}")]
 	#if (!disableAuth)
 	[Authorize(Scopes.CompaniesRead)]
 	#endif
 	public Task<ActionResult<CompanyDto?>> Get(Guid id) =>
-		_mediator.ExecuteQueryAsync(new GetCompanyByIdQuery(id));
+		_mediator.ExecuteQueryAsync(new GetCompanyById.Query(id));
 
 	[HttpPost]
 	#if (!disableAuth)
@@ -67,6 +66,6 @@ public Task<IActionResult> Put(Guid id, [FromBody] CompanyCreateEditDto dto) =>
 	[Authorize(Scopes.CompaniesWrite)]
 	#endif
 	public Task<IActionResult> Delete(Guid id) =>
-		_mediator.ExecuteCommandAsync(new CompanyDeleteCommand(id),
+		_mediator.ExecuteCommandAsync(new DeleteCompany.Command(id),
 									  ModelState);
 }

src/Content/Backend/Solution/Monaco.Template.Backend.Api/Controllers/CountriesController.cs

@@ -1,7 +1,7 @@
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using Monaco.Template.Backend.Application.DTOs;
-using Monaco.Template.Backend.Application.Features.Country.Queries;
+using Monaco.Template.Backend.Application.Features.Country;
 using Monaco.Template.Backend.Common.Api.Application;
 
 namespace Monaco.Template.Backend.Api.Controllers;
@@ -23,7 +23,7 @@ public CountriesController(IMediator mediator)
 	/// <returns></returns>
 	[HttpGet]
 	public Task<ActionResult<List<CountryDto>>> Get() =>
-		_mediator.ExecuteQueryAsync(new GetCountryListQuery(Request.Query));
+		_mediator.ExecuteQueryAsync(new GetCountryList.Query(Request.Query));
 
 	/// <summary>
 	/// Gets a country by Id
@@ -32,5 +32,5 @@ public Task<ActionResult<List<CountryDto>>> Get() =>
 	/// <returns></returns>
 	[HttpGet("{id:guid}")]
 	public Task<ActionResult<CountryDto?>> Get(Guid id) =>
-		_mediator.ExecuteQueryAsync(new GetCountryByIdQuery(id));
+		_mediator.ExecuteQueryAsync(new GetCountryById.Query(id));
 }

src/Content/Backend/Solution/Monaco.Template.Backend.Api/Controllers/FilesController.cs

@@ -2,9 +2,8 @@
 #if (!disableAuth)
 using Monaco.Template.Backend.Api.Auth;
 #endif
-using Monaco.Template.Backend.Application.Features.File.Commands;
 using Monaco.Template.Backend.Application.DTOs;
-using Monaco.Template.Backend.Application.Features.File.Queries;
+using Monaco.Template.Backend.Application.Features.File;
 using Monaco.Template.Backend.Common.Api.Application;
 using MediatR;
 #if (!disableAuth)
@@ -32,7 +31,7 @@ public FilesController(IMediator mediator)
 	[Authorize(Scopes.FilesWrite)]
 	#endif
 	public Task<ActionResult<Guid>> Post([FromRoute] ApiVersion apiVersion, [FromForm] IFormFile file) =>
-		_mediator.ExecuteCommandAsync(new FileCreateCommand(file.OpenReadStream(), file.FileName, file.ContentType),
+		_mediator.ExecuteCommandAsync(new CreateFile.Command(file.OpenReadStream(), file.FileName, file.ContentType),
 									 ModelState,
 									 "api/v{0}/files/{1}",
 									 apiVersion);
@@ -42,7 +41,7 @@ public Task<ActionResult<Guid>> Post([FromRoute] ApiVersion apiVersion, [FromFor
 	[Authorize(Scopes.FilesRead)]
 	#endif
 	public Task<ActionResult<FileDto>> Get(Guid id) =>
-		_mediator.ExecuteQueryAsync(new GetFileByIdQuery(id));
+		_mediator.ExecuteQueryAsync(new GetFileById.Query(id));
 
 	[HttpGet("{id:guid}/Download")]
 	#if (!disableAuth)
@@ -52,7 +51,7 @@ public Task<ActionResult<FileDto>> Get(Guid id) =>
 	[ProducesResponseType((int)HttpStatusCode.NotFound)]
 	public async Task<IActionResult> Download(Guid id)
 	{
-		var result = await _mediator.Send(new DownloadFileByIdQuery(id));
+		var result = await _mediator.Send(new DownloadFileById.Query(id));
 
 		if (result == null)
 			return NotFound();
@@ -65,7 +64,7 @@ public async Task<IActionResult> Download(Guid id)
 	[Authorize(Scopes.FilesWrite)]
 	#endif
 	public Task<IActionResult> Delete(Guid id) =>
-		_mediator.ExecuteCommandAsync(new FileDeleteCommand(id),
+		_mediator.ExecuteCommandAsync(new DeleteFile.Command(id),
 									 ModelState);
 }
 #endif

src/Content/Backend/Solution/Monaco.Template.Backend.Api/Controllers/ImagesController.cs

@@ -3,8 +3,8 @@
 using Monaco.Template.Backend.Api.Auth;
 #endif
 using Monaco.Template.Backend.Application.DTOs;
-using Monaco.Template.Backend.Application.Features.File.Queries;
-using Monaco.Template.Backend.Application.Features.Image.Queries;
+using Monaco.Template.Backend.Application.Features.File;
+using Monaco.Template.Backend.Application.Features.Image;
 using MediatR;
 #if (!disableAuth)
 using Microsoft.AspNetCore.Authorization;
@@ -31,14 +31,14 @@ public ImagesController(IMediator mediator)
 	[Authorize(Scopes.FilesRead)]
 	#endif
 	public Task<ActionResult<ImageDto>> Get(Guid id) =>
-		_mediator.ExecuteQueryAsync(new GetImageByIdQuery(id));
+		_mediator.ExecuteQueryAsync(new GetImageById.Query(id));
 
 	[HttpGet("{id:guid}/Thumbnail")]
 	#if (!disableAuth)
 	[Authorize(Scopes.FilesRead)]
 	#endif
 	public Task<ActionResult<ImageDto>> GetThumbnail(Guid id) =>
-		_mediator.ExecuteQueryAsync(new GetThumbnailByImageIdQuery(id));
+		_mediator.ExecuteQueryAsync(new GetThumbnailByImageId.Query(id));
 
 	[HttpGet("{id:guid}/Download")]
 	#if (!disableAuth)
@@ -48,7 +48,7 @@ public Task<ActionResult<ImageDto>> GetThumbnail(Guid id) =>
 	[ProducesResponseType((int)HttpStatusCode.NotFound)]
 	public async Task<IActionResult> Download(Guid id)
 	{
-		var result = await _mediator.Send(new DownloadFileByIdQuery(id));
+		var result = await _mediator.Send(new DownloadFileById.Query(id));
 
 		if (result is null)
 			return NotFound();
@@ -64,7 +64,7 @@ public async Task<IActionResult> Download(Guid id)
 	[ProducesResponseType((int)HttpStatusCode.NotFound)]
 	public async Task<IActionResult> DownloadThumbnail(Guid id)
 	{
-		var result = await _mediator.Send(new DownloadThumbnailByImageIdQuery(id));
+		var result = await _mediator.Send(new DownloadThumbnailByImageId.Query(id));
 
 		if (result is null)
 			return NotFound();

src/Content/Backend/Solution/Monaco.Template.Backend.Api/DTOs/Extensions/CompanyExtensions.cs

@@ -1,10 +1,10 @@
-using Monaco.Template.Backend.Application.Features.Company.Commands;
+using Monaco.Template.Backend.Application.Features.Company;
 
 namespace Monaco.Template.Backend.Api.DTOs.Extensions;
 
 public static class CompanyExtensions
 {
-	public static CompanyCreateCommand MapCreateCommand(this CompanyCreateEditDto value) =>
+	public static CreateCompany.Command MapCreateCommand(this CompanyCreateEditDto value) =>
 		new(value.Name!,
 			value.Email!,
 			value.WebSiteUrl!,
@@ -14,7 +14,7 @@ public static CompanyCreateCommand MapCreateCommand(this CompanyCreateEditDto va
 			value.PostCode,
 			value.CountryId);
 
-	public static CompanyEditCommand MapEditCommand(this CompanyCreateEditDto value, Guid id) =>
+	public static EditCompany.Command MapEditCommand(this CompanyCreateEditDto value, Guid id) =>
 		new(id,
 			value.Name!,
 			value.Email!,