feat: Из dal перенесены все модели в Domain. Из dal переименованы service в repository, вынесены в Core.
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using PARR.DAL.Models;
|
||||
using PARR.DAL.Models.Job;
|
||||
using PARR.DAL.Services.Interfaces;
|
||||
using PARR.DAL.Services.Interfaces.Base;
|
||||
using PARR.DAL.Services.Interfaces.Job;
|
||||
using PARR.Core.Repositories.Base;
|
||||
using PARR.Core.Repositories.Interfaces;
|
||||
using PARR.Core.Repositories.Interfaces.Job;
|
||||
using PARR.Domain.Entities;
|
||||
using PARR.Domain.Entities.Base;
|
||||
using PARR.Domain.Entities.Job;
|
||||
using PARR.Domain.Enums;
|
||||
|
||||
namespace PARR.TemplateActivator;
|
||||
@@ -29,13 +29,13 @@ internal class ValidatorService : IValidatorService
|
||||
switch (entityType)
|
||||
{
|
||||
case (SyncTaskEntityTypeEnum.JobGroup):
|
||||
return await IsValidAync<IJobGroupService, JobGroup>(id);
|
||||
return await IsValidAync<IJobGroupRepository, JobGroup>(id);
|
||||
|
||||
case (SyncTaskEntityTypeEnum.Job):
|
||||
return await IsValidAync<IJobService, Job>(id);
|
||||
return await IsValidAync<IJobRepository, Job>(id);
|
||||
|
||||
case (SyncTaskEntityTypeEnum.Template):
|
||||
return await IsValidAync<ITemplateService, Template>(id);
|
||||
return await IsValidAync<ITemplateRepository, Template>(id);
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -43,7 +43,7 @@ internal class ValidatorService : IValidatorService
|
||||
|
||||
|
||||
private async Task<bool> IsValidAync<TService, TEntity>(Guid id)
|
||||
where TService : class, IBaseService<TEntity>
|
||||
where TService : class, IBaseRepository<TEntity>
|
||||
where TEntity : class, IBaseEntity
|
||||
{
|
||||
using (var scope = serviceProvider.CreateScope())
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using PARR.DAL.Models;
|
||||
using PARR.DAL.Services.Interfaces;
|
||||
using PARR.Core.Repositories.Interfaces;
|
||||
using PARR.Domain.Common.Rabbit.Messages;
|
||||
using PARR.Domain.Entities;
|
||||
using PARR.Domain.Enums;
|
||||
|
||||
namespace PARR.TemplateActivator;
|
||||
@@ -10,15 +10,15 @@ namespace PARR.TemplateActivator;
|
||||
internal class TemplateActivator : ITemplateActivator
|
||||
{
|
||||
private readonly ILogger<TemplateActivator> logger;
|
||||
private readonly ITemplateService templateService;
|
||||
private readonly IRobotConfigurationService robotConfigurationService;
|
||||
private readonly ITemplateRepository templateService;
|
||||
private readonly IRobotConfigurationRepository robotConfigurationService;
|
||||
//private readonly IJobAutoControlService jobAutoControlService;
|
||||
//private readonly IApplicationsInWorkService applicationsInWorkService;
|
||||
|
||||
public TemplateActivator(
|
||||
ILogger<TemplateActivator> logger,
|
||||
ITemplateService templateService,
|
||||
IRobotConfigurationService robotConfigurationService
|
||||
ITemplateRepository templateService,
|
||||
IRobotConfigurationRepository robotConfigurationService
|
||||
//IJobAutoControlService jobAutoControlService,
|
||||
//IApplicationsInWorkService applicationsInWorkService
|
||||
)
|
||||
|
||||
@@ -11,7 +11,7 @@ public static class TemplateActivatorInstaller
|
||||
|
||||
public static void InstallTemplateActivatorSerivces(this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
services.InstallDalServices(configuration);
|
||||
services.AddDalServices(configuration);
|
||||
services.AddCoreServices(configuration);
|
||||
services.AddInfrastructureServices(configuration);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user