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

2026-07-03 11:17:48 +10:00
parent 143ae10190
commit 3c9e03adbb
76 changed files with 165 additions and 135 deletions
--- a/PARR.API/Controllers/V1/JobController.cs
+++ b/PARR.API/Controllers/V1/JobController.cs
@@ -16,7 +16,8 @@ using PARR.Core.Common.Helpers;
 using PARR.Core.Common.Interfaces.RabbitServices;
 using PARR.Core.Extensions;
 using PARR.Core.Repositories.Interfaces;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
+using PARR.Core.Repositories.Interfaces.JobRepositories;
 using PARR.Core.Repositories.Interfaces.Unit;
 using PARR.Core.Services.MatchingStatusService;
 using PARR.Core.Services.UnitFilterService;
@@ -24,7 +25,7 @@ using PARR.Domain.Common.Pagination;
 using PARR.Domain.Common.Rabbit.Messages;
 using PARR.Domain.Common.Roles;
 using PARR.Domain.Entities.Base.History;
-using PARR.Domain.Entities.Job;
+using PARR.Domain.Entities.JobEntities;
 using PARR.Domain.Enums;

 namespace PARR.API.Controllers.V1
@@ -43,7 +44,6 @@ namespace PARR.API.Controllers.V1
        private readonly IRabbitService _mqService;
        private readonly MqSettings _mqSettings;
        private readonly IClientService _clientService;
-        private readonly IJobAutoControlRepository _jobAutoControlRepository;
        private readonly IMatchingStatusService _matchingStatusService;

        public JobController(
@@ -58,7 +58,6 @@ namespace PARR.API.Controllers.V1
            IRabbitService mqService,
            MqSettings mqSettings,
            IClientService clientService,
-            IJobAutoControlRepository jobAutoControlRepository,
            IMatchingStatusService matchingStatusService
            )
        {
@@ -70,7 +69,6 @@ namespace PARR.API.Controllers.V1
            _mqService = mqService;
            _mqSettings = mqSettings;
            _clientService = clientService;
-            _jobAutoControlRepository = jobAutoControlRepository;
            _matchingStatusService = matchingStatusService;
        }

--- a/PARR.API/Controllers/V1/JobGroupController.cs
+++ b/PARR.API/Controllers/V1/JobGroupController.cs
@@ -14,7 +14,8 @@ using PARR.API.Services.Interfaces;
 using PARR.API.Settings;
 using PARR.Core.Common.Helpers;
 using PARR.Core.Common.Interfaces.RabbitServices;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
+using PARR.Core.Repositories.Interfaces.JobRepositories;
 using PARR.Core.Repositories.Interfaces.Schedule;
 using PARR.Core.Services.MatchingStatusService;
 using PARR.Domain.Common.Pagination;
--- a/PARR.API/Controllers/V1/JobGroupTypeController.cs
+++ b/PARR.API/Controllers/V1/JobGroupTypeController.cs
@@ -6,7 +6,7 @@ using PARR.API.Contracts.V1;
 using PARR.API.Contracts.V1.Responses;
 using PARR.API.Contracts.V1.Responses.Base;
 using PARR.API.Controllers.V1.Base;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
 using PARR.Domain.Common.Roles;

 namespace PARR.API.Controllers.V1
--- a/PARR.API/Controllers/V1/JobUnitPreviewController.cs
+++ b/PARR.API/Controllers/V1/JobUnitPreviewController.cs
@@ -12,7 +12,7 @@ using PARR.Core.Repositories.Interfaces.Job;
 using PARR.Core.Repositories.Interfaces.Unit;
 using PARR.Core.Services.UnitFilterService;
 using PARR.Domain.Common.Roles;
