Refactor CompaniesBySoftwareVariantController routes and method signatures for improved clarity and consistency

This commit is contained in:
2025-11-13 20:44:57 +00:00
parent e171b8ddd8
commit 8d6c382754

View File

@@ -36,15 +36,15 @@ using Microsoft.EntityFrameworkCore;
namespace Marechai.Server.Controllers; namespace Marechai.Server.Controllers;
[Route("/companies-by-software-variant")] [Route("/software/variants/companies")]
[ApiController] [ApiController]
public class CompaniesBySoftwareVariantController(MarechaiContext context) : ControllerBase public class CompaniesBySoftwareVariantController(MarechaiContext context) : ControllerBase
{ {
[HttpGet] [HttpGet("/software/variants/{softwareVariantId:ulong}/companies")]
[AllowAnonymous] [AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)] [ProducesResponseType(StatusCodes.Status400BadRequest)]
public async Task<List<CompanyBySoftwareVariantDto>> GetBySoftwareVariant(ulong softwareVariantId) => await context public Task<List<CompanyBySoftwareVariantDto>> GetBySoftwareVariant(ulong softwareVariantId) => context
.CompaniesBySoftwareVariants.Where(p => p.SoftwareVariantId == softwareVariantId) .CompaniesBySoftwareVariants.Where(p => p.SoftwareVariantId == softwareVariantId)
.Select(p => new CompanyBySoftwareVariantDto .Select(p => new CompanyBySoftwareVariantDto
{ {
@@ -59,7 +59,7 @@ public class CompaniesBySoftwareVariantController(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 CompaniesBySoftwareVariantController(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();
CompaniesBySoftwareVariant item = await context.CompaniesBySoftwareVariants.FindAsync(id); CompaniesBySoftwareVariant item = await context.CompaniesBySoftwareVariants.FindAsync(id);
if(item is null) return NotFound(); if(item is null) return NotFound();
@@ -86,7 +87,7 @@ public class CompaniesBySoftwareVariantController(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 softwareVariantId, string roleId) public async Task<ActionResult<ulong>> CreateAsync([FromBody] CompanyBySoftwareVariantDto dto)
{ {
string userId = User.FindFirstValue(ClaimTypes.Sid); string userId = User.FindFirstValue(ClaimTypes.Sid);
@@ -94,9 +95,9 @@ public class CompaniesBySoftwareVariantController(MarechaiContext context) : Con
var item = new CompaniesBySoftwareVariant var item = new CompaniesBySoftwareVariant
{ {
CompanyId = companyId, CompanyId = dto.CompanyId,
SoftwareVariantId = softwareVariantId, SoftwareVariantId = dto.SoftwareVariantId,
RoleId = roleId RoleId = dto.RoleId
}; };
await context.CompaniesBySoftwareVariants.AddAsync(item); await context.CompaniesBySoftwareVariants.AddAsync(item);