From 8db5860f3ac5b77d63d330cc893e242e0517ebd1 Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Thu, 11 Aug 2022 13:55:36 +0500
Subject: [PATCH] Rename ICrudWellRelatedService to IRepositoryWellRelated, and
 related services

---
 AsbCloudApp/Services/IDrillFlowChartService.cs     |  2 +-
 AsbCloudApp/Services/IOperationValueService.cs     | 12 ------------
 ...RelatedService.cs => IRepositoryWellRelated.cs} |  9 +++++----
 AsbCloudApp/Services/IScheduleService.cs           |  4 ++--
 AsbCloudInfrastructure/DependencyInjection.cs      |  6 +++---
 .../Repository/CrudWellRelatedCacheServiceBase.cs  |  2 +-
 .../Repository/CrudWellRelatedServiceBase.cs       |  2 +-
 .../DetectOperations/DetectedOperationService.cs   |  4 ++--
 .../Services/DrillFlowChartService.cs              |  8 +++-----
 .../Services/OperationValueService.cs              | 14 --------------
 AsbCloudInfrastructure/Services/ScheduleService.cs |  4 ++--
 .../ServicesTests/DetectedOperationServiceTest.cs  |  2 +-
 .../ServicesTests/ScheduleServiceTest.cs           |  4 ++--
 .../Controllers/CrudWellRelatedController.cs       |  2 +-
 .../Controllers/DrillFlowChartController.cs        |  4 ++--
 AsbCloudWebApi/Controllers/ScheduleController.cs   |  6 +++---
 16 files changed, 29 insertions(+), 56 deletions(-)
 delete mode 100644 AsbCloudApp/Services/IOperationValueService.cs
 rename AsbCloudApp/Services/{ICrudWellRelatedService.cs => IRepositoryWellRelated.cs} (70%)
 delete mode 100644 AsbCloudInfrastructure/Services/OperationValueService.cs

diff --git a/AsbCloudApp/Services/IDrillFlowChartService.cs b/AsbCloudApp/Services/IDrillFlowChartService.cs
index 54e98b71..dbe675d1 100644
--- a/AsbCloudApp/Services/IDrillFlowChartService.cs
+++ b/AsbCloudApp/Services/IDrillFlowChartService.cs
@@ -9,7 +9,7 @@ namespace AsbCloudApp.Services
     /// <summary>
     /// ���
     /// </summary>
-    public interface IDrillFlowChartService : ICrudWellRelatedService<DrillFlowChartDto>
+    public interface IDrillFlowChartRepository : IRepositoryWellRelated<DrillFlowChartDto>
     {
         /// <summary>
         /// �������� ��������� ������� ������� � ����.
diff --git a/AsbCloudApp/Services/IOperationValueService.cs b/AsbCloudApp/Services/IOperationValueService.cs
deleted file mode 100644
index da097507..00000000
--- a/AsbCloudApp/Services/IOperationValueService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using AsbCloudApp.Data;
-
-namespace AsbCloudApp.Services
-{
-    // TODO: Remove this
-    /// <summary>
-    /// 
-    /// </summary>
-    public interface IOperationValueService : ICrudWellRelatedService<OperationValueDto>
-    {
-    }
-}
diff --git a/AsbCloudApp/Services/ICrudWellRelatedService.cs b/AsbCloudApp/Services/IRepositoryWellRelated.cs
similarity index 70%
rename from AsbCloudApp/Services/ICrudWellRelatedService.cs
rename to AsbCloudApp/Services/IRepositoryWellRelated.cs
index b09e21bd..6ce2af0e 100644
--- a/AsbCloudApp/Services/ICrudWellRelatedService.cs
+++ b/AsbCloudApp/Services/IRepositoryWellRelated.cs
@@ -5,12 +5,13 @@ using System.Threading.Tasks;
 
 namespace AsbCloudApp.Services
 {
+#nullable enable
     /// <summary>
-    /// Сервис получения, добавления, изменения, удаления данных<br/>
+    /// Репозиторий получения, добавления, изменения, удаления данных<br/>
     /// Для сущностей относящихся к скважине
     /// </summary>
     /// <typeparam name="Tdto"></typeparam>
-    public interface ICrudWellRelatedService<Tdto> : ICrudService<Tdto>
+    public interface IRepositoryWellRelated<Tdto> : ICrudService<Tdto>
         where Tdto : IId, IWellRelated
     {
         /// <summary>
@@ -19,7 +20,7 @@ namespace AsbCloudApp.Services
         /// <param name="idWell">id скважины</param>
         /// <param name="token"></param>
         /// <returns>emptyList if nothing found</returns>
-        Task<IEnumerable<Tdto>> GetByIdWellAsync(int idWell, CancellationToken token);
+        Task<IEnumerable<Tdto>?> GetByIdWellAsync(int idWell, CancellationToken token);
 
         /// <summary>
         /// Получение всех записей по нескольким скважинам
@@ -27,7 +28,7 @@ namespace AsbCloudApp.Services
         /// <param name="idsWells">id скважин</param>
         /// <param name="token"></param>
         /// <returns>emptyList if nothing found</returns>
-        Task<IEnumerable<Tdto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token);
+        Task<IEnumerable<Tdto>?> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token);
     }
 #nullable disable
 }
