claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add InstructionSetDto and update InstructionSetsController to use DTO for instruction set operations

Browse Source
This commit is contained in:
Natalia Portillo
2025-11-14 04:50:12 +00:00
parent cd4aa5767d
commit 356674f51f
2 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Marechai.Data/Dtos/InstructionSetDto.cs Normal file
View File

@@ -0,0 +1,34 @@
/******************************************************************************
// MARECHAI: Master repository of computing history artifacts information
// ----------------------------------------------------------------------------
//
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2003-2021 Natalia Portillo
*******************************************************************************/
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
namespace Marechai.Data.Dtos;
public class InstructionSetDto : BaseDto<int>
{
[JsonPropertyName("name")] [Required] public required string Name { get; set; }
}

45
Marechai.Server/Controllers/InstructionSetsController.cs
View File

@@ -28,6 +28,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Marechai.Data.Dtos;
using Marechai.Database.Models;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -44,25 +45,31 @@ public class InstructionSetsController(MarechaiContext context) : ControllerBase
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public Task<List<InstructionSet>> GetAsync() => context.InstructionSets.OrderBy(e => e.Name)
.Select(e => new InstructionSet
public Task<List<InstructionSetDto>> GetAsync()
{
return context.InstructionSets.OrderBy(e => e.Name)
.Select(e => new InstructionSetDto
{
Name = e.Name,
Id = e.Id
})
.ToListAsync();
}
[HttpGet("{id:int}")]
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public Task<InstructionSet> GetAsync(int id) => context.InstructionSets.Where(e => e.Id == id)
.Select(e => new InstructionSet
public Task<InstructionSetDto> GetAsync(int id)
{
return context.InstructionSets.Where(e => e.Id == id)
.Select(e => new InstructionSetDto
{
Name = e.Name,
Id = e.Id
})
.FirstOrDefaultAsync();
}
[HttpPut("{id:int}")]
[Authorize(Roles = "Admin,UberAdmin")]
@@ -70,14 +77,14 @@ public class InstructionSetsController(MarechaiContext context) : ControllerBase
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
public async Task<ActionResult> UpdateAsync(int id, [FromBody] InstructionSet viewModel)
public async Task<ActionResult> UpdateAsync(int id, [FromBody] InstructionSetDto viewModel)
{
string userId = User.FindFirstValue(ClaimTypes.Sid);
var userId = User.FindFirstValue(ClaimTypes.Sid);
if(userId is null) return Unauthorized();
InstructionSet model = await context.InstructionSets.FindAsync(viewModel.Id);
if (userId is null) return Unauthorized();
var model = await context.InstructionSets.FindAsync(viewModel.Id);
if(model is null) return NotFound();
if (model is null) return NotFound();
model.Name = viewModel.Name;
@@ -91,11 +98,11 @@ public class InstructionSetsController(MarechaiContext context) : ControllerBase
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
public async Task<ActionResult<int>> CreateAsync([FromBody] InstructionSet viewModel)
public async Task<ActionResult<int>> CreateAsync([FromBody] InstructionSetDto viewModel)
{
string userId = User.FindFirstValue(ClaimTypes.Sid);
var userId = User.FindFirstValue(ClaimTypes.Sid);
if(userId is null) return Unauthorized();
if (userId is null) return Unauthorized();
var model = new InstructionSet
{
@@ -116,12 +123,12 @@ public class InstructionSetsController(MarechaiContext context) : ControllerBase
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
public async Task<ActionResult> DeleteAsync(int id)
{
string userId = User.FindFirstValue(ClaimTypes.Sid);
var userId = User.FindFirstValue(ClaimTypes.Sid);
if(userId is null) return Unauthorized();
InstructionSet item = await context.InstructionSets.FindAsync(id);
if (userId is null) return Unauthorized();
var item = await context.InstructionSets.FindAsync(id);
if(item is null) return NotFound();
if (item is null) return NotFound();
context.InstructionSets.Remove(item);
@@ -134,6 +141,8 @@ public class InstructionSetsController(MarechaiContext context) : ControllerBase
[AllowAnonymous]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public bool VerifyUnique(string name) =>
!context.InstructionSets.Any(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
public bool VerifyUnique(string name)
{
return !context.InstructionSets.Any(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
}
}