Refactor CompaniesBySoftwareVersionController routes and method signatures for improved clarity and consistency

This commit is contained in:
2025-11-13 20:46:34 +00:00
parent 8d6c382754
commit baaf571505

View File

@@ -36,15 +36,15 @@ using Microsoft.EntityFrameworkCore;
namespace Marechai.Server.Controllers; namespace Marechai.Server.Controllers;
[Route("/companies-by-software-version")] [Route("/software/versions/companies")]
[ApiController] [ApiController]
public class CompaniesBySoftwareVersionController(MarechaiContext context) : ControllerBase public class CompaniesBySoftwareVersionController(MarechaiContext context) : ControllerBase
{ {
[HttpGet] [HttpGet("/software/versions/{softwareVersionId:ulong}/companies")]
[AllowAnonymous] [AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status400BadRequest)]
public async Task<List<CompanyBySoftwareVersionDto>> GetBySoftwareVersion(ulong softwareVersionId) => await context public Task<List<CompanyBySoftwareVersionDto>> GetBySoftwareVersion(ulong softwareVersionId) => context
.CompaniesBySoftwareVersions.Where(p => p.SoftwareVersionId == softwareVersionId) .CompaniesBySoftwareVersions.Where(p => p.SoftwareVersionId == softwareVersionId)
.Select(p => new CompanyBySoftwareVersionDto .Select(p => new CompanyBySoftwareVersionDto
{ {
@@ -59,7 +59,7 @@ public class CompaniesBySoftwareVersionController(MarechaiContext context) : Con
.ThenBy(p => p.Role) .ThenBy(p => p.Role)
.ToListAsync(); .ToListAsync();
[HttpDelete] [HttpDelete("{id:ulong}")]
[Authorize(Roles = "Admin,UberAdmin")] [Authorize(Roles = "Admin,UberAdmin")]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status400BadRequest)]
@@ -70,6 +70,7 @@ public class CompaniesBySoftwareVersionController(MarechaiContext context) : Con
string userId = User.FindFirstValue(ClaimTypes.Sid); string userId = User.FindFirstValue(ClaimTypes.Sid);
if(userId is null) return Unauthorized(); if(userId is null) return Unauthorized();
CompaniesBySoftwareVersion item = await context.CompaniesBySoftwareVersions.FindAsync(id); CompaniesBySoftwareVersion item = await context.CompaniesBySoftwareVersions.FindAsync(id);
if(item is null) return NotFound(); if(item is null) return NotFound();
@@ -86,7 +87,7 @@ public class CompaniesBySoftwareVersionController(MarechaiContext context) : Con
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status401Unauthorized)]
public async Task<ActionResult<ulong>> CreateAsync(int companyId, ulong softwareVersionId, string roleId) public async Task<ActionResult<ulong>> CreateAsync([FromBody] CompanyBySoftwareVersionDto dto)
{ {
string userId = User.FindFirstValue(ClaimTypes.Sid); string userId = User.FindFirstValue(ClaimTypes.Sid);
@@ -94,9 +95,9 @@ public class CompaniesBySoftwareVersionController(MarechaiContext context) : Con
var item = new CompaniesBySoftwareVersion var item = new CompaniesBySoftwareVersion
{ {
CompanyId = companyId, CompanyId = dto.CompanyId,
SoftwareVersionId = softwareVersionId, SoftwareVersionId = dto.SoftwareVersionId,
RoleId = roleId RoleId = dto.RoleId
}; };
await context.CompaniesBySoftwareVersions.AddAsync(item); await context.CompaniesBySoftwareVersions.AddAsync(item);