refactor: move handlers and new nesting on the example of 2 endpoints from ItemsControlller to Application folder

Api/Controllers/ItemTypesController.cs

@@ -2,6 +2,7 @@
 using Api.Requests;
 using Api.Responses;
 using Application.Commands;
+using Application.Features.Dtos;
 using Application.Queries;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

Api/Features/Items/ItemsController.cs → Api/Controllers/ItemsController.cs

@@ -1,12 +1,13 @@
 using System.ComponentModel.DataAnnotations;
-using Api.Features.Items.CreateItem;
-using Api.Features.Items.GetAllItems;
+using Api.ExternalDeps.EmployeesApi;
 using Application.Commands;
+using Application.Features.Items.CreateItem;
+using Application.Features.Items.GetAllItems;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using TourmalineCore.AspNetCore.JwtAuthentication.Core.Filters;
 
-namespace Api.Features.Items;
+namespace Api.Controllers;
 
 [Authorize]
 [ApiController]
@@ -18,11 +19,14 @@ public class ItemsController : ControllerBase
     /// </summary>
     [RequiresPermission(UserClaimsProvider.CanViewItems)]
     [HttpGet]
-    public Task<GetAllItemsResponse> GetAllItemsAsync(
-        [FromServices] GetAllItemsHandler getAllItemsHandler
+    public async Task<GetAllItemsResponse> GetAllItemsAsync(
+        [FromServices] GetAllItemsHandler getAllItemsHandler,
+        [FromServices] EmployeesApi employeesApi
     )
     {
-        return getAllItemsHandler.HandleAsync();
+        var allEmployeesResponse = await employeesApi.GetAllEmployeesAsync();
+
+        return await getAllItemsHandler.HandleAsync(allEmployeesResponse);
     }
 
     /// <summary>

Api/DependencyInjection.cs

@@ -1,8 +1,8 @@
 using Api.ExternalDeps.EmployeesApi;
-using Api.Features.Items.CreateItem;
-using Api.Features.Items.GetAllItems;
 using Application;
 using Application.Commands;
+using Application.Features.Items.CreateItem;
+using Application.Features.Items.GetAllItems;
 using Application.Queries;
 using Microsoft.EntityFrameworkCore;
 
@@ -35,7 +35,6 @@ public static void AddApplication(this IServiceCollection services, IConfigurati
         services.AddTransient<HardDeleteItemTypeCommand>();
         services.AddTransient<AllItemTypesQuery>();
 
-        services.AddTransient<CreateItemCommand>();
         services.AddTransient<AllItemsQuery>();
         services.AddTransient<HardDeleteItemCommand>();
 

Api/ExternalDeps/EmployeesApi/EmployeesApi.cs

@@ -1,4 +1,4 @@
-using Api.ExternalDeps.EmployeesApi.Responses;
+using Application.ExternalDeps.EmployeesApi;
 using Microsoft.Extensions.Options;
 using TourmalineCore.AspNetCore.JwtAuthentication.Core.Options;
 

Api/Responses/ItemTypesResponse.cs

@@ -1,4 +1,6 @@
-namespace Api.Responses;
+using Application.Features.Dtos;
+
+namespace Api.Responses;
 
 public class ItemTypesResponse
 {

Api/ExternalDeps/EmployeesApi/Responses/EmployeesResponse.cs → Application/ExternalDeps/EmployeesApi/EmployeesResponse.cs

@@ -1,4 +1,4 @@
-namespace Api.ExternalDeps.EmployeesApi.Responses;
+namespace Application.ExternalDeps.EmployeesApi;
 
 public class EmployeesResponse
 {

Api/Responses/ItemTypeDto.cs → Application/Features/Dtos/ItemTypeDto.cs

@@ -1,4 +1,4 @@
-namespace Api.Responses;
+namespace Application.Features.Dtos;
 
 public class ItemTypeDto
 {

Application/Features/Items/CreateItem/CreateItemHandler.cs

@@ -0,0 +1,54 @@
+using Core.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace Application.Features.Items.CreateItem;
+
+public class CreateItemHandler
+{
+    private readonly TenantAppDbContext _context;
+    private readonly IClaimsProvider _claimsProvider;
+
+    public CreateItemHandler(
+        TenantAppDbContext context,
+        IClaimsProvider claimsProvider
+    )
+    {
+        _context = context;
+        _claimsProvider = claimsProvider;
+    }
+
+    public async Task<CreateItemResponse> HandleAsync(CreateItemRequest createItemRequest)
+    {
+        var itemTypeIdDoesNotExistWithinTenant = await _context
+            .QueryableWithinTenant<ItemType>()
+            .AllAsync(x => x.Id != createItemRequest.ItemTypeId);
+
+        if (itemTypeIdDoesNotExistWithinTenant)
+        {
+            throw new Exception($"Passed item type where id={createItemRequest.ItemTypeId} is not found within tenant where id={_claimsProvider.TenantId}");
+        }
+
+        var item = new Item
+        {
+            TenantId = _claimsProvider.TenantId,
+            Name = createItemRequest.Name,
+            SerialNumber = createItemRequest.SerialNumber,
+            ItemTypeId = createItemRequest.ItemTypeId,
+            Price = createItemRequest.Price,
+            Description = createItemRequest.Description,
+            PurchaseDate = createItemRequest.PurchaseDate,
+            HolderEmployeeId = createItemRequest.HolderEmployeeId
+        };
+
+        await _context
+            .Items
+            .AddAsync(item);
+
+        await _context.SaveChangesAsync();
+
+        return new CreateItemResponse()
+        {
+            NewItemId = item.Id
+        };
+    }
+}

Api/Features/Items/CreateItem/CreateItemRequest.cs → Application/Features/Items/CreateItem/CreateItemRequest.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Api.Features.Items.CreateItem;
+namespace Application.Features.Items.CreateItem;
 
 public class CreateItemRequest
 {

Api/Features/Items/CreateItem/CreateItemResponse.cs → Application/Features/Items/CreateItem/CreateItemResponse.cs

@@ -1,4 +1,4 @@
-namespace Api.Features.Items.CreateItem;
+namespace Application.Features.Items.CreateItem;
 
 public class CreateItemResponse
 {

Api/Features/Items/GetAllItems/GetAllItemsHandler.cs → Application/Features/Items/GetAllItems/GetAllItemsHandler.cs

@@ -1,29 +1,26 @@
-using Api.ExternalDeps.EmployeesApi;
-using Api.Responses;
+using Application.ExternalDeps.EmployeesApi;
+using Application.Features.Dtos;
 using Application.Queries;
 
-namespace Api.Features.Items.GetAllItems;
+namespace Application.Features.Items.GetAllItems;
 
 public class GetAllItemsHandler
 {
     private readonly AllItemsQuery _allItemsQuery;
-    private readonly EmployeesApi _employeesApi;
+
+    public const string NotFoundEmployeeFullName = "Not Found";
 
     public GetAllItemsHandler(
-        AllItemsQuery allItemsQuery,
-        EmployeesApi employeesApi
+        AllItemsQuery allItemsQuery
     )
     {
         _allItemsQuery = allItemsQuery;
-        _employeesApi = employeesApi;
     }
 
-    public async Task<GetAllItemsResponse> HandleAsync()
+    public async Task<GetAllItemsResponse> HandleAsync(EmployeesResponse allEmployeesResponse)
     {
         var items = await _allItemsQuery.GetAsync();
 
-        var allEmployeesResponse = await _employeesApi.GetAllEmployeesAsync();
-
         return new GetAllItemsResponse
         {
             Items = items
@@ -40,7 +37,16 @@ public async Task<GetAllItemsResponse> HandleAsync()
                     Price = x.Price,
                     Description = x.Description,
                     PurchaseDate = x.PurchaseDate,
-                    HolderEmployee = HolderEmployeeMapper.MapToEmployeeDto(x.HolderEmployeeId, allEmployeesResponse)
+                    HolderEmployee = x.HolderEmployeeId == null
+                        ? null
+                        : new EmployeeDto
+                        {
+                            Id = x.HolderEmployeeId.Value,
+                            FullName = allEmployeesResponse
+                                .Employees
+                                .SingleOrDefault(y => y.Id == x.HolderEmployeeId.Value)
+                                ?.FullName ?? NotFoundEmployeeFullName
+                        }
                 })
                 .ToList()
         };

Api/Features/Items/GetAllItems/GetAllItemsResponse.cs → Application/Features/Items/GetAllItems/GetAllItemsResponse.cs

@@ -1,6 +1,6 @@
-using Api.Responses;
+using Application.Features.Dtos;
 
-namespace Api.Features.Items.GetAllItems;
+namespace Application.Features.Items.GetAllItems;
 
 public class GetAllItemsResponse
 {

README.md

@@ -1,9 +1,9 @@
 # inner-circle-items-api
 
 <!-- auto-generated -->
-[![coverage](https://img.shields.io/badge/e2e_coverage-82.22%25-olivedrab)](https://github.com/TourmalineCore/inner-circle-items-api/actions/workflows/calculate-tests-coverage-on-pull-request.yml)
-[![coverage](https://img.shields.io/badge/units_coverage-17.34%25-crimson)](https://github.com/TourmalineCore/inner-circle-items-api/actions/workflows/calculate-tests-coverage-on-pull-request.yml)
-[![coverage](https://img.shields.io/badge/full_coverage-89.96%25-olivedrab)](https://github.com/TourmalineCore/inner-circle-items-api/actions/workflows/calculate-tests-coverage-on-pull-request.yml)
+[![coverage](https://img.shields.io/badge/e2e_coverage-82.47%25-olivedrab)](https://github.com/TourmalineCore/inner-circle-items-api/actions/workflows/calculate-tests-coverage-on-pull-request.yml)
+[![coverage](https://img.shields.io/badge/units_coverage-15.80%25-crimson)](https://github.com/TourmalineCore/inner-circle-items-api/actions/workflows/calculate-tests-coverage-on-pull-request.yml)
+[![coverage](https://img.shields.io/badge/full_coverage-89.59%25-olivedrab)](https://github.com/TourmalineCore/inner-circle-items-api/actions/workflows/calculate-tests-coverage-on-pull-request.yml)
 <!-- auto-generated -->
 
 This repo contains Inner Circle Items API.