mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

34
PARR.TemplateMatcher/Services/Implemetaions/GroupedTemplateSynchronizer.cs
View File

@@ -1,16 +1,16 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.Core.Repositories.Interfaces;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.Unit;
using PARR.DAL.DomainServices.Interfaces;
using PARR.DAL.DomainServices.UnitFilterService;
using PARR.DAL.Models;
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.Cache.Models;
using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.Entities;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Job;
using PARR.Domain.Enums;
using PARR.TemplateMatcher.Services.Interfaces;
using PARR.TemplateMatcher.Settings;
@@ -24,15 +24,15 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
private readonly ILogger<GroupedTemplateSynchronizer> logger;
private readonly IUnitFilterService unitFilterService;
private readonly IUnitInValueService unitInValueService;
private readonly IUnitService unitService;
private readonly IUnitInValueRepository unitInValueService;
private readonly IUnitRepository unitService;
private readonly MqSettings mqSettings;
private readonly IRabbitService mqService;
private readonly ITemplateService templateService;
private readonly IJobGroupService jobGroupService;
private readonly ITemplateRepository templateService;
private readonly IJobGroupRepository jobGroupService;
private readonly ITemplateReuser templateReuser;
private readonly IUnitRegionalEkPtkGroupService regionalEkPtkGroupService;
private readonly IUnitFieldService unitFieldService;
private readonly IUnitRegionalEkPtkGroupRepository regionalEkPtkGroupService;
private readonly IUnitFieldRepository unitFieldService;
private readonly ITemplateDeactivator templateDeactivator;
private readonly ITemplateNameNormalizer templateNameNormalizer;
private readonly ITemplateUpdaterMqSender templateUpdaterMqSender;
@@ -42,15 +42,15 @@ internal class GroupedTemplateSynchronizer : ITemplateSynchronizer
public GroupedTemplateSynchronizer(
ILogger<GroupedTemplateSynchronizer> logger,
IUnitFilterService unitFilterService,
IUnitInValueService unitInValueService,
IUnitService unitService,
IUnitInValueRepository unitInValueService,
IUnitRepository unitService,
MqSettings mqSettings,
IRabbitService mqService,
ITemplateService templateService,
IJobGroupService jobGroupService,
ITemplateRepository templateService,
IJobGroupRepository jobGroupService,
ITemplateReuser templateReuser,
IUnitRegionalEkPtkGroupService regionalEkPtkGroupService,
IUnitFieldService unitFieldService,
IUnitRegionalEkPtkGroupRepository regionalEkPtkGroupService,
IUnitFieldRepository unitFieldService,
ITemplateDeactivator templateDeactivator,
ITemplateNameNormalizer templateNameNormalizer,
ITemplateUpdaterMqSender templateUpdaterMqSender,

6
PARR.TemplateMatcher/Services/Implemetaions/JobGroupValidatorService.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging;
using PARR.DAL.Services.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.TemplateMatcher.Services.Interfaces;
namespace PARR.TemplateMatcher.Services.Implemetaions
@@ -7,11 +7,11 @@ namespace PARR.TemplateMatcher.Services.Implemetaions
internal class JobGroupValidatorService : IJobGroupValidatorService
{
private readonly ILogger<IJobValidatorService> logger;
private readonly IJobGroupService jobGroupService;
private readonly IJobGroupRepository jobGroupService;
public JobGroupValidatorService(
ILogger<IJobValidatorService> logger,
IJobGroupService jobGroupService
IJobGroupRepository jobGroupService
)
{
this.logger = logger;

6
PARR.TemplateMatcher/Services/Implemetaions/JobValidatorService.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging;
using PARR.DAL.Services.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.TemplateMatcher.Services.Interfaces;
namespace PARR.TemplateMatcher.Services.Implemetaions
@@ -7,11 +7,11 @@ namespace PARR.TemplateMatcher.Services.Implemetaions
internal class JobValidatorService : IJobValidatorService
{
private readonly ILogger<IJobValidatorService> logger;
private readonly IJobService jobService;
private readonly IJobRepository jobService;
public JobValidatorService(
ILogger<IJobValidatorService> logger,
IJobService jobService
IJobRepository jobService
)
{
this.logger = logger;

28
PARR.TemplateMatcher/Services/Implemetaions/SimpleTemplateSynchronizer.cs
View File

@@ -2,18 +2,18 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.Core.Repositories.Interfaces;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.Unit;
using PARR.DAL.Contracts;
using PARR.DAL.DomainServices.Interfaces;
using PARR.DAL.DomainServices.Shortcodes;
using PARR.DAL.DomainServices.UnitFilterService;
using PARR.DAL.Models;
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.Cache.Models;
using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.Entities;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Job;
using PARR.Domain.Enums;
using PARR.TemplateMatcher.Services.Interfaces;
using PARR.TemplateMatcher.Settings;
@@ -33,8 +33,8 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
private readonly IUnitFilterService unitFilterService;
private readonly MqSettings mqSettings;
private readonly IRabbitService mqService;
private readonly ITemplateService templateService;
private readonly IJobService jobService;
private readonly ITemplateRepository templateService;
private readonly IJobRepository jobService;
private readonly ITemplateReuser templateReuser;
private readonly ITemplateDeactivator templateDeactivator;
private readonly ITemplateNameNormalizer templateNameNormalizer;
@@ -47,17 +47,17 @@ internal class SimpleTemplateSynchronizer : ITemplateSynchronizer
public SimpleTemplateSynchronizer(
ILogger<SimpleTemplateSynchronizer> logger,
IUnitFilterService unitFilterService,
IUnitInUnitService unitInUnitService,
IUnitInValueService unitInValueService,
IUnitService unitService,
IUnitInUnitRepository unitInUnitService,
IUnitInValueRepository unitInValueService,
IUnitRepository unitService,
MqSettings mqSettings,
IRabbitService mqService,
ITemplateService templateService,
IJobService jobService,
ITemplateRepository templateService,
IJobRepository jobService,
ITemplateReuser templateReuser,
IShortcodesService shortcodesService,
IUnitRegionalEkPtkGroupService regionalEkPtkGroupService,
IUnitFieldService unitFieldService,
IUnitRegionalEkPtkGroupRepository regionalEkPtkGroupService,
IUnitFieldRepository unitFieldService,
ITemplateDeactivator templateDeactivator,
ITemplateNameNormalizer templateNameNormalizer,
ITemplateUpdaterMqSender templateUpdaterMqSender,

14
PARR.TemplateMatcher/Services/Implemetaions/TemplateDeactivator.cs
View File

@@ -1,11 +1,11 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using PARR.Core.Repositories.Interfaces;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.Entities;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Enums;
using PARR.TemplateMatcher.Services.Interfaces;
@@ -19,8 +19,8 @@ internal class TemplateDeactivator : ITemplateDeactivator
private const bool DefaultUnusedScheduleState = false;
private readonly ILogger<TemplateDeactivator> logger;
private readonly ITemplateService templateService;
private readonly IJobService jobService;
private readonly ITemplateRepository templateService;
private readonly IJobRepository jobService;
private readonly ITemplateNameNormalizer namenormalizer;
private readonly ITemplateUpdaterMqSender sender;
private readonly SettingsFromDb settingsFromDb;
@@ -28,8 +28,8 @@ internal class TemplateDeactivator : ITemplateDeactivator
public TemplateDeactivator(
ILogger<TemplateDeactivator> logger,
ITemplateService templateService,
IJobService jobService,
ITemplateRepository templateService,
IJobRepository jobService,
ITemplateNameNormalizer namenormalizer,
ITemplateUpdaterMqSender sender,
SettingsFromDb settingsFromDb,

2
PARR.TemplateMatcher/Services/Implemetaions/TemplateNameNormalizer.cs
View File

@@ -1,5 +1,5 @@
using PARR.DAL.DomainServices.Shortcodes;
using PARR.DAL.Models;
using PARR.Domain.Entities;
using PARR.TemplateMatcher.Services.Interfaces;
using System.Runtime.CompilerServices;

8
PARR.TemplateMatcher/Services/Implemetaions/TemplateReuser.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.Core.Repositories.Interfaces;
using PARR.Domain.Entities;
using PARR.Domain.Entities.Base.History;
using PARR.TemplateMatcher.Services.Interfaces;
@@ -10,11 +10,11 @@ namespace PARR.TemplateMatcher.Services.Implementations;
internal class TemplateReuser : ITemplateReuser
{
private readonly ILogger<TemplateReuser> logger;
private readonly ITemplateService templateService;
private readonly ITemplateRepository templateService;
public TemplateReuser(
ILogger<TemplateReuser> logger,
ITemplateService templateService)
ITemplateRepository templateService)
{
this.logger = logger;
this.templateService = templateService;

6
PARR.TemplateMatcher/Services/Implemetaions/TemplateUpdaterMqSender.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.DAL.Services.Interfaces;
using PARR.Core.Repositories.Interfaces;
using PARR.Domain.Common.Rabbit.Messages;
using PARR.TemplateMatcher.Services.Interfaces;
using PARR.TemplateMatcher.Settings;
@@ -13,13 +13,13 @@ internal class TemplateUpdaterMqSender : ITemplateUpdaterMqSender
private readonly ILogger<TemplateUpdaterMqSender> logger;
private readonly IRabbitService mqService;
private readonly MqSettings mqSettings;
private readonly ITemplateService templateService;
private readonly ITemplateRepository templateService;
public TemplateUpdaterMqSender(
ILogger<TemplateUpdaterMqSender> logger,
IRabbitService mqService,
MqSettings mqSettings,
ITemplateService templateService
ITemplateRepository templateService
)
{
this.logger = logger;

2
PARR.TemplateMatcher/Services/Interfaces/ITemplateDeactivator.cs
View File

@@ -1,4 +1,4 @@
using PARR.DAL.Models;
using PARR.Domain.Entities;
using PARR.Domain.Entities.Base.History;
namespace PARR.TemplateMatcher.Services.Interfaces

2
PARR.TemplateMatcher/Services/Interfaces/ITemplateNameNormalizer.cs
View File

@@ -1,4 +1,4 @@
using PARR.DAL.Models;
using PARR.Domain.Entities;
using System.Runtime.CompilerServices;
namespace PARR.TemplateMatcher.Services.Interfaces

2
PARR.TemplateMatcher/Services/Interfaces/ITemplateReuser.cs
View File

@@ -1,4 +1,4 @@
using PARR.DAL.Models;
using PARR.Domain.Entities;
using PARR.Domain.Entities.Base.History;
namespace PARR.TemplateMatcher.Services.Interfaces

12
PARR.TemplateMatcher/TemplateMatcher.cs
View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Models.Job;
using PARR.DAL.Services.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Job;
using PARR.Domain.Enums;
using PARR.TemplateMatcher.Services.Implementations;
using PARR.TemplateMatcher.Services.Interfaces;
@@ -12,14 +12,14 @@ namespace PARR.TemplateMatcher
internal class TemplateMatcher : ITemplateMatcher
{
private readonly ILogger<TemplateMatcher> logger;
private readonly IJobService jobService;
private readonly IJobGroupService jobGroupService;
private readonly IJobRepository jobService;
private readonly IJobGroupRepository jobGroupService;
private readonly IEnumerable<ITemplateSynchronizer> synchronizers;
public TemplateMatcher(
ILogger<TemplateMatcher> logger,
IJobService jobService,
IJobGroupService jobGroupService,
IJobRepository jobService,
IJobGroupRepository jobGroupService,
IEnumerable<ITemplateSynchronizer> synchronizers
)
{

2
PARR.TemplateMatcher/TemplateMatcherInstaller.cs
View File

@@ -14,7 +14,7 @@ namespace PARR.TemplateMatcher
{
public static void InstallTemplateMatcherSerivces(this IServiceCollection services, IConfiguration configuration)
{
services.InstallDalServices(configuration);
services.AddDalServices(configuration);
services.AddCoreServices(configuration);
services.AddInfrastructureServices(configuration);