feat: Из dal перенесены все модели в Domain. Из dal переименованы service в repository, вынесены в Core.

This commit is contained in:
Mikhail Trubnikov
2026-04-30 10:35:31 +10:00
parent f1ea69da1f
commit eb78dfd6a8
356 changed files with 1817 additions and 1985 deletions

View File

@@ -2,12 +2,13 @@
using PARR.API.Authentication.Models;
using PARR.API.Contracts.V1.Responses;
using PARR.API.MappingProfiles.Resolvers;
using PARR.Core.Repositories.Interfaces.Schedule;
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;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.Schedule;
using PARR.Domain.Entities.Unit;
namespace PARR.API.MappingProfiles
{
@@ -69,7 +70,7 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.Script, o => o.MapFrom(s => s.AgentScript))
.ForMember(d => d.TimeOutSec, o => o.MapFrom(s => s.AgentTimeOutSec));
CreateMap<DAL.Models.TaskStatus, TaskStatusResponse>();
CreateMap<PARR.Domain.Entities.TaskStatus, TaskStatusResponse>();
#region ScheduleResponseAreaTimeOffsetResponse
@@ -236,7 +237,7 @@ namespace PARR.API.MappingProfiles
CreateMap<Robot, RobotResponse>();
CreateMap<DAL.Models.TaskStatus, TaskStatusResponse>();
CreateMap<PARR.Domain.Entities.TaskStatus, TaskStatusResponse>();
CreateMap<RobotConfiguration, RobotConfigurationResponse>()
.ForMember(d => d.Robot, o => o.MapFrom(s => s.Robot))

View File

