Refactor using statements for clearer layer boundaries

Clean up and reorganize using/import statements across the solution. Remove unnecessary DTO imports from Application and Infrastructure layers, and ensure Contracts DTOs are only referenced in API and BlazorWebApp layers. No business logic is changed; these updates improve code organization, reduce coupling, and clarify architectural separation between layers.

DbFirst.API/Controllers/CatalogsController.cs

@@ -1,6 +1,7 @@
-using DbFirst.Application.Catalogs;
+
 using DbFirst.Application.Catalogs.Commands;
 using DbFirst.Application.Catalogs.Queries;
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 

DbFirst.API/Controllers/LayoutsController.cs

@@ -1,8 +1,8 @@
-using System.Text;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.Layouts;
 using DbFirst.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using DbFirst.Application.Layouts;
+using System.Text;
 
 namespace DbFirst.API.Controllers;
 

DbFirst.API/Controllers/MassDataController.cs

@@ -1,6 +1,6 @@
-using DbFirst.Application.MassData;
 using DbFirst.Application.MassData.Commands;
 using DbFirst.Application.MassData.Queries;
+using DbFirst.Contracts.MassData;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 

DbFirst.API/Dashboards/SqlDashboardStorage.cs

@@ -1,8 +1,8 @@
+using DevExpress.DashboardWeb;
+using Microsoft.Data.SqlClient;
 using System.Data;
 using System.Text;
 using System.Xml.Linq;
-using DevExpress.DashboardWeb;
-using Microsoft.Data.SqlClient;
 
 namespace DbFirst.API.Dashboards;
 

DbFirst.API/DbFirst.API.csproj

@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="AutoMapper" Version="16.1.1" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="DevExpress.AspNetCore.Dashboard" Version="25.2.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.22" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />

DbFirst.Application/Catalogs/CatalogProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using DbFirst.Contracts.Catalogs;
 using DbFirst.Domain.Entities;
 
 namespace DbFirst.Application.Catalogs;

DbFirst.Application/Catalogs/Commands/CreateCatalogCommand.cs

@@ -1,3 +1,4 @@
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 
 namespace DbFirst.Application.Catalogs.Commands;

DbFirst.Application/Catalogs/Commands/CreateCatalogHandler.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.Catalogs;
 using DbFirst.Domain.Entities;
 using MediatR;
 

DbFirst.Application/Catalogs/Commands/UpdateCatalogCommand.cs

@@ -1,3 +1,4 @@
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 
 namespace DbFirst.Application.Catalogs.Commands;

DbFirst.Application/Catalogs/Commands/UpdateCatalogHandler.cs

@@ -1,7 +1,8 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
-using DbFirst.Domain.Entities;
+using DbFirst.Contracts.Catalogs;
 using DbFirst.Domain;
+using DbFirst.Domain.Entities;
 using MediatR;
 
 namespace DbFirst.Application.Catalogs.Commands;

DbFirst.Application/Catalogs/Queries/GetAllCatalogsHandler.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;

DbFirst.Application/Catalogs/Queries/GetAllCatalogsQuery.cs

@@ -1,3 +1,4 @@
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;

DbFirst.Application/Catalogs/Queries/GetCatalogByIdHandler.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;

DbFirst.Application/Catalogs/Queries/GetCatalogByIdQuery.cs

@@ -1,3 +1,4 @@
+using DbFirst.Contracts.Catalogs;
 using MediatR;
 
 namespace DbFirst.Application.Catalogs.Queries;

DbFirst.Application/DbFirst.Application.csproj

@@ -7,14 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="AutoMapper" Version="16.1.1" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
 	<PackageReference Include="MediatR" Version="14.1.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DbFirst.Contracts\DbFirst.Contracts.csproj" />
     <ProjectReference Include="..\DbFirst.Domain\DbFirst.Domain.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Layouts\" />
+  </ItemGroup>
+
 </Project>

DbFirst.Application/DependencyInjection.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using MediatR;
 
 namespace DbFirst.Application;
 
