merge from dev

AsbCloudApp/Services/IDetectedOperationService.cs

@@ -72,6 +72,7 @@ namespace AsbCloudApp.Services
         /// <param name="request"></param>
         /// <param name="token"></param>
         /// <returns></returns>
+        [Obsolete]
         Task<IEnumerable<DetectedOperationStatDto>> GetOperationsStatAsync(DetectedOperationByWellRequest request, CancellationToken token);
 
         /// <summary>

AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs

@@ -133,18 +133,22 @@ namespace AsbCloudInfrastructure.Repository
             if (ids.Length != dtos.Count())
                 throw new ArgumentInvalidException(nameof(dtos), "Все записи должны иметь уникальные Id");
             
-            var dbSet = dbContext.Set<TEntity>();
+            var existingEntitiesCount = await dbContext.Set<TEntity>()
-            
-            var existingEntitiesCount = await dbSet
                 .Where(o => ids.Contains(o.Id))
                 .CountAsync(token);
             
             if (ids.Length != existingEntitiesCount)
                 throw new ArgumentInvalidException(nameof(dtos), "Все записи должны существовать в БД");
 
-            var entities = dbContext.Set<TEntity>().Where(e => ids.Contains(e.Id));
+            var entities = dtos.Select(Convert);
-            dbContext.Set<TEntity>().UpdateRange(entities);
+            
-            return await dbContext.SaveChangesAsync(token);
+            var entries = entities.Select(entity => dbContext.Set<TEntity>().Update(entity)).ToList();
+
+            var affected = await dbContext.SaveChangesAsync(token);
+            
+            entries.ForEach(entry => entry.State = EntityState.Detached);
+
+            return affected;
         }
 
         /// <inheritdoc/>

AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs

@@ -143,6 +143,7 @@ public class DetectedOperationService : IDetectedOperationService
         }
     }
 
+    [Obsolete]
     public async Task<IEnumerable<DetectedOperationStatDto>> GetOperationsStatAsync(DetectedOperationByWellRequest request, CancellationToken token)
     {
         var well = await wellService.GetOrDefaultAsync(request.IdWell, token);

AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs

@@ -96,7 +96,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 return 0;
 
             entity.IdState = setpointsRequestDto.IdState;
-            var affected = await setpointsRepository.UpdateAsync(entity, token);
+            var affected = await setpointsRepository.UpdateRangeAsync(new[] { entity }, token);
             return affected;
         }
 

AsbCloudInfrastructure/Services/WellService.cs

@@ -274,6 +274,7 @@ namespace AsbCloudInfrastructure.Services
                 dto.Timezone = GetTimezone(entity.Id);
                 
             dto.StartDate = dbContext.WellOperations.Where(e => e.IdType == WellOperation.IdOperationTypeFact)
+                .AsNoTracking()
                 .MinOrDefault(e => e.DateStart)?.ToRemoteDateTime(dto.Timezone.Hours);
             dto.WellType = entity.WellType.Caption;
             dto.Cluster = entity.Cluster.Caption;

AsbCloudWebApi.IntegrationTests/Clients/IWellOperationClient.cs

@@ -29,4 +29,10 @@ public interface IWellOperationClient
 
 	[Get(BaseRoute + "/export")]
 	Task<IApiResponse<PhysicalFileResult>> ExportAsync(int idWell, int idType);
+
+    [Get(BaseRoute + "/template")]
+    Task<IApiResponse<Stream>> GetTemplate(int idWell, int idType);
+
+    [Get(BaseRoute + "/categories")]
+    Task<IApiResponse<IEnumerable<WellOperationCategoryDto>>> GetCategories(int idWell, bool includeParents, bool includeHidden);
 }

AsbCloudWebApi.IntegrationTests/Controllers/WellOperations/WellOperationControllerTest.cs

@@ -1,13 +1,15 @@
-using System.Net;
-using System.Reflection;
 using AsbCloudApp.Data.WellOperation;
 using AsbCloudApp.Requests;
 using AsbCloudDb.Model;
+using AsbCloudInfrastructure;
 using AsbCloudWebApi.IntegrationTests.Clients;
 using AsbCloudWebApi.IntegrationTests.Data;
+using ClosedXML.Excel;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
 using Refit;
+using System.Net;
+using System.Reflection;
 using Xunit;
 
 namespace AsbCloudWebApi.IntegrationTests.Controllers.WellOperations;
@@ -188,6 +190,63 @@ public class WellOperationControllerTest : BaseIntegrationTest
         Assert.True(response.ContentHeaders?.ContentLength > 0);
     }
 
