on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

#7887519 test

Browse Source
This commit is contained in:
ai.astrakhantsev 2022-11-24 11:15:50 +05:00
parent 454566dc2e
commit 17cf2c6573
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs
View File

@ -3,7 +3,6 @@ using AsbCloudApp.Repositories;
using AsbCloudApp.Requests; using AsbCloudApp.Requests;
using AsbCloudDb.Model; using AsbCloudDb.Model;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
@ -22,37 +21,30 @@ namespace AsbCloudInfrastructure.Repository
} }
public async Task<IEnumerable<LimitingParameterDataDto>> GetStatOrDefaultAsync(LimitingParameterRequest request, WellDto wellDto, CancellationToken token) public async Task<IEnumerable<LimitingParameterDataDto>> GetStatOrDefaultAsync(LimitingParameterRequest request, WellDto wellDto, CancellationToken token)
{ {
try var query = BuildQuery(request, wellDto);
{
var query = BuildQuery(request, wellDto);
if (query is null) if (query is null)
return Enumerable.Empty<LimitingParameterDataDto>();
var data = (await query.ToListAsync(token))
.Select(x => new LimitingParameterDataDto
{
IdWell = wellDto.Id,
IdTelemetry = x.IdTelemetry,
IdFeedRegulator = x.IdFeedRegulator,
DateStart = x.DateStart,
DateEnd = x.DateEnd,
DepthStart = x.DepthStart,
DepthEnd = x.DepthEnd
});
return data;
}
catch (Exception e)
{
return Enumerable.Empty<LimitingParameterDataDto>(); return Enumerable.Empty<LimitingParameterDataDto>();
}
var data = (await query.ToListAsync(token))
.Select(x => new LimitingParameterDataDto
{
IdWell = wellDto.Id,
IdTelemetry = x.IdTelemetry,
IdFeedRegulator = x.IdFeedRegulator,
DateStart = x.DateStart,
DateEnd = x.DateEnd,
DepthStart = x.DepthStart,
DepthEnd = x.DepthEnd
});
return data;
} }
private IQueryable<LimitingParameter> BuildQuery(LimitingParameterRequest request, WellDto wellDto) private IQueryable<LimitingParameter> BuildQuery(LimitingParameterRequest request, WellDto wellDto)
{ {
var query = context.LimitingParameter var query = context.LimitingParameter
//.OrderBy(x => x.Id) .OrderBy(x => x.Id)
.Where(x => x.IdTelemetry == wellDto.IdTelemetry) .Where(x => x.IdTelemetry == wellDto.IdTelemetry)
.AsNoTracking(); .AsNoTracking();

5
AsbCloudWebApi.Tests/ServicesTests/LimitingParameterServiceTest.cs
View File

@ -7,9 +7,7 @@ using AsbCloudInfrastructure.Repository;
using AsbCloudInfrastructure.Services; using AsbCloudInfrastructure.Services;
using Moq; using Moq;
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Xunit; using Xunit;
@ -88,6 +86,9 @@ namespace AsbCloudWebApi.Tests.ServicesTests
{ {
var data = await limitingParameterService.GetStatOrDefaultAsync(limitingParameterRequest, CancellationToken.None); var data = await limitingParameterService.GetStatOrDefaultAsync(limitingParameterRequest, CancellationToken.None);
Assert.NotNull(data); Assert.NotNull(data);
Assert.Single(data);
Assert.Equal(1275, data.First().Depth);
Assert.Equal(10080, data.First().TotalMinutes);
} }
} }
} }