Правка по результатам ревью-3

AsbCloudDb/Migrations/20231115102303_Add_Permissions_For_Trajectory_Fact.cs

@@ -1,41 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AsbCloudDb.Migrations
-{
-    public partial class Add_Permissions_For_Trajectory_Fact : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.InsertData(
-                table: "t_permission",
-                columns: new[] { "id", "description", "name" },
-                values: new object[,]
-                {
-                    { 529, "Разрешение просматривать фактические траектории", "FactTrajectory.edit" },
-                });
-
-            migrationBuilder.InsertData(
-                table: "t_relation_user_role_permission",
-                columns: new[] { "id_permission", "id_user_role" },
-                values: new object[,]
-                {
-                    { 529, 1 },
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DeleteData(
-                table: "t_relation_user_role_permission",
-                keyColumns: new[] { "id_permission", "id_user_role" },
-                keyValues: new object[] { 529, 1 });
-
-            migrationBuilder.DeleteData(
-                table: "t_permission",
-                keyColumn: "id",
-                keyValue: 529);
-        }
-    }
-}

AsbCloudInfrastructure/Repository/TrajectoryNnbRepository.cs

@@ -45,12 +45,18 @@ namespace AsbCloudInfrastructure.Repository
             {
                 IdWell = idWell,
             };
+            var result = await GetByRequestAsync(request, token);
+            return result;
+        }
+
+        public async Task<IEnumerable<TrajectoryGeoFactDto>> GetByRequestAsync(TrajectoryRequest request, CancellationToken token)
+        {
             var entities = (await BuildQuery(request)
-            .Where(coord => coord.Deptsvym.HasValue &&
+           .Where(coord => coord.Deptsvym.HasValue &&
-                            coord.Svyinc.HasValue &&
+                           coord.Svyinc.HasValue &&
-                            coord.Svyazc.HasValue)
+                           coord.Svyazc.HasValue)
-            .AsNoTracking()
+           .AsNoTracking()
-            .ToArrayAsync(token));
+           .ToArrayAsync(token));
 
             var result = entities
                 .Select(coord => new TrajectoryGeoFactDto
@@ -66,10 +72,5 @@ namespace AsbCloudInfrastructure.Repository
 
             return result;
         }
-
-        public Task<IEnumerable<TrajectoryGeoFactDto>> GetByRequestAsync(TrajectoryRequest trajectoryRequest, CancellationToken cancellationToken)
-        {
-            throw new System.NotImplementedException();
-        }
     }
 }

AsbCloudWebApi/Controllers/Trajectory/TrajectoryController.cs

@@ -6,6 +6,7 @@ using AsbCloudInfrastructure.Services.Trajectory.Export;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -17,18 +18,18 @@ namespace AsbCloudWebApi.Controllers.Trajectory
     /// </summary>
     [ApiController]
     [Authorize]
-    public abstract class TrajectoryController<Tdto> : ControllerBase
+    public abstract class TrajectoryController<TDto> : ControllerBase
-        where Tdto : TrajectoryGeoDto
+        where TDto : TrajectoryGeoDto
     {
         protected abstract string fileName { get; set; }
 
         private readonly IWellService wellService;
-        private readonly TrajectoryExportService<Tdto> trajectoryExportService;
+        private readonly TrajectoryExportService<TDto> trajectoryExportService;
-        private readonly ITrajectoryRepository<Tdto> trajectoryRepository;
+        private readonly ITrajectoryRepository<TDto> trajectoryRepository;
 
         public TrajectoryController(IWellService wellService,
-            TrajectoryExportService<Tdto> trajectoryExportService,
+            TrajectoryExportService<TDto> trajectoryExportService,
-            ITrajectoryRepository<Tdto> trajectoryRepository)
+            ITrajectoryRepository<TDto> trajectoryRepository)
         {
             this.trajectoryExportService = trajectoryExportService;
             this.wellService = wellService;
@@ -60,8 +61,8 @@ namespace AsbCloudWebApi.Controllers.Trajectory
         /// <param name="idWell">ключ скважины</param>
         /// <param name="token"> Токен отмены задачи </param>
         /// <returns>Список добавленных координат траектории</returns>
-        //[ProducesResponseType(typeof(IEnumerable<Tdto>), (int)System.Net.HttpStatusCode.OK)]
+        [HttpGet]
-        public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
+        public async Task<ActionResult<IEnumerable<TDto>>> GetAsync(int idWell, CancellationToken token)
         {
             if (!await CanUserAccessToWellAsync(idWell,
                 token).ConfigureAwait(false))