+    [Theory]
+    [InlineData(WellOperation.IdOperationTypePlan)]
+    [InlineData(WellOperation.IdOperationTypeFact)]
+    public async Task MatchCategoriesBetweenTemplateAndDb_returns_success(int idType)
+    {
+        //arrange
+        var well = await dbContext.Wells.FirstAsync();
+        var responseTemplate = await client.GetTemplate(well.Id, idType);
+        var stream = responseTemplate.Content;
+
+        using var workbook = new XLWorkbook(stream);
+        var sheet = workbook.GetWorksheet("Справочники");
+
+        var count = sheet.RowsUsed().Count() - 1;
+
+        var categoryCaptionsInTemplate = new List<string>();
+        for (var i = 0; i < count; i++)
+        {
+            var xlRow = sheet.Row(i + 2);
+            var rowNumber = xlRow.RowNumber();
+
+            var xlCell = xlRow.Cell(1);
+            var cellValue = xlCell.GetText().Trim();
+
+            categoryCaptionsInTemplate.Add(cellValue);
+        }
+
+        var responseCategories = await client.GetCategories(well.Id, false, false);
+        var categories = responseCategories.Content;
+        var categoryCaptionsInDb = categories!.Select(c => c.Name.Trim());
+
+        var notExistedInTemplate = categoryCaptionsInDb.Except(categoryCaptionsInTemplate);
+        var notExistedInDb = categoryCaptionsInTemplate.Except(categoryCaptionsInDb);
+
+        //assert
+        Assert.True(categoryCaptionsInDb.Count() == categoryCaptionsInTemplate.Count());
+        Assert.True(notExistedInTemplate.Count() == 0);
+        Assert.True(notExistedInDb.Count() == 0);
+    }
+
+    private static WellOperation CreateWellOperation(int idWell, int idType = WellOperation.IdOperationTypePlan) =>
+        new()
+        {
+            IdWell = idWell,
+            IdWellSectionType = 2,
+            IdCategory = WellOperationCategory.IdSlide,
+            IdPlan = null,
+            CategoryInfo = "Доп.инфо",
+            LastUpdateDate = new DateTimeOffset(new DateTime(2023, 1, 10)).ToUniversalTime(),
+            IdType = idType,
+            DepthStart = 10.0,
+            DepthEnd = 20.0,
+            DateStart = new DateTimeOffset(new DateTime(2023, 1, 10), TimeSpan.FromHours(Defaults.Timezone.Hours)).ToUniversalTime(),
+            DurationHours = 1.0,
+            Comment = "1",
+            IdUser = 1,
+        };
     [Theory]
     [InlineData(WellOperation.IdOperationTypePlan)]
     [InlineData(WellOperation.IdOperationTypeFact)]
@@ -249,7 +308,7 @@ public class WellOperationControllerTest : BaseIntegrationTest
 			IdWellSectionType = 2,
 			IdCategory = WellOperationCategory.IdSlide,
 			IdPlan = null,
-			CategoryInfo = "Доп.инфо",
+			CategoryInfo = "Äîï.èíôî",
 			LastUpdateDate = new DateTimeOffset(new DateTime(2023, 1, 10)).ToUniversalTime(),
 			IdType = idType,
 			DepthStart = 10.0,

AsbCloudWebApi.Tests/Services/WellCompositeOperation/WellCompositeOperationServiceTest.cs

@@ -36,6 +36,7 @@ namespace AsbCloudWebApi.Tests.Services.WellCompositeOperation
             new(){Id = 5036, Name = "Промывка"},
             new(){Id = 5012, Name = "Подъем инструмента"},
             new(){Id = 5083, Name = "Проработка принудительная"},
+            new(){Id = 5113, Name = "Бурение"},
         };
 
         private readonly static IEnumerable<WellSectionTypeDto> sectionTypes = new List<WellSectionTypeDto>()
@@ -224,7 +225,7 @@ namespace AsbCloudWebApi.Tests.Services.WellCompositeOperation
             // assert
             var compositeWellOperations = result.WellOperationsComposite;
             Assert.Single(compositeWellOperations);
-            Assert.Equal(5003, compositeWellOperations.FirstOrDefault()!.IdCategory);
+            Assert.Equal(5113, compositeWellOperations.FirstOrDefault()!.IdCategory);
             Assert.Equal(1.5, compositeWellOperations.FirstOrDefault()!.DurationHours);
             Assert.Equal(10, compositeWellOperations.FirstOrDefault()!.DepthStart);
         }

AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs

@@ -1,4 +1,5 @@
-using AsbCloudApp.Data.DetectedOperation;
+using System;
+using AsbCloudApp.Data.DetectedOperation;
 using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
@@ -110,7 +111,7 @@ namespace AsbCloudWebApi.Controllers.SAUB
 		}
 
 		/// <summary>
-		/// Получить фильтрованный список операций по телеметрии САУБ
+		/// Получить список автоопределенных операций для редактирования
 		/// </summary>
 		/// <param name="idWell"></param>
 		/// <param name="request"></param>
@@ -118,7 +119,7 @@ namespace AsbCloudWebApi.Controllers.SAUB
 		/// <returns></returns>
 		[HttpGet]
 		[ProducesResponseType(typeof(PaginationContainer<DetectedOperationDto>), StatusCodes.Status200OK)]
-		public async Task<IActionResult> GetAsync(int idWell, [FromQuery] DetectedOperationRequest request,
+		public async Task<IActionResult> GetPageAsync(int idWell, [FromQuery] DetectedOperationRequest request,
 			CancellationToken token)
 		{
 			await AssertUserHasAccessToWellAsync(idWell, token);
@@ -135,22 +136,21 @@ namespace AsbCloudWebApi.Controllers.SAUB
 		}
 		
 		/// <summary>
-		/// Получить статистику по фильтрованному списку операций по телеметрии САУБ
+		/// Получить статистику по автоопределенным операциям
 		/// </summary>
 		/// <param name="idWell"></param>
 		/// <param name="request"></param>
 		/// <param name="token"></param>
 		/// <returns></returns>
 		[HttpGet("stat")]
-		[ProducesResponseType(typeof(IEnumerable<DetectedOperationStatDto>), StatusCodes.Status200OK)]
+		[ProducesResponseType(typeof(DetectedOperationListDto), StatusCodes.Status200OK)]
-		public async Task<IActionResult> GetStatAsync(int idWell, [FromQuery] DetectedOperationRequest request,
+		public async Task<IActionResult> GetAsync(int idWell, [FromQuery] DetectedOperationRequest request, CancellationToken token)
-			CancellationToken token)
 		{
 			await AssertUserHasAccessToWellAsync(idWell, token);
 			
 			var requestToService = new DetectedOperationByWellRequest(idWell, request);
 
-			var result = await detectedOperationService.GetOperationsStatAsync(requestToService, token);
+			var result = await detectedOperationService.GetAsync(requestToService, token);
 			return Ok(result);
 		}