diff --git a/AsbCloudApp/Data/SAUB/DrillTestDto.cs b/AsbCloudApp/Data/SAUB/DrillTestDto.cs
index acd8ccc6..03f344c2 100644
--- a/AsbCloudApp/Data/SAUB/DrillTestDto.cs
+++ b/AsbCloudApp/Data/SAUB/DrillTestDto.cs
@@ -27,7 +27,7 @@ namespace AsbCloudApp.Data.SAUB
///
/// Связанная с drill_test телеметрия
///
- public TelemetryDto Telemetry { get; set; } = null!;
+ public TelemetryDto? Telemetry { get; set; }
///
/// Параметры теста
diff --git a/AsbCloudInfrastructure/Repository/DrillTestRepository.cs b/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
index 427556a2..4ab892a3 100644
--- a/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
+++ b/AsbCloudInfrastructure/Repository/DrillTestRepository.cs
@@ -17,12 +17,10 @@ namespace AsbCloudInfrastructure.Repository
public class DrillTestRepository : IDrillTestRepository
{
private readonly IAsbCloudDbContext db;
- private readonly IWellService wellService;
- public DrillTestRepository(IAsbCloudDbContext db, IWellService wellService)
+ public DrillTestRepository(IAsbCloudDbContext db)
{
this.db = db;
- this.wellService = wellService;
}
public async Task> GetAllAsync(int idTelemetry, FileReportRequest request, CancellationToken cancellationToken)
@@ -61,7 +59,7 @@ namespace AsbCloudInfrastructure.Repository
throw new ArgumentInvalidException(new string[] { nameof(id), nameof(idTelemetry) }, $"Drill test with id: {id} and idTelemetry: {idTelemetry} does not exist.");
var dto = drillTest.Adapt();
- dto.TimeStampStart = dto.TimeStampStart.ToRemoteDateTime(dto.Telemetry.TimeZone?.Hours ?? 0);
+ dto.TimeStampStart = dto.TimeStampStart.ToRemoteDateTime(dto.Telemetry?.TimeZone?.Hours ?? 0);
return dto;
}
diff --git a/AsbCloudWebApi/Rest/DrillTest.http b/AsbCloudWebApi/Rest/DrillTest.http
new file mode 100644
index 00000000..47d7db66
--- /dev/null
+++ b/AsbCloudWebApi/Rest/DrillTest.http
@@ -0,0 +1,45 @@
+@baseUrl = http://127.0.0.1:5000
+@contentType = application/json
+@contentTypeForFiles = application/octet-stream
+@auth = Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjEiLCJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiZGV2IiwiaWRDb21wYW55IjoiMSIsImh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vd3MvMjAwOC8wNi9pZGVudGl0eS9jbGFpbXMvcm9sZSI6InJvb3QiLCJuYmYiOjE2OTc0MzcwMzEsImV4cCI6MTcyODk5NDYzMSwiaXNzIjoiYSIsImF1ZCI6ImEifQ.vB7Qb3K9gG77iP8y25zB3RcZIQk9cHkq3I1SkcooYJs
+
+@uid = 20210101_000000000
+@id = 1
+@idWell = 55
+
+### drill test
+POST {{baseUrl}}/api/telemetry/{{uid}}/DrillTest
+Content-Type: {{contentType}}
+accept: */*
+
+{
+ "id": @id,
+ "timeStampStart": "2023-10-23T08:55:36.882Z",
+ "depthStart": 10,
+ "params": [
+ {
+ "step": 1,
+ "workload": 2,
+ "speed": 3,
+ "depthSpeed": 4,
+ "timeDrillStep": 5,
+ "depthDrillStep": 15
+ }
+ ]
+}
+
+
+### drill test
+GET {{baseUrl}}/api/well/{{idWell}}/DrillTest/all
+Content-Type: {{contentType}}
+accept: */*
+Authorization: {{auth}}
+
+### drill test
+GET {{baseUrl}}/api/well/{{idWell}}/DrillTest?id={{id}}
+Content-Type: {{contentTypeForFiles}}
+accept: */*
+Authorization: {{auth}}
+
+
+