@@ -7,7 +6,7 @@ public static class DependencyInjection
 {
     public static IServiceCollection AddApplication(this IServiceCollection services)
     {
-        services.AddAutoMapper(typeof(DependencyInjection).Assembly);
+        services.AddAutoMapper(cfg => cfg.AddMaps(typeof(DependencyInjection).Assembly));
         services.AddMediatR(cfg =>
     cfg.RegisterServicesFromAssembly(typeof(DependencyInjection).Assembly));
         return services;

DbFirst.Application/Layouts/LayoutDto.cs

@@ -1,9 +0,0 @@
-namespace DbFirst.Application.Layouts;
-
-public class LayoutDto
-{
-    public string LayoutType { get; set; } = string.Empty;
-    public string LayoutKey { get; set; } = string.Empty;
-    public string UserName { get; set; } = string.Empty;
-    public string LayoutData { get; set; } = string.Empty;
-}

DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameCommand.cs

@@ -1,3 +1,4 @@
+using DbFirst.Contracts.MassData;
 using MediatR;
 
 namespace DbFirst.Application.MassData.Commands;

DbFirst.Application/MassData/Commands/UpsertMassDataByCustomerNameHandler.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.MassData;
 using MediatR;
 
 namespace DbFirst.Application.MassData.Commands;

DbFirst.Application/MassData/MassDataProfile.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using DbFirst.Contracts.MassData;
 using DbFirst.Domain.Entities;
 
 namespace DbFirst.Application.MassData;

DbFirst.Application/MassData/MassDataReadDto.cs

@@ -1,12 +0,0 @@
-namespace DbFirst.Application.MassData;
-
-public class MassDataReadDto
-{
-    public int Id { get; set; }
-    public string CustomerName { get; set; } = string.Empty;
-    public decimal Amount { get; set; }
-    public string Category { get; set; } = string.Empty;
-    public bool StatusFlag { get; set; }
-    public DateTime AddedWhen { get; set; }
-    public DateTime? ChangedWhen { get; set; }
-}

DbFirst.Application/MassData/Queries/GetAllMassDataHandler.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.MassData;
 using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;

DbFirst.Application/MassData/Queries/GetAllMassDataQuery.cs

@@ -1,3 +1,4 @@
+using DbFirst.Contracts.MassData;
 using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;

DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameHandler.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using DbFirst.Application.Repositories;
+using DbFirst.Contracts.MassData;
 using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;

DbFirst.Application/MassData/Queries/GetMassDataByCustomerNameQuery.cs

@@ -1,3 +1,4 @@
+using DbFirst.Contracts.MassData;
 using MediatR;
 
 namespace DbFirst.Application.MassData.Queries;

DbFirst.BlazorWebApp/Components/CatalogsGrid.razor

@@ -259,7 +259,7 @@ else
         {
             CatTitle = editModel.CatTitle,
             CatString = editModel.CatString,
-            UpdateProcedure = editModel.UpdateProcedure
+            UpdateProcedure = (CatalogUpdateProcedure)editModel.UpdateProcedure
         };
 
         try

DbFirst.BlazorWebApp/Components/_Imports.razor

@@ -1,21 +1,28 @@
 @using System.Net.Http
 @using System.Net.Http.Json
 @using System.Text.Json
+
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Rendering
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.JSInterop
 @using Microsoft.AspNetCore.SignalR.Client
+@using Microsoft.JSInterop
+@using Microsoft.Extensions.Options
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+
 @using DbFirst.BlazorWebApp
 @using DbFirst.BlazorWebApp.Components
-@using DbFirst.BlazorWebApp.Models
 @using DbFirst.BlazorWebApp.Models.Grid
 @using DbFirst.BlazorWebApp.Services
+@using DbFirst.Contracts.Catalogs
+@using DbFirst.Contracts.Dashboards
+@using DbFirst.Contracts.MassData
+@using DbFirst.Contracts.Layouts
+@using DbFirst.Domain
+
 @using DevExpress.Blazor
 @using DevExpress.DashboardBlazor
 @using DevExpress.DashboardWeb
-@using DevExpress.Data.Filtering
+@using DevExpress.Data.Filtering
-@using Microsoft.Extensions.Options

DbFirst.BlazorWebApp/DbFirst.BlazorWebApp.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -18,4 +18,8 @@
     <Folder Include="wwwroot\images\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\DbFirst.Contracts\DbFirst.Contracts.csproj" />
+  </ItemGroup>
+
 </Project>

DbFirst.BlazorWebApp/Models/CatalogReadDto.cs

@@ -1,12 +0,0 @@
-namespace DbFirst.BlazorWebApp.Models;
-
-public class CatalogReadDto
-{
-    public int Guid { get; set; }
-    public string CatTitle { get; set; } = string.Empty;
-    public string CatString { get; set; } = string.Empty;
-    public string AddedWho { get; set; } = string.Empty;
-    public DateTime AddedWhen { get; set; }
-    public string? ChangedWho { get; set; }
-    public DateTime? ChangedWhen { get; set; }
-}

DbFirst.BlazorWebApp/Models/CatalogWriteDto.cs

@@ -1,8 +0,0 @@
-namespace DbFirst.BlazorWebApp.Models;
-
-public class CatalogWriteDto
-{
-    public string CatTitle { get; set; } = string.Empty;
-    public string CatString { get; set; } = string.Empty;
-    public int UpdateProcedure { get; set; }
-}

DbFirst.BlazorWebApp/Models/MassDataWriteDto.cs

@@ -1,9 +0,0 @@
-namespace DbFirst.BlazorWebApp.Models;
-
-public class MassDataWriteDto
-{
-    public string CustomerName { get; set; } = string.Empty;
-    public decimal Amount { get; set; }
-    public string Category { get; set; } = string.Empty;
-    public bool StatusFlag { get; set; }
-}

DbFirst.BlazorWebApp/Services/BandLayoutService.cs

@@ -1,5 +1,5 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.BlazorWebApp.Models.Grid;
-using DbFirst.BlazorWebApp.Models.Grid;
+using DbFirst.Contracts.Layouts;
 using Microsoft.JSInterop;
 using System.Text.Json;
 

DbFirst.BlazorWebApp/Services/CatalogApiClient.cs

@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.BlazorWebApp.Services;
 

DbFirst.BlazorWebApp/Services/DashboardApiClient.cs

@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Dashboards;
 
 namespace DbFirst.BlazorWebApp.Services;
 

DbFirst.BlazorWebApp/Services/ICatalogApiClient.cs

@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Catalogs;
 
 namespace DbFirst.BlazorWebApp.Services;
 

DbFirst.BlazorWebApp/Services/IDashboardApiClient.cs

@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Dashboards;
 
 namespace DbFirst.BlazorWebApp.Services
 {

DbFirst.BlazorWebApp/Services/ILayoutApiClient.cs

@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Layouts;
 
 namespace DbFirst.BlazorWebApp.Services
 {

DbFirst.BlazorWebApp/Services/IMassDataApiClient.cs

@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.BlazorWebApp.Services
 {

DbFirst.BlazorWebApp/Services/LayoutApiClient.cs

@@ -1,4 +1,4 @@
-using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.Layouts;
 
 namespace DbFirst.BlazorWebApp.Services;
 

DbFirst.BlazorWebApp/Services/MassDataApiClient.cs

@@ -1,4 +1,5 @@
 using DbFirst.BlazorWebApp.Models;
+using DbFirst.Contracts.MassData;
 
 namespace DbFirst.BlazorWebApp.Services;
 

DbFirst.Contracts/Catalogs/CatalogReadDto.cs

@@ -1,4 +1,4 @@
-namespace DbFirst.Application.Catalogs;
+namespace DbFirst.Contracts.Catalogs;
 
 public class CatalogReadDto
 {
@@ -9,4 +9,4 @@ public class CatalogReadDto
     public DateTime AddedWhen { get; set; }
     public string? ChangedWho { get; set; }
     public DateTime? ChangedWhen { get; set; }
-}
+}

DbFirst.Contracts/Catalogs/CatalogWriteDto.cs

@@ -1,10 +1,10 @@
-using DbFirst.Domain;
+using DbFirst.Domain;
 
-namespace DbFirst.Application.Catalogs;
+namespace DbFirst.Contracts.Catalogs;
 
 public class CatalogWriteDto
 {
     public string CatTitle { get; set; } = string.Empty;
     public string CatString { get; set; } = string.Empty;
     public CatalogUpdateProcedure UpdateProcedure { get; set; } = CatalogUpdateProcedure.Update;
-}
+}

DbFirst.Contracts/Dashboards/DashboardInfoDto.cs

@@ -1,7 +1,7 @@
-namespace DbFirst.BlazorWebApp.Models;
+namespace DbFirst.Contracts.Dashboards;
 
 public class DashboardInfoDto
 {
     public string Id { get; set; } = string.Empty;
     public string Name { get; set; } = string.Empty;
-}
+}

DbFirst.Contracts/DbFirst.Contracts.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DbFirst.Domain\DbFirst.Domain.csproj" />
+  </ItemGroup>
+
+</Project>

DbFirst.Contracts/Layouts/LayoutDto.cs

@@ -1,4 +1,4 @@
-namespace DbFirst.BlazorWebApp.Models;
+namespace DbFirst.Contracts.Layouts;
 
 public class LayoutDto
 {
@@ -6,4 +6,4 @@ public class LayoutDto
     public string LayoutKey { get; set; } = string.Empty;
     public string UserName { get; set; } = string.Empty;
     public string LayoutData { get; set; } = string.Empty;
-}
+}

DbFirst.Contracts/Massdata/MassdataReadDto.cs

@@ -1,4 +1,4 @@
-namespace DbFirst.BlazorWebApp.Models;
+namespace DbFirst.Contracts.MassData;
 
 public class MassDataReadDto
 {
@@ -9,4 +9,4 @@ public class MassDataReadDto
     public bool StatusFlag { get; set; }
     public DateTime AddedWhen { get; set; }
     public DateTime? ChangedWhen { get; set; }
-}
+}