-using Job = PARR.Domain.Entities.Job.Job;
+using PARR.Domain.Entities.JobEntities;

 namespace PARR.API.Controllers.V1
 {
--- a/PARR.API/Controllers/V1/TemplateActivatorController.cs
+++ b/PARR.API/Controllers/V1/TemplateActivatorController.cs
@@ -1,5 +1,4 @@
-using FluentValidation;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using PARR.API.Contracts.V1;
 using PARR.API.Contracts.V1.Requests;
@@ -8,7 +7,7 @@ using PARR.API.Controllers.V1.Base;
 using PARR.API.Services.Interfaces;
 using PARR.API.Settings;
 using PARR.Core.Common.Interfaces.RabbitServices;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobRepositories;
 using PARR.Domain.Common.Rabbit.Messages;
 using PARR.Domain.Common.Roles;
 using PARR.Domain.Entities.Base.History;
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -13,7 +13,7 @@ using PARR.Domain.DTOs.User;
 using PARR.Domain.DTOs.Workload;
 using PARR.Domain.Entities;
 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;
 using PARR.Domain.Entities.Unit;
--- a/PARR.API/MappingProfiles/RequestToDomainProfile.cs
+++ b/PARR.API/MappingProfiles/RequestToDomainProfile.cs
@@ -3,7 +3,7 @@ using PARR.API.Contracts.V1.Requests;
 using PARR.API.Contracts.V1.Requests.Queries;
 using PARR.Domain.Common.Pagination;
 using PARR.Domain.DTOs.RobotSnapshotDTO;
-using PARR.Domain.Entities.Job;
+using PARR.Domain.Entities.JobEntities;

 namespace PARR.API.MappingProfiles
 {
--- a/PARR.API/Validators/JobGroupValidator.cs
+++ b/PARR.API/Validators/JobGroupValidator.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1.Requests;
 using PARR.Core.Repositories.Interfaces;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
 using PARR.Core.Repositories.Interfaces.Schedule;
 using PARR.Core.Repositories.Interfaces.Unit;
 using PARR.Domain.Enums;
--- a/PARR.API/Validators/JobRequestValidator.cs
+++ b/PARR.API/Validators/JobRequestValidator.cs
@@ -1,9 +1,8 @@
 using FluentValidation;
 using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json.Linq;
 using PARR.API.Contracts.V1.Requests;
 using PARR.Core.Repositories.Interfaces;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
 using PARR.Core.Repositories.Interfaces.Unit;

 namespace PARR.API.Validators
@@ -12,20 +11,17 @@ namespace PARR.API.Validators
    {
        private readonly ITnkRepository _tnkRepository;
        private readonly IJobGroupRepository _jobGroupRepository;
-        private readonly IJobRepository _jobRepository;
        private readonly IUnitFieldRepository _unitFieldRepository;
        //private JobGroup? jobGroup;

        public JobRequestValidator(
            ITnkRepository tnkRepository,
            IJobGroupRepository jobGroupRepository,
-            IJobRepository jobRepository,
            IUnitFieldRepository unitFieldRepository
            )
        {
            _tnkRepository = tnkRepository;
            _jobGroupRepository = jobGroupRepository;
-            _jobRepository = jobRepository;
            _unitFieldRepository = unitFieldRepository;

            RuleFor(t => t.Name)
--- a/PARR.API/Validators/MatchTemplatesRequestValidator.cs
+++ b/PARR.API/Validators/MatchTemplatesRequestValidator.cs
@@ -2,7 +2,8 @@
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1.Requests;
 using PARR.Core.Repositories.Interfaces;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
+using PARR.Core.Repositories.Interfaces.JobRepositories;
 using PARR.Domain.Enums;

 namespace PARR.API.Validators
--- a/PARR.API/Validators/TemplateActivatorRequestValidator.cs
+++ b/PARR.API/Validators/TemplateActivatorRequestValidator.cs
@@ -1,7 +1,8 @@
 using FluentValidation;
 using PARR.API.Contracts.V1.Requests;
 using PARR.Core.Repositories.Interfaces;
-using PARR.Core.Repositories.Interfaces.Job;
+using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
+using PARR.Core.Repositories.Interfaces.JobRepositories;
 using PARR.Domain.Enums;

 namespace PARR.API.Validators