Started refactoring to be compatible with the changed nuget packages and the mooncore changes

MoonlightServers.ApiServer/Http/Controllers/Admin/Nodes/NodesController.cs

@@ -1,13 +1,14 @@
+using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using MoonCore.Extended.Abstractions;
-using MoonCore.Extended.Helpers;
 using Microsoft.AspNetCore.Authorization;
+using MoonCore.Exceptions;
 using MoonCore.Helpers;
 using MoonCore.Models;
 using MoonlightServers.ApiServer.Database.Entities;
+using MoonlightServers.ApiServer.Mappers;
 using MoonlightServers.Shared.Http.Requests.Admin.Nodes;
-using MoonlightServers.Shared.Http.Responses.Admin.NodeAllocations;
 using MoonlightServers.Shared.Http.Responses.Admin.Nodes;
 
 namespace MoonlightServers.ApiServer.Http.Controllers.Admin.Nodes;
@@ -16,57 +17,102 @@ namespace MoonlightServers.ApiServer.Http.Controllers.Admin.Nodes;
 [Route("api/admin/servers/nodes")]
 public class NodesController : Controller
 {
-    private readonly CrudHelper<Node, NodeDetailResponse> CrudHelper;
     private readonly DatabaseRepository<Node> NodeRepository;
 
     public NodesController(
-        CrudHelper<Node, NodeDetailResponse> crudHelper,
         DatabaseRepository<Node> nodeRepository
     )
     {
-        CrudHelper = crudHelper;
         NodeRepository = nodeRepository;
     }
 
     [HttpGet]
     [Authorize(Policy = "permissions:admin.servers.nodes.get")]
-    public async Task<IPagedData<NodeDetailResponse>> Get([FromQuery] int page, [FromQuery] int pageSize)
+    public async Task<IPagedData<NodeResponse>> Get(
+        [FromQuery] [Range(0, int.MaxValue)] int page,
+        [FromQuery] [Range(1, 100)] int pageSize
+    )
     {
-        return await CrudHelper.Get(page, pageSize);
+        var query = NodeRepository
+            .Get();
+
+        var count = await query.CountAsync();
+
+        var items = await query
+            .Skip(page * pageSize)
+            .Take(pageSize)
+            .ToArrayAsync();
+
+        var mappedItems = items
+            .Select(NodeMapper.ToAdminNodeResponse)
+            .ToArray();
+
+        return new PagedData<NodeResponse>()
+        {
+            Items = mappedItems,
+            CurrentPage = page,
+            PageSize = pageSize,
+            TotalItems = count,
+            TotalPages = count == 0 ? 0 : count / pageSize
+        };
     }
 
     [HttpGet("{id:int}")]
     [Authorize(Policy = "permissions:admin.servers.nodes.get")]
-    public async Task<NodeDetailResponse> GetSingle([FromRoute] int id)
+    public async Task<NodeResponse> GetSingle([FromRoute] int id)
     {
-        return await CrudHelper.GetSingle(id);
+        var node = await NodeRepository
+            .Get()
+            .FirstOrDefaultAsync(x => x.Id == id);
+
+        if (node == null)
+            throw new HttpApiException("No node with this id found", 404);
+
+        return NodeMapper.ToAdminNodeResponse(node);
     }
 
     [HttpPost]
     [Authorize(Policy = "permissions:admin.servers.nodes.create")]
-    public async Task<NodeDetailResponse> Create([FromBody] CreateNodeRequest request)
+    public async Task<NodeResponse> Create([FromBody] CreateNodeRequest request)
     {
-        var node = Mapper.Map<Node>(request);
+        var node = NodeMapper.ToNode(request);
 
         node.TokenId = Formatter.GenerateString(6);
         node.Token = Formatter.GenerateString(32);
 
         var finalNode = await NodeRepository.Add(node);
 
-        return CrudHelper.MapToResult(finalNode);
+        return NodeMapper.ToAdminNodeResponse(finalNode);
     }
 
     [HttpPatch("{id:int}")]
     [Authorize(Policy = "permissions:admin.servers.nodes.update")]
-    public async Task<NodeDetailResponse> Update([FromRoute] int id, [FromBody] UpdateNodeRequest request)
+    public async Task<NodeResponse> Update([FromRoute] int id, [FromBody] UpdateNodeRequest request)
     {
-        return await CrudHelper.Update(id, request);
+        var node = await NodeRepository
+            .Get()
+            .FirstOrDefaultAsync(x => x.Id == id);
+
+        if (node == null)
+            throw new HttpApiException("No node with this id found", 404);
+
+        node = NodeMapper.Merge(request, node);
+        await NodeRepository.Update(node);
+
+        return NodeMapper.ToAdminNodeResponse(node);
     }
 
     [HttpDelete("{id:int}")]
     [Authorize(Policy = "permissions:admin.servers.nodes.delete")]
     public async Task Delete([FromRoute] int id)
     {
-        await CrudHelper.Delete(id);
+        var node = await NodeRepository
+            .Get()
+            .FirstOrDefaultAsync(x => x.Id == id);
+
+        if (node == null)
+            throw new HttpApiException("No node with this id found", 404);
+
+        await NodeRepository.Remove(node);
     }
 }