diff --git a/AsbCloudApp/Services/IFileService.cs b/AsbCloudApp/Services/IFileService.cs
index 89b89f00..c6f299c3 100644
--- a/AsbCloudApp/Services/IFileService.cs
+++ b/AsbCloudApp/Services/IFileService.cs
@@ -149,5 +149,13 @@ namespace AsbCloudApp.Services
///
///
Task GetOrDefaultAsync(int id, CancellationToken token);
+
+ ///
+ /// получить инфо о файле по метке
+ ///
+ ///
+ ///
+ ///
+ Task GetByMarkId(int idMark, CancellationToken token);
}
}
diff --git a/AsbCloudInfrastructure/Services/FileService.cs b/AsbCloudInfrastructure/Services/FileService.cs
index 6970d9b9..5f01fc22 100644
--- a/AsbCloudInfrastructure/Services/FileService.cs
+++ b/AsbCloudInfrastructure/Services/FileService.cs
@@ -179,5 +179,9 @@ namespace AsbCloudInfrastructure.Services
public async Task GetOrDefaultAsync(int id, CancellationToken token)
=> await fileRepository.GetOrDefaultAsync(id, token)
.ConfigureAwait(false);
+
+ public async Task GetByMarkId(int idMark, CancellationToken token)
+ => await fileRepository.GetByMarkId(idMark, token)
+ .ConfigureAwait(false);
}
}
diff --git a/AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs
index 7cea8d32..dfe19eaa 100644
--- a/AsbCloudWebApi.Tests/ServicesTests/DrillingProgramServiceTest.cs
+++ b/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 fileServiceMock;
private readonly Mock userServiceMock;
private readonly Mock wellServiceMock;
+ private readonly Mock fileRepository;
private readonly Mock configurationMock;
private readonly Mock backgroundWorkerMock;
private readonly Mock emailService;
@@ -99,6 +101,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
fileServiceMock = new Mock();
userServiceMock = new Mock();
wellServiceMock = new Mock();
+ fileRepository = new Mock();
configurationMock = new Mock();
backgroundWorkerMock = new Mock();
}
@@ -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);
diff --git a/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs
index ac53a5b9..1957091d 100644
--- a/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs
+++ b/AsbCloudWebApi.Tests/ServicesTests/WellFinalDocumentsServiceTest.cs
@@ -23,6 +23,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
private readonly Mock configurationMock;
private readonly Mock emailServiceMock;
private readonly Mock fileCategoryService;
+ private readonly Mock fileRepository;
private readonly IEnumerable users = new List {
new UserDto {
@@ -52,6 +53,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
configurationMock = new Mock();
emailServiceMock = new Mock();
fileCategoryService = new Mock();
+ fileRepository = new Mock();
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()