#6539681

AsbCloudApp/Services/IFileService.cs

@@ -149,5 +149,13 @@ namespace AsbCloudApp.Services
         /// <param name="token"></param>
         /// <returns></returns>
         Task<FileInfoDto> GetOrDefaultAsync(int id, CancellationToken token);
+
+        /// <summary>
+        /// получить инфо о файле по метке
+        /// </summary>
+        /// <param name="idMark"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token);
     }
 }

AsbCloudInfrastructure/Services/FileService.cs

@@ -179,5 +179,9 @@ namespace AsbCloudInfrastructure.Services
         public async Task<FileInfoDto> GetOrDefaultAsync(int id, CancellationToken token)
             => await fileRepository.GetOrDefaultAsync(id, token)
                 .ConfigureAwait(false);
+
+        public async Task<FileInfoDto> GetByMarkId(int idMark, CancellationToken token)
+            => await fileRepository.GetByMarkId(idMark, token)
+                .ConfigureAwait(false);
     }
 }

AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs

@@ -1,6 +1,7 @@
 using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
+using AsbCloudInfrastructure.Repository;
 using AsbCloudInfrastructure.Services.DrillingProgram;
 using Mapster;
 using Microsoft.Extensions.Configuration;
@@ -80,6 +81,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
         private readonly Mock<IFileService> fileServiceMock;
         private readonly Mock<IUserService> userServiceMock;
         private readonly Mock<IWellService> wellServiceMock;
+        private readonly Mock<IFileRepository> fileRepository;
         private readonly Mock<IConfiguration> configurationMock;
         private readonly Mock<IBackgroundWorkerService> backgroundWorkerMock;
         private readonly Mock<IEmailService> emailService;
@@ -99,6 +101,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
             fileServiceMock = new Mock<IFileService>();
             userServiceMock = new Mock<IUserService>();
             wellServiceMock = new Mock<IWellService>();
+            fileRepository = new Mock<IFileRepository>();
             configurationMock = new Mock<IConfiguration>();
             backgroundWorkerMock = new Mock<IBackgroundWorkerService>();
         }
@@ -111,6 +114,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -128,6 +132,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -147,6 +152,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -170,6 +176,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -205,6 +212,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -231,6 +239,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -262,6 +271,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -300,6 +310,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -327,6 +338,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -354,6 +366,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);
@@ -384,6 +397,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 fileServiceMock.Object,
                 userServiceMock.Object,
                 wellServiceMock.Object,
+                fileRepository.Object,
                 configurationMock.Object,
                 backgroundWorkerMock.Object,
                 emailService.Object);

AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs

@@ -23,6 +23,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
         private readonly Mock<IConfiguration> configurationMock;
         private readonly Mock<IEmailService> emailServiceMock;
         private readonly Mock<IFileCategoryService> fileCategoryService;
+        private readonly Mock<IFileRepository> fileRepository;
 
         private readonly IEnumerable<UserDto> users = new List<UserDto> {
             new UserDto { 
@@ -52,6 +53,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
             configurationMock = new Mock<IConfiguration>();
             emailServiceMock = new Mock<IEmailService>();
             fileCategoryService = new Mock<IFileCategoryService>();
+            fileRepository = new Mock<IFileRepository>();
 
             service = new WellFinalDocumentsService(
                 context: context,
@@ -60,7 +62,8 @@ namespace AsbCloudWebApi.Tests.ServicesTests
                 wellService: wellServiceMock.Object,
                 configuration: configurationMock.Object,
                 emailService: emailServiceMock.Object,
-                fileCategoryService: fileCategoryService.Object);
+                fileCategoryService: fileCategoryService.Object,
+                fileRepository.Object);
         }
 
         ~WellFinalDocumentsServiceTest()