Added validation for allocation editor
This commit is contained in:
@@ -2,6 +2,9 @@ using Microsoft.AspNetCore.Http;
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using MoonCore.Extended.Abstractions;
|
using MoonCore.Extended.Abstractions;
|
||||||
|
using MoonCore.Helpers;
|
||||||
|
using Moonlight.ApiServer.App.Attributes;
|
||||||
|
using Moonlight.ApiServer.App.Exceptions;
|
||||||
using Moonlight.ApiServer.App.Helpers;
|
using Moonlight.ApiServer.App.Helpers;
|
||||||
using MoonlightServers.ApiServer.Database.Entities;
|
using MoonlightServers.ApiServer.Database.Entities;
|
||||||
using MoonlightServers.Shared.Http.Requests.Admin.Allocations;
|
using MoonlightServers.Shared.Http.Requests.Admin.Allocations;
|
||||||
@@ -20,6 +23,41 @@ public class NodeAllocationsController : BaseSubCrudController<Node, Allocation,
|
|||||||
PermissionPrefix = "admin.servers.nodes.allocations";
|
PermissionPrefix = "admin.servers.nodes.allocations";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost]
|
||||||
|
[RequirePermission("admin.servers.nodes.allocations.create")]
|
||||||
|
public override async Task<ActionResult<DetailAllocationResponse>> Create(CreateAllocationRequest request)
|
||||||
|
{
|
||||||
|
if (ItemRepository.Get().Any(x => x.IpAddress == request.IpAddress && x.Port == request.Port))
|
||||||
|
throw new ApiException("An allocation with this ip and port already exists", statusCode: 400);
|
||||||
|
|
||||||
|
var item = Mapper.Map<Allocation>(request!);
|
||||||
|
|
||||||
|
Property.Invoke(RootItem).Add(item);
|
||||||
|
RootItemRepository.Update(RootItem);
|
||||||
|
|
||||||
|
var response = Mapper.Map<DetailAllocationResponse>(item);
|
||||||
|
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpPatch("{id}")]
|
||||||
|
[RequirePermission("admin.servers.nodes.allocations.create")]
|
||||||
|
public override async Task<ActionResult<DetailAllocationResponse>> Update(int id, UpdateAllocationRequest request)
|
||||||
|
{
|
||||||
|
var item = LoadItemById(id);
|
||||||
|
|
||||||
|
if (ItemRepository.Get().Any(x => x.IpAddress == request.IpAddress && x.Port == request.Port && x.Id != item.Id))
|
||||||
|
throw new ApiException("An allocation with this ip and port already exists", statusCode: 400);
|
||||||
|
|
||||||
|
var mappedItem = Mapper.Map(item, request!, ignoreNullValues: true);
|
||||||
|
|
||||||
|
ItemRepository.Update(mappedItem);
|
||||||
|
|
||||||
|
var response = Mapper.Map<DetailAllocationResponse>(mappedItem);
|
||||||
|
|
||||||
|
return Ok(response);
|
||||||
|
}
|
||||||
|
|
||||||
protected override IEnumerable<Node> IncludeRelations(IQueryable<Node> items)
|
protected override IEnumerable<Node> IncludeRelations(IQueryable<Node> items)
|
||||||
=> items.Include(x => x.Allocations);
|
=> items.Include(x => x.Allocations);
|
||||||
}
|
}
|
||||||
@@ -15,15 +15,9 @@ namespace MoonlightServers.ApiServer.Http.Controllers.Admin.Nodes;
|
|||||||
[Route("admin/servers/nodes")]
|
[Route("admin/servers/nodes")]
|
||||||
public class NodesController : BaseCrudController<Node, DetailNodeResponse, CreateNodeRequest, DetailNodeResponse, UpdateNodeRequest, DetailNodeResponse>
|
public class NodesController : BaseCrudController<Node, DetailNodeResponse, CreateNodeRequest, DetailNodeResponse, UpdateNodeRequest, DetailNodeResponse>
|
||||||
{
|
{
|
||||||
private DatabaseRepository<Node> NodeRepository;
|
public NodesController(DatabaseRepository<Node> itemRepository) : base(itemRepository)
|
||||||
private DatabaseRepository<Allocation> AllocationRepository;
|
|
||||||
|
|
||||||
public NodesController(DatabaseRepository<Node> itemRepository, DatabaseRepository<Allocation> allocationRepository) : base(itemRepository)
|
|
||||||
{
|
{
|
||||||
PermissionPrefix = "admin.servers.nodes";
|
PermissionPrefix = "admin.servers.nodes";
|
||||||
|
|
||||||
NodeRepository = itemRepository;
|
|
||||||
AllocationRepository = allocationRepository;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
@@ -35,7 +29,7 @@ public class NodesController : BaseCrudController<Node, DetailNodeResponse, Crea
|
|||||||
var node = Mapper.Map<Node>(request);
|
var node = Mapper.Map<Node>(request);
|
||||||
node.Token = Formatter.GenerateString(32);
|
node.Token = Formatter.GenerateString(32);
|
||||||
|
|
||||||
var finalNode = NodeRepository.Add(node);
|
var finalNode = ItemRepository.Add(node);
|
||||||
|
|
||||||
return Ok(Mapper.Map<DetailNodeResponse>(finalNode));
|
return Ok(Mapper.Map<DetailNodeResponse>(finalNode));
|
||||||
}
|
}
|
||||||
@@ -50,7 +44,7 @@ public class NodesController : BaseCrudController<Node, DetailNodeResponse, Crea
|
|||||||
|
|
||||||
item = Mapper.Map(item, request);
|
item = Mapper.Map(item, request);
|
||||||
|
|
||||||
NodeRepository.Update(item);
|
ItemRepository.Update(item);
|
||||||
|
|
||||||
return Ok(Mapper.Map<DetailNodeResponse>(item));
|
return Ok(Mapper.Map<DetailNodeResponse>(item));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
private void OnConfigure(CrudOptions<DetailAllocationResponse, CreateAllocationRequest, UpdateAllocationRequest> options)
|
private void OnConfigure(CrudOptions<DetailAllocationResponse, CreateAllocationRequest, UpdateAllocationRequest> options)
|
||||||
{
|
{
|
||||||
options.Loader = async (page, pageSize)
|
options.Loader = async (page, pageSize)
|
||||||
=> await HttpApiClient.GetJson<PagedResponse<DetailAllocationResponse>>($"admin/servers/nodes/{NodeId}/allocations");
|
=> await HttpApiClient.GetJson<PagedResponse<DetailAllocationResponse>>($"admin/servers/nodes/{NodeId}/allocations?page={page}&pageSize={pageSize}");
|
||||||
|
|
||||||
options.CreateFunction = async request => await HttpApiClient.Post($"admin/servers/nodes/{NodeId}/allocations", request);
|
options.CreateFunction = async request => await HttpApiClient.Post($"admin/servers/nodes/{NodeId}/allocations", request);
|
||||||
options.UpdateFunction = async (request, item) => await HttpApiClient.Patch($"admin/servers/nodes/{NodeId}/allocations/{item.Id}", request);
|
options.UpdateFunction = async (request, item) => await HttpApiClient.Patch($"admin/servers/nodes/{NodeId}/allocations/{item.Id}", request);
|
||||||
|
|||||||
Reference in New Issue
Block a user