\ No newline at end of file
diff --git a/AsbCloudApp/Services/IScheduleService.cs b/AsbCloudApp/Services/IScheduleService.cs
index 4a0d9fb4..375b9103 100644
--- a/AsbCloudApp/Services/IScheduleService.cs
+++ b/AsbCloudApp/Services/IScheduleService.cs
@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 namespace AsbCloudApp.Services
 {
     /// <summary>
-    /// Сервис расписания смен бурильщика
+    /// Репозиторий расписания смен бурильщика
     /// </summary>
-    public interface IScheduleService : ICrudWellRelatedService<ScheduleDto>
+    public interface IScheduleRepository : IRepositoryWellRelated<ScheduleDto>
     {
         // TODO: this should be nullable.
         /// <summary>
diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs
index cbcab698..0fb1fc16 100644
--- a/AsbCloudInfrastructure/DependencyInjection.cs
+++ b/AsbCloudInfrastructure/DependencyInjection.cs
@@ -92,7 +92,7 @@ namespace AsbCloudInfrastructure
 
             services.AddTransient<IAuthService, AuthService>();
             services.AddTransient<IClusterService, ClusterService>();
-            services.AddTransient<IDrillFlowChartService, DrillFlowChartService>();
+            services.AddTransient<IDrillFlowChartRepository, DrillFlowChartRepository>();
             services.AddTransient<IDrillingProgramService, DrillingProgramService>();
             services.AddTransient<IDrillParamsService, DrillParamsService>();
             services.AddTransient<IEventService, EventService>();
@@ -115,8 +115,8 @@ namespace AsbCloudInfrastructure
             services.AddTransient<IDailyReportService, DailyReportService>();
             services.AddTransient<IDetectedOperationService, DetectedOperationService>();
             services.AddTransient<IDrillerService, DrillerService>();
-            services.AddTransient<IScheduleService, ScheduleService>();
-            services.AddTransient<IOperationValueService, OperationValueService>();
+            services.AddTransient<IScheduleRepository, ScheduleRepository>();
+            services.AddTransient<IRepositoryWellRelated<OperationValueDto>, CrudWellRelatedServiceBase<OperationValueDto, OperationValue>>();
             services.AddTransient<IUserSettingsRepository, UserSettingsRepository>();
 
             // admin crud services:
diff --git a/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheServiceBase.cs b/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheServiceBase.cs
index fddcb8aa..f4e60abd 100644
--- a/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheServiceBase.cs
+++ b/AsbCloudInfrastructure/Repository/CrudWellRelatedCacheServiceBase.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 namespace AsbCloudInfrastructure.Repository
 {
 #nullable enable
-    public class CrudWellRelatedCacheServiceBase<TDto, TEntity> : CrudCacheServiceBase<TDto, TEntity>, ICrudWellRelatedService<TDto>
+    public class CrudWellRelatedCacheServiceBase<TDto, TEntity> : CrudCacheServiceBase<TDto, TEntity>, IRepositoryWellRelated<TDto>
         where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated
         where TEntity : class, IId, IWellRelated
     {
diff --git a/AsbCloudInfrastructure/Repository/CrudWellRelatedServiceBase.cs b/AsbCloudInfrastructure/Repository/CrudWellRelatedServiceBase.cs
index eb65cd9d..49bab949 100644
--- a/AsbCloudInfrastructure/Repository/CrudWellRelatedServiceBase.cs
+++ b/AsbCloudInfrastructure/Repository/CrudWellRelatedServiceBase.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 namespace AsbCloudInfrastructure.Repository
 {
 #nullable enable
-    public class CrudWellRelatedServiceBase<TDto, TEntity> : CrudServiceBase<TDto, TEntity>, ICrudWellRelatedService<TDto>
+    public class CrudWellRelatedServiceBase<TDto, TEntity> : CrudServiceBase<TDto, TEntity>, IRepositoryWellRelated<TDto>
         where TDto : AsbCloudApp.Data.IId, AsbCloudApp.Data.IWellRelated
         where TEntity : class, IId, IWellRelated
     {
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
index 5b2d2071..3b9b1379 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
@@ -38,10 +38,10 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
         private readonly IAsbCloudDbContext db;
         private readonly IWellService wellService;
         private readonly IOperationValueService operationValueService;
-        private readonly IScheduleService scheduleService;
+        private readonly IScheduleRepository scheduleService;
 
         public DetectedOperationService(IAsbCloudDbContext db, IWellService wellService,
-            IOperationValueService operationValueService, IScheduleService scheduleService)
+            IOperationValueService operationValueService, IScheduleRepository scheduleService)
         {
             this.db = db;
             this.wellService = wellService;
diff --git a/AsbCloudInfrastructure/Services/DrillFlowChartService.cs b/AsbCloudInfrastructure/Services/DrillFlowChartService.cs
index 33c6ef78..8b35dc04 100644
--- a/AsbCloudInfrastructure/Services/DrillFlowChartService.cs
+++ b/AsbCloudInfrastructure/Services/DrillFlowChartService.cs
@@ -12,16 +12,14 @@ using System.Threading.Tasks;
 
 namespace AsbCloudInfrastructure.Services
 {
-    public class DrillFlowChartService : CrudWellRelatedServiceBase<DrillFlowChartDto, DrillFlowChart>,
-        IDrillFlowChartService
+    public class DrillFlowChartRepository : CrudWellRelatedServiceBase<DrillFlowChartDto, DrillFlowChart>,
+        IDrillFlowChartRepository
     {
-        private readonly IAsbCloudDbContext db;
         private readonly IWellService wellService;
 
-        public DrillFlowChartService(IAsbCloudDbContext context, IWellService wellService)
+        public DrillFlowChartRepository(IAsbCloudDbContext context, IWellService wellService)
             : base(context)
         {
-            this.db = context;
             this.wellService = wellService;
         }
 
diff --git a/AsbCloudInfrastructure/Services/OperationValueService.cs b/AsbCloudInfrastructure/Services/OperationValueService.cs
deleted file mode 100644
index 05d36f62..00000000
--- a/AsbCloudInfrastructure/Services/OperationValueService.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using AsbCloudApp.Data;
-using AsbCloudApp.Services;
-using AsbCloudDb.Model;
-using AsbCloudInfrastructure.Repository;
-
-namespace AsbCloudInfrastructure.Services
-{
-    public class OperationValueService : CrudWellRelatedServiceBase<OperationValueDto, OperationValue>, IOperationValueService
-    {
-        public OperationValueService(IAsbCloudDbContext context) : base(context)
-        {
-        }
-    }
-}
diff --git a/AsbCloudInfrastructure/Services/ScheduleService.cs b/AsbCloudInfrastructure/Services/ScheduleService.cs
index 06a75a1d..8781778e 100644
--- a/AsbCloudInfrastructure/Services/ScheduleService.cs
+++ b/AsbCloudInfrastructure/Services/ScheduleService.cs
@@ -12,11 +12,11 @@ using System.Threading.Tasks;
 namespace AsbCloudInfrastructure.Services
 {
 #nullable enable
-    public class ScheduleService : CrudWellRelatedServiceBase<ScheduleDto, Schedule>, IScheduleService
+    public class ScheduleRepository : CrudWellRelatedServiceBase<ScheduleDto, Schedule>, IScheduleRepository
     {
         private readonly IWellService wellService;
 
-        public ScheduleService(IAsbCloudDbContext context, IWellService wellService)
+        public ScheduleRepository(IAsbCloudDbContext context, IWellService wellService)
             : base(context, dbSet => dbSet.Include(s => s.Driller))
         {
             this.wellService = wellService;
diff --git a/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs
index 03bcff27..cbf687c5 100644
--- a/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs
+++ b/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs
@@ -125,7 +125,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
             wellServiceMock.Setup(s => s.GetTimezone(It.IsAny<int>())).Returns(timezone);
             wellServiceMock.Setup(s => s.GetOrDefaultAsync(It.IsAny<int>(),CancellationToken.None)).Returns(Task.Run(() => wellDto));
             var operationValueService = new OperationValueService(context);
-            var scheduleService = new ScheduleService(context, wellServiceMock.Object);
+            var scheduleService = new ScheduleRepository(context, wellServiceMock.Object);
 
             service = new DetectedOperationService(context, wellServiceMock.Object, operationValueService, scheduleService);
             request = new DetectedOperationRequest
diff --git a/AsbCloudWebApi.Tests/ServicesTests/ScheduleServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/ScheduleServiceTest.cs
index 9c707ef0..c46568c9 100644
--- a/AsbCloudWebApi.Tests/ServicesTests/ScheduleServiceTest.cs
+++ b/AsbCloudWebApi.Tests/ServicesTests/ScheduleServiceTest.cs
@@ -14,7 +14,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
     public class ScheduleServiceTest
     {
         private readonly AsbCloudDbContext context;
-        private readonly ScheduleService scheduleService;
+        private readonly ScheduleRepository scheduleService;
         private Deposit deposit = new Deposit { Id = 1, Caption = "Депозит 1" };
         private Cluster clater = new Cluster { Id = 1, Caption = "Кластер 1", IdDeposit = 1, Timezone = new SimpleTimezone() };
         private Schedule scd = new Schedule
@@ -71,7 +71,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
             var timezone = new SimpleTimezoneDto { Hours = 5 };
             var wellServiceMock = new Mock<IWellService>();
             wellServiceMock.Setup(s => s.GetTimezone(It.IsAny<int>())).Returns(timezone);
-            scheduleService = new ScheduleService(context, wellServiceMock.Object);
+            scheduleService = new ScheduleRepository(context, wellServiceMock.Object);
             AsbCloudInfrastructure.DependencyInjection.MapsterSetup();
         }
 
diff --git a/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs b/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs
index 3fd0140a..236d13e1 100644
--- a/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs
+++ b/AsbCloudWebApi/Controllers/CrudWellRelatedController.cs
@@ -20,7 +20,7 @@ namespace AsbCloudWebApi.Controllers
     [Authorize]
     public abstract class CrudWellRelatedController<T, TService> : CrudController<T, TService>
         where T : IId, IWellRelated
-        where TService : ICrudWellRelatedService<T>
+        where TService : IRepositoryWellRelated<T>
     {
         protected readonly IWellService wellService;
 
diff --git a/AsbCloudWebApi/Controllers/DrillFlowChartController.cs b/AsbCloudWebApi/Controllers/DrillFlowChartController.cs
index cc4d4b52..99c2875d 100644
--- a/AsbCloudWebApi/Controllers/DrillFlowChartController.cs
+++ b/AsbCloudWebApi/Controllers/DrillFlowChartController.cs
@@ -15,11 +15,11 @@ namespace AsbCloudWebApi.Controllers
     [ApiController]
     [Route("api/[controller]")]
     [Authorize]
-    public class DrillFlowChartController : CrudWellRelatedController<DrillFlowChartDto, IDrillFlowChartService>
+    public class DrillFlowChartController : CrudWellRelatedController<DrillFlowChartDto, IDrillFlowChartRepository>
     {
         private readonly ITelemetryService telemetryService;
 
-        public DrillFlowChartController(IWellService wellService, IDrillFlowChartService service,
+        public DrillFlowChartController(IWellService wellService, IDrillFlowChartRepository service,
             ITelemetryService telemetryService)
             : base(wellService, service)
         {
diff --git a/AsbCloudWebApi/Controllers/ScheduleController.cs b/AsbCloudWebApi/Controllers/ScheduleController.cs
index 4e4a9a58..e0c0752a 100644
--- a/AsbCloudWebApi/Controllers/ScheduleController.cs
+++ b/AsbCloudWebApi/Controllers/ScheduleController.cs
@@ -14,11 +14,11 @@ namespace AsbCloudWebApi.Controllers
     [Route("api/schedule")]
     [ApiController]
     [Authorize]
-    public class ScheduleController : CrudWellRelatedController<ScheduleDto, IScheduleService>
+    public class ScheduleController : CrudWellRelatedController<ScheduleDto, IScheduleRepository>
     {
-        private readonly IScheduleService scheduleService;
+        private readonly IScheduleRepository scheduleService;
 
-        public ScheduleController(IScheduleService scheduleService, IWellService wellService)
+        public ScheduleController(IScheduleRepository scheduleService, IWellService wellService)
             : base(wellService, scheduleService)
         {
             this.scheduleService = service;