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

refactor(dal,api,templateMatcher,templateGenerator,templateActivator): Немного порядка в namespaceах

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2026-07-03 11:17:48 +10:00
parent 143ae10190
commit 3c9e03adbb
76 changed files with 165 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PARR.Core/Common/Helpers/JobGroupCloneHelper.cs
View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
using PARR.Domain.Entities.JobGroupEntities;
using PARR.Domain.Entities.Schedule;
@@ -15,16 +15,13 @@ namespace PARR.Core.Common.Helpers;
public class JobGroupCloneHelper
{
private readonly IJobGroupRepository groupRepository;
private readonly IJobRepository jobRepository;
private readonly ILogger<JobGroupCloneHelper> logger;
public JobGroupCloneHelper(
IJobGroupRepository groupRepository,
IJobRepository jobRepository,
ILogger<JobGroupCloneHelper> logger)
{
this.groupRepository = groupRepository;
this.jobRepository = jobRepository;
this.logger = logger;
}

9
PARR.Core/Common/Helpers/JobGroupUnitFilterSynchronizeHelper.cs
View File

@@ -1,13 +1,8 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.JobRepositories;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Entities.Job;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Common.Helpers;

8
PARR.Core/Repositories/Interfaces/Job/IJobRepository.cs
View File

@@ -1,8 +0,0 @@
using PARR.Core.Repositories.Base;
namespace PARR.Core.Repositories.Interfaces.Job
{
public interface IJobRepository : IBaseRepository<Domain.Entities.Job.Job>
{
}
}

2
PARR.Core/Repositories/Interfaces/Job/IJobGroupRepository.cs → PARR.Core/Repositories/Interfaces/JobGroupRepositories/IJobGroupRepository.cs
View File

@@ -1,7 +1,7 @@
using PARR.Core.Repositories.Base;
using PARR.Domain.Entities.JobGroupEntities;
namespace PARR.Core.Repositories.Interfaces.Job
namespace PARR.Core.Repositories.Interfaces.JobGroupRepositories
{
public interface IJobGroupRepository : IBaseRepository<JobGroup>
{

2
PARR.Core/Repositories/Interfaces/Job/IJobGroupTypeRepository.cs → PARR.Core/Repositories/Interfaces/JobGroupRepositories/IJobGroupTypeRepository.cs
View File

@@ -1,7 +1,7 @@
using PARR.Core.Repositories.Base;
using PARR.Domain.Entities.JobGroupEntities;
namespace PARR.Core.Repositories.Interfaces.Job
namespace PARR.Core.Repositories.Interfaces.JobGroupRepositories
{
public interface IJobGroupTypeRepository : IBaseRepository<JobGroupType>
{

4
PARR.Core/Repositories/Interfaces/Job/IFieldFilterRepository.cs → PARR.Core/Repositories/Interfaces/JobRepositories/IFieldFilterRepository.cs
View File

@@ -1,7 +1,7 @@
using PARR.Core.Repositories.Base;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Repositories.Interfaces.Job
namespace PARR.Core.Repositories.Interfaces.JobRepositories
{
public interface IFieldFilterRepository : IBaseRepository<JobFieldFilter>
{

4
PARR.Core/Repositories/Interfaces/Job/IJobAutoControlRepository.cs → PARR.Core/Repositories/Interfaces/JobRepositories/IJobAutoControlRepository.cs
View File

@@ -1,6 +1,6 @@
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Repositories.Interfaces.Job
namespace PARR.Core.Repositories.Interfaces.JobRepositories
{
public interface IJobAutoControlRepository
{

9
PARR.Core/Repositories/Interfaces/JobRepositories/IJobRepository.cs Normal file
View File

@@ -0,0 +1,9 @@
using PARR.Core.Repositories.Base;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Repositories.Interfaces.JobRepositories
{
public interface IJobRepository : IBaseRepository<Job>
{
}
}

4
PARR.Core/Repositories/Interfaces/Job/IJobUnitFilterRepository.cs → PARR.Core/Repositories/Interfaces/JobRepositories/IJobUnitFilterRepository.cs
View File

@@ -1,7 +1,7 @@
using PARR.Core.Repositories.Base;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Repositories.Interfaces.Job
namespace PARR.Core.Repositories.Interfaces.JobRepositories
{
public interface IJobUnitFilterRepository : IBaseRepository<JobUnitFilter>
{

3
PARR.Core/Services/MatchingStatusService/MatchingStatusService.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using PARR.Core.Common.Interfaces;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
using PARR.Core.Repositories.Interfaces.JobRepositories;
using PARR.Domain.Cache.Models;
using PARR.Domain.DTOs.Matching;
using PARR.Domain.Enums;

8
PARR.Core/Services/Shortcodes/ShortcodesService.cs
View File

@@ -2,7 +2,7 @@
using Microsoft.Extensions.Logging;
using PARR.Core.Common.Interfaces;
using PARR.Core.Repositories.Interfaces;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.JobRepositories;
using PARR.Core.Repositories.Interfaces.Unit;
using PARR.Core.Services.Shortcodes.Enums;
using PARR.Core.Services.Shortcodes.Handlers;
@@ -10,7 +10,7 @@ using PARR.Core.Services.Shortcodes.Models;
using PARR.Domain.Cache.Models;
using PARR.Domain.DTOs.Shortcode;
using PARR.Domain.Entities;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
using PARR.Domain.Enums;
using PARR.Domain.Settings;
using System.Runtime.CompilerServices;
@@ -79,8 +79,8 @@ internal class ShortcodesService : IShortcodesService
Index: template.Index,
JobId: template.JobId,
UnitId: template.UnitId,
UnitName: initialUnitName ?? string.Empty,
Job: initialJob,
UnitName: initialUnitName ?? string.Empty,
Job: initialJob,
UnitsInTemplate: initialUnitsInTemplate,
UnitTags: new List<string>(),
RelatedUnitTags: new Dictionary<Guid, List<string>>()

2
PARR.Core/Services/UnitFilterService/IUnitFilterService.cs
View File

@@ -1,5 +1,5 @@
using PARR.Core.Services.UnitFilterService.Models;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Services.UnitFilterService
{

2
PARR.Core/Services/UnitFilterService/Matchers/Implemetations/UmbrellaFilter.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging;
using PARR.Core.Services.UnitFilterService.Matchers.Interfaces;
using PARR.Core.Services.UnitFilterService.Models;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
using PARR.Domain.Enums;
namespace PARR.Core.Services.UnitFilterService.Matchers;

2
PARR.Core/Services/UnitFilterService/Matchers/Implemetations/UnitFieldMatcher.cs
View File

@@ -2,7 +2,7 @@
using Microsoft.Extensions.Logging;
using PARR.Core.Repositories.Interfaces.Unit;
using PARR.Core.Services.UnitFilterService.Matchers.Interfaces;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Services.UnitFilterService.Matchers;

2
PARR.Core/Services/UnitFilterService/Matchers/Implemetations/UnitRelationshipMatcher.cs
View File

@@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging;
using PARR.Core.Repositories.Interfaces.Unit;
using PARR.Core.Services.UnitFilterService.Matchers.Interfaces;
using PARR.Core.Services.UnitFilterService.Models;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Services.UnitFilterService.Matchers;

2
PARR.Core/Services/UnitFilterService/Matchers/Interfaces/IUmbrellaFilter.cs
View File

@@ -1,5 +1,5 @@
using PARR.Core.Services.UnitFilterService.Models;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Services.UnitFilterService.Matchers.Interfaces
{

2
PARR.Core/Services/UnitFilterService/Matchers/Interfaces/IUnitFieldMatcher.cs
View File

@@ -1,4 +1,4 @@
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Services.UnitFilterService.Matchers.Interfaces
{

2
PARR.Core/Services/UnitFilterService/Matchers/Interfaces/IUnitRelationshipMatcher.cs
View File

@@ -1,5 +1,5 @@
using PARR.Core.Services.UnitFilterService.Models;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
namespace PARR.Core.Services.UnitFilterService.Matchers.Interfaces
{

4
PARR.Core/Services/UnitFilterService/UnitFilterService.cs
View File

@@ -1,12 +1,12 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.Core.Common.Interfaces;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.JobRepositories;
using PARR.Core.Repositories.Interfaces.Unit;
using PARR.Core.Services.UnitFilterService.Matchers.Interfaces;
using PARR.Core.Services.UnitFilterService.Models;
using PARR.Core.Services.UnitService.Interfaces;
using PARR.Domain.Entities.Job;
using PARR.Domain.Entities.JobEntities;
using PARR.Domain.Entities.Unit;
using System.Diagnostics;

3
PARR.Core/Services/Workload/Implementations/WorkloadService.cs
View File

@@ -2,7 +2,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.Core.Repositories.Interfaces;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.JobRepositories;
using PARR.Core.Repositories.Interfaces.TaskRepositories;
using PARR.Core.Services.NextRunServices;
using PARR.Core.Services.TaskServices.Helpers;
@@ -10,7 +10,6 @@ using PARR.Core.Services.Workload.Interfaces;
using PARR.Core.Services.Workload.Models;
using PARR.Domain.Cache.Models;
using PARR.Domain.DTOs.Workload;
using PARR.Domain.Entities;
using PARR.Domain.Enums;
using PARR.Domain.Enums.Workload;