@@ -1,8 +1,8 @@
using AutoMapper;
using PARR.API.Contracts.V1.Requests;
using PARR.API.Contracts.V1.Requests.Queries;
using PARR.DAL.Models.Job;
using PARR.Domain.Common.Pagination;
using PARR.Domain.Entities.Job;
namespace PARR.API.MappingProfiles
{

View File

@@ -1,16 +1,16 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Services.Interfaces;
using PARR.Core.Repositories.Interfaces;
using PARR.Domain.Entities.Base.History;
namespace PARR.API.MappingProfiles.Resolvers
{
public class HistoryInitiatorParrComponentResolver : IValueResolver<IHistoryInitiator, HistoryInitiatorResponse, ParrComponentResponse?>
{
private readonly IParrComponentService parrComponentService;
private readonly IParrComponentRepository parrComponentService;
public HistoryInitiatorParrComponentResolver(IParrComponentService parrComponentService)
public HistoryInitiatorParrComponentResolver(IParrComponentRepository parrComponentService)
{
this.parrComponentService = parrComponentService;
}

View File

@@ -1,16 +1,16 @@
using AutoMapper;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Services.Interfaces;
using PARR.Core.Repositories.Interfaces;
using PARR.Domain.Entities.Base.History;
namespace PARR.API.MappingProfiles.Resolvers
{
public class HistoryInitiatorUserResolver : IValueResolver<IHistoryInitiator, HistoryInitiatorResponse, UserBaseResponse?>
{
private readonly IUserService userService;
private readonly IUserRepository userService;
public HistoryInitiatorUserResolver(IUserService userService)
public HistoryInitiatorUserResolver(IUserRepository userService)
{
this.userService = userService;
}

View File

@@ -1,26 +1,25 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.Core.Repositories.Interfaces.Schedule;
using PARR.DAL.Contracts;
using PARR.DAL.Models.Job;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Schedule;
using PARR.Domain.Entities.Job;
namespace PARR.API.MappingProfiles.Resolvers
{
public class JobGroupScheduleResolver : IValueResolver<JobGroup, JobGroupResponse, JobGroupScheduleResponse?>
{
private readonly IEsppSchTypeConfigService esppConfigService;
private readonly IEsppSchTypeConfigRepository esppConfigService;
private readonly ILogger<JobGroupScheduleResolver> logger;
private readonly IMapper mapper;
private readonly SettingsFromDb settingsFromDb;
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
private readonly IScheduleResponseAreaTimeOffsetRepository scheduleResponseAreaTimeOffsetService;
public JobGroupScheduleResolver(
IEsppSchTypeConfigService esppConfigService,
IEsppSchTypeConfigRepository esppConfigService,
ILogger<JobGroupScheduleResolver> logger,
IMapper mapper,
SettingsFromDb settingsFromDb,
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
IScheduleResponseAreaTimeOffsetRepository scheduleResponseAreaTimeOffsetService
)
{
this.esppConfigService = esppConfigService;

View File

@@ -1,9 +1,4 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
namespace PARR.API.MappingProfiles.Resolvers
namespace PARR.API.MappingProfiles.Resolvers
{
//public class RobotTaskScheduleExcludeCalendarResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string?>
//{

View File

@@ -1,9 +1,4 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
namespace PARR.API.MappingProfiles.Resolvers
namespace PARR.API.MappingProfiles.Resolvers
{
//public class RobotTaskScheduleExcludeResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
//{

View File

@@ -1,11 +1,4 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.BLL.Helpers;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
namespace PARR.API.MappingProfiles.Resolvers
namespace PARR.API.MappingProfiles.Resolvers
{
//public class RobotTaskScheduleGenerationTimeResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
//{

View File

@@ -1,11 +1,4 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.BLL.Helpers;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.API.MappingProfiles.Resolvers
namespace PARR.API.MappingProfiles.Resolvers
{
//public class RobotTaskScheduleNextStartResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
//{

View File

@@ -1,7 +1,7 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{

View File

@@ -1,18 +1,18 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.Core.Repositories.Interfaces.Schedule;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{
public class RobotTaskScheduleSchResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, List<RobotTaskScheduleSchResponse>?>
{
private readonly IEsppSchTypeConfigService esppConfigService;
private readonly IEsppSchTypeConfigRepository esppConfigService;
private readonly ILogger<RobotTaskScheduleSchResolver> logger;
public RobotTaskScheduleSchResolver(
IEsppSchTypeConfigService esppConfigService,
IEsppSchTypeConfigRepository esppConfigService,
ILogger<RobotTaskScheduleSchResolver> logger
)
{

View File

@@ -1,9 +1,4 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
namespace PARR.API.MappingProfiles.Resolvers
namespace PARR.API.MappingProfiles.Resolvers
{
//public class RobotTaskScheduleTimezoneResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
//{

View File

@@ -1,7 +1,7 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{

View File

@@ -1,7 +1,7 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{

View File

@@ -1,7 +1,7 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{

View File

@@ -1,7 +1,7 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{

View File

@@ -1,7 +1,7 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{

View File

@@ -1,7 +1,7 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{

View File

@@ -1,26 +1,25 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.Core.Repositories.Interfaces.Schedule;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Schedule;
using PARR.Domain.Entities;
namespace PARR.API.MappingProfiles.Resolvers
{
public class TemplateScheduleResolver : IValueResolver<Template, TemplateResponse, EsppScheduleResponse?>
{
private readonly IEsppSchTypeConfigService esppConfigService;
private readonly IEsppSchTypeConfigRepository esppConfigService;
private readonly ILogger<TemplateScheduleResolver> logger;
private readonly IMapper mapper;
private readonly SettingsFromDb settingsFromDb;
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
private readonly IScheduleResponseAreaTimeOffsetRepository scheduleResponseAreaTimeOffsetService;
public TemplateScheduleResolver(
IEsppSchTypeConfigService esppConfigService,
IEsppSchTypeConfigRepository esppConfigService,
ILogger<TemplateScheduleResolver> logger,
IMapper mapper,
SettingsFromDb settingsFromDb,
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
IScheduleResponseAreaTimeOffsetRepository scheduleResponseAreaTimeOffsetService
)
{
this.esppConfigService = esppConfigService;