DbFirst.Contracts/Massdata/MassdataWriteDto.cs

@@ -1,4 +1,4 @@
-namespace DbFirst.Application.MassData;
+namespace DbFirst.Contracts.MassData;
 
 public class MassDataWriteDto
 {
@@ -6,4 +6,4 @@ public class MassDataWriteDto
     public decimal Amount { get; set; }
     public string Category { get; set; } = string.Empty;
     public bool StatusFlag { get; set; }
-}
+}

DbFirst.Infrastructure/DbFirst.Infrastructure.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
+    <PackageReference Include="AutoMapper" Version="16.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.22" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.22">

DbFirst.Infrastructure/Repositories/CatalogRepository.cs

@@ -1,6 +1,6 @@
+using DbFirst.Application.Repositories;
 using DbFirst.Domain;
 using DbFirst.Domain.Entities;
-using DbFirst.Application.Repositories;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using System.Data;

DbFirst.Infrastructure/Repositories/MassDataRepository.cs

@@ -1,8 +1,8 @@
-using System.Data;
 using DbFirst.Application.Repositories;
 using DbFirst.Domain.Entities;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
+using System.Data;
 
 namespace DbFirst.Infrastructure.Repositories;
 

DbFirst.sln

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbFirst.Domain", "DbFirst.D
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbFirst.BlazorWebApp", "DbFirst.BlazorWebApp\DbFirst.BlazorWebApp.csproj", "{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbFirst.Contracts", "DbFirst.Contracts\DbFirst.Contracts.csproj", "{94FFCA01-9476-49B3-B7D0-5706514E42E4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}.Release|x64.Build.0 = Release|Any CPU
 		{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}.Release|x86.ActiveCfg = Release|Any CPU
 		{FF1D77C4-A13D-43E0-BCE1-C18C01F1767C}.Release|x86.Build.0 = Release|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x64.Build.0 = Debug|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Debug|x86.Build.0 = Debug|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x64.ActiveCfg = Release|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x64.Build.0 = Release|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x86.ActiveCfg = Release|Any CPU
+		{94FFCA01-9476-49B3-B7D0-5706514E42E4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE