feat: создана структура проекта, core, domain, infrastructure. Перенесены enum и task согласно архитектуры

PARR.API.sln

@@ -96,6 +96,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.TemplateUpdater", "PAR
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.DAL.IntegrationTests", "PARR.DAL.IntegrationTests\PARR.DAL.IntegrationTests.csproj", "{D1C65DB8-77BC-00FD-5BA1-6C7303FD093C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.Core", "PARR.Core\PARR.Core.csproj", "{E93DFC30-9886-486A-9F67-F782ABE0D1E0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.Domain", "PARR.Domain\PARR.Domain.csproj", "{3740461A-7235-4C26-81F3-3977529D646D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.Infrastructure", "PARR.Infrastructure\PARR.Infrastructure.csproj", "{8EB3BC72-2EFA-48AA-A305-C28ABEDB03AD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -268,6 +274,18 @@ Global
 		{D1C65DB8-77BC-00FD-5BA1-6C7303FD093C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D1C65DB8-77BC-00FD-5BA1-6C7303FD093C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1C65DB8-77BC-00FD-5BA1-6C7303FD093C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E93DFC30-9886-486A-9F67-F782ABE0D1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E93DFC30-9886-486A-9F67-F782ABE0D1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E93DFC30-9886-486A-9F67-F782ABE0D1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E93DFC30-9886-486A-9F67-F782ABE0D1E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3740461A-7235-4C26-81F3-3977529D646D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3740461A-7235-4C26-81F3-3977529D646D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3740461A-7235-4C26-81F3-3977529D646D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3740461A-7235-4C26-81F3-3977529D646D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EB3BC72-2EFA-48AA-A305-C28ABEDB03AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EB3BC72-2EFA-48AA-A305-C28ABEDB03AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EB3BC72-2EFA-48AA-A305-C28ABEDB03AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EB3BC72-2EFA-48AA-A305-C28ABEDB03AD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

PARR.API/Contracts/V1/Requests/AgentHistoryRequest.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Requests
 {

PARR.API/Contracts/V1/Requests/JobAutoControlRequest.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Requests
 {

PARR.API/Contracts/V1/Requests/Queries/RobotHistoryQuery.cs

@@ -1,5 +1,5 @@
 using PARR.Constants;
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Requests.Queries
 {

PARR.API/Contracts/V1/Requests/Queries/StatRobotHistoryQuery.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Requests.Queries
 {

PARR.API/Contracts/V1/Requests/Queries/TemplateHistoryQuery.cs

@@ -1,4 +1,4 @@
-using PARR.Constants;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Requests.Queries
 {

PARR.API/Contracts/V1/Requests/RobotHistoryRequest.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Requests
 {

PARR.API/Contracts/V1/Requests/RobotTaskChangeRobotStatusRequest.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Requests
 {

PARR.API/Contracts/V1/Responses/JobGroupTypeResponse.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Contracts.V1.Responses
 {

PARR.API/Controllers/V1/DistributorController.cs

@@ -9,10 +9,9 @@ using PARR.API.Services.Interfaces;
 using PARR.API.Settings;
 using PARR.BLL.Domain.Mq;
 using PARR.BLL.Services.Interfaces;
-using PARR.Common.Domain;
 using PARR.Constants;
-using System.Text.Encodings.Web;
+using PARR.Domain.Entities.Base.History;
-using System.Text.Json;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/GeneratorTemplateController.cs

@@ -9,9 +9,9 @@ using PARR.API.Services.Interfaces;
 using PARR.API.Settings;
 using PARR.BLL.Domain.Mq;
 using PARR.BLL.Services.Interfaces;
-using PARR.Common.Domain;
 using PARR.Constants;
-using System.Text.Json;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/JobController.cs

@@ -15,10 +15,7 @@ using PARR.API.Settings;
 using PARR.BLL.Domain.Mq;
 using PARR.BLL.Helpers;
 using PARR.BLL.Services.Interfaces;
-using PARR.Common.Domain;
 using PARR.Constants;
-using PARR.DAL.Cache.Services;
-using PARR.DAL.Contracts;
 using PARR.DAL.DomainModels;
 using PARR.DAL.DomainServices.Interfaces;
 using PARR.DAL.DomainServices.UnitFilterService;
@@ -27,7 +24,8 @@ using PARR.DAL.Models.Job;
 using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Job;
 using PARR.DAL.Services.Interfaces.Unit;
-using System.Text.Json;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/JobGroupController.cs

@@ -15,9 +15,7 @@ using PARR.API.Settings;
 using PARR.BLL.Domain.Mq;
 using PARR.BLL.Helpers;
 using PARR.BLL.Services.Interfaces;
-using PARR.Common.Domain;
 using PARR.Constants;
-using PARR.DAL.Contracts;
 using PARR.DAL.DomainModels;
 using PARR.DAL.DomainServices.Interfaces;
 using PARR.DAL.Models;
@@ -25,6 +23,8 @@ using PARR.DAL.Models.Job;
 using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Job;
 using PARR.DAL.Services.Interfaces.Schedule;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/JobGroupUpdateNextRunController.cs

@@ -7,10 +7,10 @@ using PARR.API.Controllers.V1.Base;
 using PARR.API.Settings;
 using PARR.BLL.Domain.Mq;
 using PARR.BLL.Services.Interfaces;
-using PARR.Common.Domain;
 using PARR.Constants;
 using PARR.DAL.Services.Interfaces.Job;
-using Serilog.Core;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/RobotTaskController.cs

@@ -9,7 +9,6 @@ using PARR.API.Contracts.V1.Responses.Base;
 using PARR.API.Controllers.V1.Base;
 using PARR.API.Services.Interfaces;
 using PARR.BLL.Helpers;
-using PARR.Common.Domain;
 using PARR.Constants;
 using PARR.DAL.Contracts;
 using PARR.DAL.DomainServices.Shortcodes;
@@ -17,6 +16,8 @@ using PARR.DAL.Models;
 using PARR.DAL.NextRunServices;
 using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Schedule;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs

@@ -12,6 +12,7 @@ using PARR.Constants;
 using PARR.DAL.Contracts;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/Statistics/StatRobotTaskController.cs

@@ -11,6 +11,7 @@ using PARR.API.Controllers.V1.Base;
 using PARR.Constants;
 using PARR.DAL.Contracts;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1.Statistics
 {

PARR.API/Controllers/V1/Statistics/StatTemplateAutoControlController.cs

@@ -9,6 +9,7 @@ using PARR.API.Helpers;
 using PARR.Constants;
 using PARR.DAL.NextRunServices;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1.Statistics
 {
@@ -50,7 +51,7 @@ namespace PARR.API.Controllers.V1.Statistics
 
             var templates = await templateService.Get()
                .Where(t =>
-                        t.InitiatorParrComponentId == Constants.ParrComponentsEnum.JobAutoControl
+                        t.InitiatorParrComponentId == ParrComponentsEnum.JobAutoControl
                         &&
                         ((
                             // измененные
@@ -87,7 +88,7 @@ namespace PARR.API.Controllers.V1.Statistics
                     //&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
                     t.DateCreated.UtcDateTime >= utcStartPeriod
                     && t.DateCreated.UtcDateTime <= utcEndPeriod
-                    && t.TemplateHistories.Any(x => x.InitiatorParrComponentId == Constants.ParrComponentsEnum.JobAutoControl)
+                    && t.TemplateHistories.Any(x => x.InitiatorParrComponentId == ParrComponentsEnum.JobAutoControl)
                 )
                 .ToListAsync();
 
@@ -97,14 +98,14 @@ namespace PARR.API.Controllers.V1.Statistics
                         x.InitiatorComment != null
                         && !x.InitiatorComment.Contains(TemplateActivatorActionsEnum.ActivateAllForAutoControl.ToString())
                         && !x.InitiatorComment.Contains(TemplateActivatorActionsEnum.DeactivateAllForAutoControl.ToString())
-                        && x.InitiatorParrComponentId == Constants.ParrComponentsEnum.JobAutoControl
+                        && x.InitiatorParrComponentId == ParrComponentsEnum.JobAutoControl
                         )).ToList();
             //TODO: createdTemplatesAndMoveToHistory - возможно тут ошибка. Не убираются дубли шаблонов из template
             #endregion
 
             var history = await templateHistoryService.Get()
                             .Where(t =>
-                                    t.InitiatorParrComponentId == Constants.ParrComponentsEnum.JobAutoControl
+                                    t.InitiatorParrComponentId == ParrComponentsEnum.JobAutoControl
                                     && t.DateModified.HasValue
                                     //&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
                                     //&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date

PARR.API/Controllers/V1/Statistics/StatTemplateController.cs

@@ -11,6 +11,7 @@ using PARR.Constants;
 using PARR.DAL.Contracts;
 using PARR.DAL.NextRunServices;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1.Statistics
 {

PARR.API/Controllers/V1/SyncTaskController.cs

@@ -7,11 +7,9 @@ using PARR.API.Services.Interfaces;
 using PARR.API.Settings;
 using PARR.BLL.Domain.Mq;
 using PARR.BLL.Services.Interfaces;
-using PARR.Common.Domain;
-using PARR.Constants;
-using PARR.DAL.Cache.Services;
 using PARR.DAL.DomainServices.Interfaces;
-using System.Text.Json;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/TemplateActivatorController.cs

@@ -9,10 +9,10 @@ using PARR.API.Services.Interfaces;
 using PARR.API.Settings;
 using PARR.BLL.Domain.Mq;
 using PARR.BLL.Services.Interfaces;
-using PARR.Common.Domain;
 using PARR.Constants;
 using PARR.DAL.Services.Interfaces.Job;
-using System.Text.Json;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/TemplateController.cs

@@ -11,7 +11,6 @@ using PARR.API.Controllers.V1.Base;
 using PARR.API.Extensions;
 using PARR.API.Services.Interfaces;
 using PARR.BLL.Helpers;
-using PARR.Common.Domain;
 using PARR.Constants;
 using PARR.DAL.Contracts;
 using PARR.DAL.DomainModels;
@@ -19,6 +18,8 @@ using PARR.DAL.DomainServices.Shortcodes;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Schedule;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/TemplateSyncStateController.cs

@@ -9,6 +9,7 @@ using PARR.API.Controllers.V1.Base;
 using PARR.Constants;
 using PARR.DAL.Contracts;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/Controllers/V1/WorkGroupController.cs

@@ -13,6 +13,7 @@ using PARR.DAL.Contracts;
 using PARR.DAL.DomainModels;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Controllers.V1
 {

PARR.API/MappingProfiles/DomainToResponseProfile.cs

@@ -2,12 +2,12 @@
 using PARR.API.Authentication.Models;
 using PARR.API.Contracts.V1.Responses;
 using PARR.API.MappingProfiles.Resolvers;
-using PARR.Common.Domain;
 using PARR.DAL.DomainModels;
 using PARR.DAL.Models;
 using PARR.DAL.Models.Job;
 using PARR.DAL.Models.Schedule;
 using PARR.DAL.Models.Unit;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.API.MappingProfiles
 {

PARR.API/MappingProfiles/Resolvers/HistoryInitiatorParrComponentResolver.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1.Responses;
-using PARR.Common.Domain;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.API.MappingProfiles.Resolvers
 {

PARR.API/MappingProfiles/Resolvers/HistoryInitiatorUserResolver.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1.Responses;
-using PARR.Common.Domain;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.API.MappingProfiles.Resolvers
 {

PARR.API/PARR.API.csproj

@@ -35,7 +35,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\PARR.BLL\PARR.BLL.csproj" />
+    <ProjectReference Include="..\PARR.Core\PARR.Core.csproj" />
     <ProjectReference Include="..\PARR.DAL\PARR.DAL.csproj" />
+    <ProjectReference Include="..\PARR.Infrastructure\PARR.Infrastructure.csproj" />
   </ItemGroup>
 
 </Project>

PARR.API/Program.cs

@@ -4,7 +4,9 @@ using Microsoft.AspNetCore.HttpOverrides;
 using PARR.API.Authentication;
 using PARR.API.Installers;
 using PARR.BLL;
+using PARR.Core;
 using PARR.DAL;
+using PARR.Infrastructure;
 using Serilog;
 using System.Reflection;
 
@@ -22,6 +24,8 @@ builder.Host.UseSerilog((context, config) =>
 
 // Add services to the container.
 builder.Services.InstallDalServices(builder.Configuration);
+builder.Services.AddCoreServices(builder.Configuration);
+builder.Services.AddInfrastructureServices(builder.Configuration);
 builder.Services.InstallBllServices(builder.Configuration);
 builder.Services.InstallApiServices(builder.Configuration);
 builder.Services.InstallSettings(builder.Configuration);

PARR.API/Settings/MqSettings.cs

@@ -1,5 +1,5 @@
 using PARR.BLL.Contracts.Interfaces;
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Settings
 {

PARR.API/Validators/AgentHistoryRequestValidator.cs

@@ -1,6 +1,6 @@
 using FluentValidation;
 using PARR.API.Contracts.V1.Requests;
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Validators
 {

PARR.API/Validators/JobAutoControlRequestValidator.cs

@@ -1,6 +1,6 @@
 using FluentValidation;
 using PARR.API.Contracts.V1.Requests;
-using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Validators
 {

PARR.API/Validators/JobGroupValidator.cs

@@ -7,6 +7,7 @@ using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Job;
 using PARR.DAL.Services.Interfaces.Schedule;
 using PARR.DAL.Services.Interfaces.Unit;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Validators
 {

PARR.API/Validators/RobotHistoryRequestValidator.cs

@@ -1,6 +1,7 @@
 using FluentValidation;
 using PARR.API.Contracts.V1.Requests;
 using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Validators
 {

PARR.API/Validators/TemplateRobotStatusRequestValidator.cs

@@ -1,6 +1,7 @@
 using FluentValidation;
 using PARR.API.Contracts.V1.Requests;
 using PARR.DAL.Contracts;
+using PARR.Domain.Enums;
 
 namespace PARR.API.Validators
 {

PARR.BLL/Domain/Mq/GeneratorTemplateMq.cs

@@ -1,4 +1,4 @@
-using PARR.Common.Domain;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.BLL.Domain.Mq
 {

PARR.BLL/Domain/Mq/NextRunUpdateMq.cs

@@ -1,4 +1,4 @@
-using PARR.Common.Domain;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.BLL.Domain.Mq
 {

PARR.BLL/Domain/Mq/TemplateActivatorMq.cs

@@ -1,5 +1,5 @@
-using PARR.Common.Domain;
+using PARR.Constants;
-using PARR.Constants;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.BLL.Domain.Mq
 {

PARR.BLL/Domain/Mq/TemplateDistributorMq.cs

@@ -1,4 +1,4 @@
-using PARR.Common.Domain;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.BLL.Domain.Mq
 {

PARR.BLL/Domain/Mq/TemplateGeneratorMq.cs

@@ -1,4 +1,4 @@
-using PARR.Common.Domain;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.BLL.Domain.Mq
 {

PARR.BLL/Domain/Mq/TemplateMatcherMq.cs

@@ -1,5 +1,5 @@
-using PARR.Common.Domain;
+using PARR.Constants;
-using PARR.Constants;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.BLL.Domain.Mq
 {

PARR.BLL/Domain/Mq/TemplateUpdaterMq.cs

@@ -1,5 +1,5 @@
-using PARR.Common.Domain;
+using PARR.Constants;
-using PARR.Constants;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.BLL.Domain.Mq
 {

PARR.BLL/PARR.BLL.csproj

@@ -18,6 +18,7 @@
   <ItemGroup>
     <ProjectReference Include="..\PARR.Common\PARR.Common.csproj" />
     <ProjectReference Include="..\PARR.Constants\PARR.Constants.csproj" />
+    <ProjectReference Include="..\PARR.Domain\PARR.Domain.csproj" />
   </ItemGroup>
 
 </Project>

PARR.Common/DateResolver.cs

@@ -1,5 +1,7 @@
 namespace PARR.Common
 {
+    //TODO:!!! Удалить этот класс !!!
+
     /// <summary>
     /// Даты и часовые пояса 
     /// </summary>

PARR.Core/DependencyInjection.cs

@@ -0,0 +1,44 @@
+using FluentValidation;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace PARR.Core
+{
+    public static class DependencyInjection
+    {
+
+        /// <summary>
+        /// Регистрация Core (BLL) сервисов
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="configuration"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddCoreServices(this IServiceCollection services, IConfiguration configuration)
+        {
+            // Регим профили AutoMapper
+            services.AddBllMapping();
+
+            // Регим все валидаторы в Core
+            services.AddValidatorsFromAssembly(typeof(DependencyInjection).Assembly, includeInternalTypes: true);
+
+            // Регистрируем сревисы Core
+            //services.AddScoped<IUserService, UserService>();
+
+            return services;
+        }
+
+
+        private static IServiceCollection AddBllMapping(this IServiceCollection services)
+        {
+            // AutoMapper
+            services.AddAutoMapper(cfg =>
+            {
+                // регим все в Core
+                cfg.AddMaps(typeof(DependencyInjection).Assembly);
+            });
+
+            return services;
+        }
+
+    }
+}

PARR.Core/PARR.Core.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="Infrastructure\" />
+    <Folder Include="Common\" />
+    <Folder Include="Services\" />
+    <Folder Include="Repositories\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.5.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PARR.Domain\PARR.Domain.csproj" />
+  </ItemGroup>
+
+</Project>

PARR.DAL.IntegrationTests/TestDataGenerator.cs

@@ -2,6 +2,7 @@
 using PARR.DAL.Contracts;
 using PARR.DAL.Models.Job;
 using PARR.DAL.Models.Unit;
+using PARR.Domain.Enums;
 using System;
 using System.Collections.Generic;
 using System.Text;

PARR.DAL.Tests/TestDataGenerator.cs

@@ -3,6 +3,7 @@ using PARR.DAL.Context;
 using PARR.DAL.Contracts;
 using PARR.DAL.Models.Job;
 using PARR.DAL.Models.Unit;
+using PARR.Domain.Enums;
 using System;
 using System.Collections.Generic;
 using System.Linq;

PARR.DAL.Tests/TransformServices/EsppScheduleTransformServiceTests.cs

@@ -1,10 +1,10 @@
 using Microsoft.Extensions.Logging;
 using Moq;
-using PARR.DAL.Contracts;
 using PARR.DAL.DomainModels;
 using PARR.DAL.Models;
 using PARR.DAL.NextRunServices.Subservices;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.DAL.Tests.TransformServices
 {

PARR.DAL/Context/DataContext.cs

@@ -6,8 +6,9 @@ using PARR.DAL.Extensions;
 using PARR.DAL.Models;
 using PARR.DAL.Models.Job;
 using PARR.DAL.Models.Schedule;
-using PARR.DAL.Models.TaskModels;
 using PARR.DAL.Models.Unit;
+using PARR.Domain.Entities.TaskEntities;
+using PARR.Domain.Enums;
 
 namespace PARR.DAL.Context
 {
@@ -121,7 +122,7 @@ namespace PARR.DAL.Context
         #region Tasks
 
         public DbSet<TaskItem> Tasks { get; set; }
-        public DbSet<Models.TaskModels.TaskStatus> TaskStatus { get; set; }
+        public DbSet<Domain.Entities.TaskEntities.TaskStatus> TaskStatus { get; set; }
         public DbSet<TaskType> TaskTypes { get; set; }
         public DbSet<TaskError> TaskErrors { get; set; }
 
@@ -581,9 +582,9 @@ namespace PARR.DAL.Context
 
             #region TaskStatus
 
-            modelBuilder.Entity<PARR.DAL.Models.TaskModels.TaskStatus>(f =>
+            modelBuilder.Entity<Domain.Entities.TaskEntities.TaskStatus>(f =>
             {
-                f.HasData(new PARR.DAL.Models.TaskModels.TaskStatus[]
+                f.HasData(new Domain.Entities.TaskEntities.TaskStatus[]
                 {
                     new(){Code=TaskItemStatusEnum.Pending, Name=TaskItemStatusEnum.Pending.ToString(), Description="Ожидание"},
                     new(){Code=TaskItemStatusEnum.Processing, Name=TaskItemStatusEnum.Processing.ToString(), Description="В работе"},

PARR.DAL/DomainServices/Shortcodes/ShortcodesService.cs

@@ -11,6 +11,7 @@ using PARR.DAL.Models.Job;
 using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Job;
 using PARR.DAL.Services.Interfaces.Unit;
+using PARR.Domain.Enums;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 

PARR.DAL/DomainServices/UnitFilterService/UnitFilterService.cs

@@ -9,6 +9,7 @@ using PARR.DAL.Models.Job;
 using PARR.DAL.Models.Unit;
 using PARR.DAL.Services.Interfaces.Job;
 using PARR.DAL.Services.Interfaces.Unit;
+using PARR.Domain.Enums;
 using System.Diagnostics;
 
 namespace PARR.DAL.DomainServices.UnitFilterService;

PARR.DAL/Models/AgentHistory.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
     /// История работы агентов
     /// </summary>
     [Table("AgentHistories")]
-    public class AgentHistory : IBase
+    public class AgentHistory : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Application.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
 {
     [Table("Applications")]
     [Index(nameof(Name), nameof(ApplicationTypeId), IsUnique = true)]
-    public class Application : IBase
+    public class Application : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/ApplicationInHost.cs

@@ -1,10 +1,10 @@
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models
 {
     [Table("ApplicationsInHost")]
-    public class ApplicationInHost : IBase
+    public class ApplicationInHost : IBaseEntity
     {
         public Guid Id { get; set; }
         public DateTimeOffset DateCreated { get; set; }

PARR.DAL/Models/ApplicationType.cs

@@ -1,10 +1,10 @@
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models
 {
     [Table("ApplicationTypes")]
-    public class ApplicationType : IBase
+    public class ApplicationType : IBaseEntity
     {
         public Guid Id { get; set; }
         public DateTimeOffset DateCreated { get; set; }

PARR.DAL/Models/ApplicationsInWork.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
 using PARR.DAL.Settings;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
 {
     [Table("ApplicationsInWorks")]
     [Index(nameof(WorkId), nameof(ApplicationId), IsUnique = true)]
-    public class ApplicationsInWork : IBase
+    public class ApplicationsInWork : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Base/IBase.cs

@@ -1,11 +0,0 @@
-namespace PARR.DAL.Models.Base
-{
-    public interface IBase: IBaseDateCreated, IBaseDateModified
-    {
-        Guid Id { get; set; }
-
-        //DateTimeOffset DateCreated { get; set; }
-
-        //DateTimeOffset? DateModified { get; set; }
-    }
-}

PARR.DAL/Models/Base/IBaseDateCreated.cs

@@ -1,7 +0,0 @@
-namespace PARR.DAL.Models.Base
-{
-    public interface IBaseDateCreated
-    {
-        DateTimeOffset DateCreated { get; set; }
-    }
-}

PARR.DAL/Models/Base/IBaseDateModified.cs

@@ -1,7 +0,0 @@
-namespace PARR.DAL.Models.Base
-{
-    public interface IBaseDateModified
-    {
-        DateTimeOffset? DateModified { get; set; }
-    }
-}

PARR.DAL/Models/DistributionPeriod.cs

@@ -1,7 +1,6 @@
-using PARR.Constants;
+using PARR.DAL.Context;
-using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
 using PARR.DAL.Models.Job;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -11,7 +10,7 @@ namespace PARR.DAL.Models
     /// Период автоматического распеделения РР
     /// </summary>
     [Table("DistributionPeriods", Schema = DataContextSettings.Schedule)]
-    public class DistributionPeriod : IBase
+    public class DistributionPeriod : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/EsppSchTypeConfig.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -11,7 +11,7 @@ namespace PARR.DAL.Models
     /// </summary>
     [Table("EsppSchTypeConfigs", Schema = DataContextSettings.Schedule)]
     [Index(nameof(TypeScheduleId), nameof(TypeId), IsUnique = true)]
-    public class EsppSchTypeConfig : IBase
+    public class EsppSchTypeConfig : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/EsppSchTypeValue.cs

@@ -1,5 +1,5 @@
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models
     /// Расписание ЕСПП: значения типов повторений
     /// </summary>
     [Table("EsppSchTypeValues", Schema = DataContextSettings.Schedule)]
-    public class EsppSchTypeValue : IBase
+    public class EsppSchTypeValue : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Host.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
     [Table("Hosts")]
     [Index(nameof(IP))]
     [Index(nameof(Ek), IsUnique = true)]
-    public class Host : IBase
+    public class Host : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Job/Job.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models.Job
 {
     [Table("Jobs", Schema = DataContextSettings.Job)]
     [Comment("Таблица видов работ")]
-    public class Job : IBase
+    public class Job : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Job/JobFieldFilter.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
 using PARR.DAL.Models.Unit;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Job
 {
     [Table("FieldFilters", Schema = DataContextSettings.Job)]
     [Comment("Таблица описания критериев выборки аттрибутов ЭК")]
-    public class JobFieldFilter : IBase
+    public class JobFieldFilter : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Job/JobGroup.cs

@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
 using PARR.DAL.Models.Schedule;
 using PARR.DAL.Models.Unit;
 using PARR.DAL.Settings;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -11,7 +11,7 @@ namespace PARR.DAL.Models.Job
 {
     [Table("Groups", Schema = DataContextSettings.Job)]
     [Comment("Таблица описания групп работ, для реализации зонтиков")]
-    public class JobGroup : IBase
+    public class JobGroup : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Job/JobGroupType.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Contracts;
+using PARR.Domain.Entities.Base;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Enums;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Job
 {
     [Table("GroupTypes", Schema = DataContextSettings.Job)]
     [Comment("Таблица типов групп работ")]
-    public class JobGroupType : IBase
+    public class JobGroupType : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Job/JobUnitFilter.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models.Job
 {
     [Table("UnitFilters", Schema = DataContextSettings.Job)]
     [Comment("Таблица описания критериев выборки ЭК, описание полей в АСУ ЕСПП")]
-    public class JobUnitFilter : IBase
+    public class JobUnitFilter : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Order.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -10,7 +10,7 @@ namespace PARR.DAL.Models
     /// </summary>
     [Table("Orders")]
     [Index(nameof(Number), IsUnique = true)]
-    public class Order : IBase
+    public class Order : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/ParrComponent.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.Constants;
+using PARR.Domain.Enums;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

PARR.DAL/Models/Process.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
 {
     [Table("Processes")]
     [Index(nameof(EsppId), IsUnique = true)]
-    public class Process : IBase
+    public class Process : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/RobotConfiguration.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models
     [Index(nameof(TemplateId), nameof(RobotCode), IsUnique = true)]
     [Index(nameof(TemplateId), nameof(TaskStatusCode))]
     [Index(nameof(TemplateId), nameof(RobotStatusCode))]
-    public class RobotConfiguration : IBase
+    public class RobotConfiguration : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/RobotHistory.cs

@@ -1,10 +1,10 @@
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models
 {
     [Table("RobotHistories")]
-    public class RobotHistory : IBase
+    public class RobotHistory : IBaseEntity
     {
         public Guid Id { get; set; }
 

PARR.DAL/Models/Role.cs

@@ -1,11 +1,11 @@
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models
 {
     [Table("Roles")]
-    public class Role : IBase
+    public class Role : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Schedule/ScheduleExcludeType.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
 using PARR.DAL.Models.Job;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -12,7 +12,7 @@ namespace PARR.DAL.Models.Schedule
     /// </summary>
     [Table("ExcludeTypes", Schema = DataContextSettings.Schedule)]
     [Comment("Расписание регламентной работы - Тип исключения")]
-    public class ScheduleExcludeType : IBase
+    public class ScheduleExcludeType : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Schedule/ScheduleExcludeTypeCalendar.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
 using PARR.DAL.Models.Job;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -12,7 +12,7 @@ namespace PARR.DAL.Models.Schedule
     /// </summary>
     [Table("ExcludeTypeCalendars", Schema = DataContextSettings.Schedule)]
     [Comment("Расписание регламентной работы, исключение - Календарь")]
-    public class ScheduleExcludeTypeCalendar : IBase
+    public class ScheduleExcludeTypeCalendar : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Subprocess.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
 {
     [Table("Subprocesses")]
     [Index(nameof(EsppId), IsUnique = true)]
-    public class Subprocess : IBase
+    public class Subprocess : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Template.cs

@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.Common.Domain;
 using PARR.Constants;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
-using PARR.DAL.Models.Base.History;
+using PARR.Domain.Entities.Base.History;
-using PARR.DAL.Models.Base.History.Base;
+using PARR.Domain.Entities.Base.History.Base;
+using PARR.Domain.Enums;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -11,7 +11,7 @@ namespace PARR.DAL.Models
 {
     [Table("Templates")]
     [Index(nameof(Name), nameof(Index), IsUnique = true)]
-    public class Template : IBase, ITemplateGeneralProps, IHistoryInitiator, IMyHistory<TemplateHistory>
+    public class Template : IBaseEntity, ITemplateGeneralProps, IHistoryInitiator, IMyHistory<TemplateHistory>
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/TemplateHistory.cs

@@ -1,15 +1,15 @@
-using PARR.Common.Domain;
+using PARR.Constants;
-using PARR.Constants;
+using PARR.Domain.Entities.Base;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base.History;
-using PARR.DAL.Models.Base.History;
+using PARR.Domain.Entities.Base.History.Base;
-using PARR.DAL.Models.Base.History.Base;
+using PARR.Domain.Enums;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models
 {
     [Table("TemplateHistories")]
-    public class TemplateHistory : IBase, ITemplateGeneralProps, IHistoryInitiator, IHistoryTable
+    public class TemplateHistory : IBaseEntity, ITemplateGeneralProps, IHistoryInitiator, IHistoryTable
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Tnk.cs

@@ -1,4 +1,4 @@
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -6,7 +6,7 @@ namespace PARR.DAL.Models
 {
     [Table("Tnks")]
     //[Index(nameof(EsppId), IsUnique = true)]
-    public class Tnk : IBase
+    public class Tnk : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Unit/Unit.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Unit
     [Table("Units", Schema = DataContextSettings.Unit)]
     [Comment("Таблица с ЭК")]
     [Index(nameof(Name), IsUnique = true)]
-    public class Unit : IBase
+    public class Unit : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Unit/UnitField.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
 using PARR.DAL.Models.Job;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -14,7 +14,7 @@ namespace PARR.DAL.Models.Unit
     [Comment("Справочник полей ЭК")]
     [Index(nameof(AihitName))]
     [Index(nameof(EsppName))]
-    public class UnitField : IBase
+    public class UnitField : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Unit/UnitFieldInUnitFieldValue.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models.Unit
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models.Unit
     [Table("FieldInFieldValues", Schema = DataContextSettings.Unit)]
     [Comment("Значения полей ЭК")]
     [PrimaryKey(nameof(FieldId), nameof(FieldValueId))]
-    public class UnitFieldInUnitFieldValue : IBaseDateCreated
+    public class UnitFieldInUnitFieldValue : IBaseEntityDateCreated
     {
         public Guid FieldId { get; set; }
 

PARR.DAL/Models/Unit/UnitFieldValue.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Unit
     [Table("FieldValues", Schema = DataContextSettings.Unit)]
     [Comment("Значения полей ЭК")]
     [Index(nameof(Value), IsUnique = true)]
-    public class UnitFieldValue : IBase
+    public class UnitFieldValue : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/Unit/UnitInValue.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models.Unit
@@ -12,7 +12,7 @@ namespace PARR.DAL.Models.Unit
     [Index(nameof(FieldId), nameof(ValueId))]
     [Index(nameof(UnitId), nameof(FieldId))]
     [Index(nameof(FieldId), nameof(UnitId))]
-    public class UnitInValue : IBaseDateModified, IBaseDateCreated
+    public class UnitInValue : IBaseEntityDateModified, IBaseEntityDateCreated
     {
         public Guid UnitId { get; set; }
 

PARR.DAL/Models/User.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -7,7 +7,7 @@ namespace PARR.DAL.Models
 {
     [Table("Users")]
     [Index(nameof(Ip), IsUnique = true)]
-    public class User : IBase
+    public class User : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/WeekendDay.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.DAL.Context;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -8,7 +8,7 @@ namespace PARR.DAL.Models
 {
     [Table("WeekendDays", Schema = DataContextSettings.Schedule)]
     [Index(nameof(Date), IsUnique = true)]
-    public class WeekendDay : IBase
+    public class WeekendDay : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/Models/WorkGroup.cs

@@ -1,11 +1,11 @@
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PARR.DAL.Models
 {
     [Table("WorkGroups")]
-    public class WorkGroup : IBase
+    public class WorkGroup : IBaseEntity
     {
         [Key]
         public Guid Id { get; set; }

PARR.DAL/NextRunServices/Subservices/EsppScheduleTransformService.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
-using PARR.DAL.Contracts;
 using PARR.DAL.DomainModels;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 using System.Text.Json;
 
 namespace PARR.DAL.NextRunServices.Subservices

PARR.DAL/PARR.DAL.csproj

@@ -23,5 +23,11 @@
 		<ProjectReference Include="..\PARR.BLL\PARR.BLL.csproj" />
 		<ProjectReference Include="..\PARR.Common\PARR.Common.csproj" />
 		<ProjectReference Include="..\PARR.Constants\PARR.Constants.csproj" />
+		<ProjectReference Include="..\PARR.Core\PARR.Core.csproj" />
+		<ProjectReference Include="..\PARR.Domain\PARR.Domain.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="Repositories\Base\" />
 	</ItemGroup>
 </Project>

PARR.DAL/ParrDalInstaller.cs

@@ -33,6 +33,11 @@ namespace PARR.DAL
 {
     public static class ParrDalInstaller
     {
+        // TODO: Переименовать InstallDalServices -> DependencyInjection
+        // TODO: Переименовать InstallDalServices -> AddDalServices
+        // TODO: Избавиться от лишнего
+
+
         /// <summary>
         /// Устанавливает Dal сервисы (1)
         /// </summary>

PARR.DAL/Services/Abstracts/BaseService.cs

@@ -1,17 +1,17 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Extensions.Logging;
-using PARR.Common.Domain;
 using PARR.DAL.Context;
 using PARR.DAL.DomainModels;
-using PARR.DAL.Models.Base;
-using PARR.DAL.Models.Base.History.Base;
 using PARR.DAL.Services.Interfaces.Base;
+using PARR.Domain.Entities.Base;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Entities.Base.History.Base;
 using System.Reflection;
 
 namespace PARR.DAL.Services.Abstracts
 {
-    internal abstract class BaseService<T> : IBaseService<T> where T : class, IBase
+    internal abstract class BaseService<T> : IBaseService<T> where T : class, IBaseEntity
     {
         private readonly ILogger<BaseService<T>> logger;
 
@@ -118,10 +118,10 @@ namespace PARR.DAL.Services.Abstracts
         /// <param name="obj"></param>
         private void DateModifiedResolver(EntityEntry obj)
         {
-            if (obj.Entity is IBaseDateModified)
+            if (obj.Entity is IBaseEntityDateModified)
             {
                 logger.LogDebug("Обновляю DateModified для сущности типа {EntityType}", obj.Entity.GetType().Name);
-                (obj.Entity as IBaseDateModified)!.DateModified = DateTimeOffset.UtcNow;
+                (obj.Entity as IBaseEntityDateModified)!.DateModified = DateTimeOffset.UtcNow;
             }
         }
 
@@ -168,7 +168,7 @@ namespace PARR.DAL.Services.Abstracts
             FillHistoryProp(ref historyInstance, nameof(IHistoryTable.DateAddedToHistory), DateTimeOffset.UtcNow);
 
             // Заполняем Id
-            FillHistoryProp(ref historyInstance, nameof(IBase.Id), Guid.NewGuid());
+            FillHistoryProp(ref historyInstance, nameof(IBaseEntity.Id), Guid.NewGuid());
 
             try
             {
@@ -202,7 +202,7 @@ namespace PARR.DAL.Services.Abstracts
                     return;
 
                 //Смотрим, если это Id, записываем его в ParentId
-                var histPropName = prop.Name == nameof(IBase.Id) ? nameof(IHistoryTable.ParentId) : prop.Name;
+                var histPropName = prop.Name == nameof(IBaseEntity.Id) ? nameof(IHistoryTable.ParentId) : prop.Name;
 
                 var histProp = historyInstance.GetType().GetProperty(histPropName);
                 if (histProp == null) continue;

PARR.DAL/Services/Implementations/RobotConfigurationService.cs

@@ -2,10 +2,10 @@
 using Microsoft.Extensions.Logging;
 using PARR.Constants;
 using PARR.DAL.Context;
-using PARR.DAL.Contracts;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Abstracts;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Enums;
 
 namespace PARR.DAL.Services.Implementations
 {

PARR.DAL/Services/Implementations/TaskServices/TaskErrorService.cs

@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using PARR.DAL.Context;
-using PARR.DAL.Models.TaskModels;
 using PARR.DAL.Services.Abstracts;
 using PARR.DAL.Services.Interfaces.TaskServices;
+using PARR.Domain.Entities.TaskEntities;
 
 namespace PARR.DAL.Services.Implementations.TaskServices
 {

PARR.DAL/Services/Implementations/TaskServices/TaskService.cs

@@ -1,9 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using PARR.DAL.Context;
-using PARR.DAL.Models.TaskModels;
 using PARR.DAL.Services.Abstracts;
 using PARR.DAL.Services.Interfaces.TaskServices;
+using PARR.Domain.Entities.TaskEntities;
 
 namespace PARR.DAL.Services.Implementations.TaskServices
 {

PARR.DAL/Services/Implementations/TaskServices/TaskTypeService.cs

@@ -1,6 +1,6 @@
 using PARR.DAL.Context;
-using PARR.DAL.Models.TaskModels;
 using PARR.DAL.Services.Interfaces.TaskServices;
+using PARR.Domain.Entities.TaskEntities;
 
 namespace PARR.DAL.Services.Implementations.TaskServices
 {

PARR.DAL/Services/Implementations/TemplateService.cs

@@ -1,13 +1,13 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Npgsql;
-using PARR.Common.Domain;
 using PARR.Constants;
 using PARR.DAL.Context;
-using PARR.DAL.Contracts;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Abstracts;
 using PARR.DAL.Services.Interfaces;
+using PARR.Domain.Entities.Base.History;
+using PARR.Domain.Enums;
 
 namespace PARR.DAL.Services.Implementations
 {

PARR.DAL/Services/Interfaces/Base/IBaseService.cs

@@ -1,10 +1,10 @@
-using PARR.Common.Domain;
+using PARR.DAL.DomainModels;
-using PARR.DAL.DomainModels;
+using PARR.Domain.Entities.Base;
-using PARR.DAL.Models.Base;
+using PARR.Domain.Entities.Base.History;
 
 namespace PARR.DAL.Services.Interfaces.Base
 {
-    public interface IBaseService<T> where T : class, IBase
+    public interface IBaseService<T> where T : class, IBaseEntity
     {
         Task<T?> GetAsync(Guid id);
         IQueryable<T> Get();

PARR.DAL/Services/Interfaces/IRobotConfigurationService.cs

@@ -1,7 +1,7 @@
 using PARR.Constants;
-using PARR.DAL.Contracts;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces.Base;
+using PARR.Domain.Enums;
 
 namespace PARR.DAL.Services.Interfaces
 {