diff --git a/AsbCloudApp/Repositories/IChangeLogRepository.cs b/AsbCloudApp/Repositories/IChangeLogRepository.cs
index b63edda2..359629c6 100644
--- a/AsbCloudApp/Repositories/IChangeLogRepository.cs
+++ b/AsbCloudApp/Repositories/IChangeLogRepository.cs
@@ -2,7 +2,6 @@
using AsbCloudApp.Requests;
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@@ -11,7 +10,7 @@ namespace AsbCloudApp.Repositories;
///
/// Репозиторий для записей с историей
///
-public interface IChangeLogRepository
+public interface IChangeLogRepository
where TDto : IId
{
///
@@ -93,7 +92,7 @@ public interface IChangeLogRepository
///
///
Task> GetCurrent(TRequest request, CancellationToken token);
-
+
///
/// Получение объекта, реализующего интерфейс IChangeLogRepositoryBuilder
diff --git a/AsbCloudDb/Model/ChangeLogAbstract.cs b/AsbCloudDb/Model/ChangeLogAbstract.cs
index d9bc74e0..6320c3dc 100644
--- a/AsbCloudDb/Model/ChangeLogAbstract.cs
+++ b/AsbCloudDb/Model/ChangeLogAbstract.cs
@@ -86,4 +86,10 @@ public abstract class ChangeLogAbstract
///
[Column("id_previous"), Comment("ИД состояния записи: \n0 - актуальная\n1 - замененная\n2 - удаленная")]
public int? IdPrevious { get; set; }
+
+ [ForeignKey(nameof(IdAuthor))]
+ public virtual User Author { get; set; } = null!;
+
+ [ForeignKey(nameof(IdEditor))]
+ public virtual User? Editor { get; set; }
}
diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanBase.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanBase.cs
index 39fba936..912ce7c0 100644
--- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanBase.cs
+++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanBase.cs
@@ -20,12 +20,6 @@ public abstract class ProcessMapPlanBase : ChangeLogAbstract, IId, IWellRelated
[ForeignKey(nameof(IdWell))]
public virtual Well Well { get; set; } = null!;
- [ForeignKey(nameof(IdAuthor))]
- public virtual User Author { get; set; } = null!;
-
- [ForeignKey(nameof(IdEditor))]
- public virtual User? Editor { get; set; }
-
[ForeignKey(nameof(IdWellSectionType))]
public virtual WellSectionType WellSectionType { get; set; } = null!;
}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs
index e692200d..aa8b63dd 100644
--- a/AsbCloudInfrastructure/DependencyInjection.cs
+++ b/AsbCloudInfrastructure/DependencyInjection.cs
@@ -196,11 +196,11 @@ namespace AsbCloudInfrastructure
services.AddTransient();
services.AddTransient<
- IChangeLogRepository,
+ IChangeLogRepository,
ProcessMapPlanBaseRepository>();
services.AddTransient<
- IChangeLogRepository,
+ IChangeLogRepository,
ProcessMapPlanBaseRepository>();
services.AddTransient();
diff --git a/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs b/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs
index 767534df..962759bb 100644
--- a/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs
+++ b/AsbCloudInfrastructure/Repository/ChangeLogRepositoryAbstract.cs
@@ -3,12 +3,9 @@ using AsbCloudApp.Exceptions;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudDb.Model;
-using iText.Signatures;
-using iText.StyledXmlParser.Jsoup.Nodes;
using Mapster;
using Microsoft.EntityFrameworkCore;
using Npgsql;
-using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -17,7 +14,7 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Repository;
-public abstract class ChangeLogRepositoryAbstract : IChangeLogRepository
+public abstract class ChangeLogRepositoryAbstract : IChangeLogRepository
where TDto : AsbCloudApp.Data.IId
where TEntity : ChangeLogAbstract
{
@@ -38,13 +35,15 @@ public abstract class ChangeLogRepositoryAbstract : ICh
ChangeLogRequest request)
{
this.Repository = repository;
- this.Query = repository.db.Set();
+ this.Query = repository.db.Set()
+ .Include(e => e.Author)
+ .Include(e => e.Editor);
if (request.Moment.HasValue)
{
var momentUtc = request.Moment.Value.ToUniversalTime();
- this.Query = this.Query
+ this.Query = this.Query
.Where(e => e.Creation <= momentUtc)
.Where(e => e.Obsolete == null || e.Obsolete >= momentUtc);
}
@@ -58,7 +57,7 @@ public abstract class ChangeLogRepositoryAbstract : ICh
public async Task> GetData(TimeSpan offset, CancellationToken token)
{
-
+
var dtos = await this.Query.Select(e => Repository.Convert(e, offset))
.ToArrayAsync(token);
return dtos;
@@ -323,7 +322,12 @@ public abstract class ChangeLogRepositoryAbstract : ICh
protected abstract TimeSpan GetTimezoneOffset(TRequest request);
- protected abstract IQueryable BuildQuery(TRequest request, IQueryable? query = null);
+ private IQueryable BuildQuery(TRequest request) =>
+ BuildQuery(request, db.Set()
+ .Include(e => e.Author)
+ .Include(e => e.Editor));
+
+ protected abstract IQueryable BuildQuery(TRequest request, IQueryable query);
protected virtual TEntity Convert(TDto dto)
{
diff --git a/AsbCloudInfrastructure/Repository/IChangeLogReposiroryBuilder.cs b/AsbCloudInfrastructure/Repository/IChangeLogReposiroryBuilder.cs
deleted file mode 100644
index c0327135..00000000
--- a/AsbCloudInfrastructure/Repository/IChangeLogReposiroryBuilder.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace AsbCloudInfrastructure.Repository;
-
-internal interface IChangeLogReposiroryBuilder
-{
-}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Repository/ProcessMapPlanBaseRepository.cs b/AsbCloudInfrastructure/Repository/ProcessMapPlanBaseRepository.cs
index 5343cd00..26d58c40 100644
--- a/AsbCloudInfrastructure/Repository/ProcessMapPlanBaseRepository.cs
+++ b/AsbCloudInfrastructure/Repository/ProcessMapPlanBaseRepository.cs
@@ -21,18 +21,12 @@ public class ProcessMapPlanBaseRepository : ChangeLogRepositoryAb
this.wellService = wellService;
}
- protected override IQueryable BuildQuery(ProcessMapPlanBaseRequestWithWell request, IQueryable? query = null)
+ protected override IQueryable BuildQuery(ProcessMapPlanBaseRequestWithWell request, IQueryable query)
{
- if(query is null)
- {
- query = db.Set();
- }
-
- query = query.Include(e => e.Author)
- .Include(e => e.Editor)
- .Include(e => e.Well)
- .Include(e => e.WellSectionType)
- .Where(e => e.IdWell == request.IdWell);
+ query = query
+ .Include(e => e.Well)
+ .Include(e => e.WellSectionType)
+ .Where(e => e.IdWell == request.IdWell);
if (request.UpdateFrom.HasValue)
{
@@ -60,8 +54,6 @@ public class ProcessMapPlanBaseRepository : ChangeLogRepositoryAb
protected override TEntity Convert(TDto dto)
{
var entity = base.Convert(dto);
- //entity.Author = null;
- //entity.Editor = null;
return entity;
}
}
diff --git a/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs b/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs
index 3c4c22e2..15ba5883 100644
--- a/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs
+++ b/AsbCloudInfrastructure/Repository/WellCompositeRepository.cs
@@ -3,7 +3,6 @@ using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudDb.Model;
-using AsbCloudDb.Model.ProcessMaps;
using Mapster;
using Microsoft.EntityFrameworkCore;
using System;
@@ -17,11 +16,11 @@ namespace AsbCloudInfrastructure.Repository;
public class WellCompositeRepository : IWellCompositeRepository
{
private readonly IAsbCloudDbContext db;
- private readonly IChangeLogRepository processMapPlanDrillingRepository;
+ private readonly IChangeLogRepository processMapPlanDrillingRepository;
public WellCompositeRepository(
- IAsbCloudDbContext db,
- IChangeLogRepository processMapPlanDrillingRepository)
+ IAsbCloudDbContext db,
+ IChangeLogRepository processMapPlanDrillingRepository)
{
this.db = db;
this.processMapPlanDrillingRepository = processMapPlanDrillingRepository;
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/WorkOperationDetection.cs b/AsbCloudInfrastructure/Services/DetectOperations/WorkOperationDetection.cs
index 42291195..8a96f26c 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/WorkOperationDetection.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/WorkOperationDetection.cs
@@ -43,10 +43,6 @@ public class WorkOperationDetection: Work
var telemetryId = telemetryIds[i];
var beginDate = lastDetectedDates.TryGetValue(telemetryId, out var date) ? date : (DateTimeOffset?)null;
- if(telemetryId == 939)
- {
- ;
- }
onProgressCallback($"Start detecting telemetry: {telemetryId} from {beginDate}", i / telemetryIds.Length);
var detectedOperations = await detectedOperationService.DetectOperationsAsync(telemetryId, beginDate, token);
diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillingExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillingExportService.cs
index 97d17fcf..5b0935d2 100644
--- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillingExportService.cs
+++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillingExportService.cs
@@ -8,16 +8,15 @@ using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Requests.ExportOptions;
using AsbCloudApp.Services;
-using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ExcelServices.Templates;
using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates;
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
-public class ProcessMapPlanDrillingExportService : ProcessMapPlanExportService
+public class ProcessMapPlanDrillingExportService : ProcessMapPlanExportService
{
public ProcessMapPlanDrillingExportService(
- IChangeLogRepository processMapPlanRepository,
+ IChangeLogRepository processMapPlanRepository,
IWellService wellService)
: base(processMapPlanRepository, wellService)
{
diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanExportService.cs
index 5ea43b18..2b4de002 100644
--- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanExportService.cs
+++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanExportService.cs
@@ -1,36 +1,34 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using AsbCloudApp.Data;
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Requests.ExportOptions;
using AsbCloudApp.Services;
using AsbCloudInfrastructure.Services.ExcelServices;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
-public abstract class ProcessMapPlanExportService : ExportExcelService
- where TDto : ProcessMapPlanBaseDto
+public abstract class ProcessMapPlanExportService : ExportExcelService
+ where TDto : ProcessMapPlanBaseDto
{
- protected readonly IWellService wellService;
+ protected readonly IWellService wellService;
- private readonly IChangeLogRepository processMapPlanRepository;
+ private readonly IChangeLogRepository processMapPlanRepository;
- protected ProcessMapPlanExportService(IChangeLogRepository processMapPlanRepository,
- IWellService wellService)
- {
- this.processMapPlanRepository = processMapPlanRepository;
- this.wellService = wellService;
- }
-
- protected override async Task> GetDtosAsync(WellRelatedExportRequest options, CancellationToken token)
- {
- var request = new ProcessMapPlanBaseRequestWithWell(options.IdWell);
-
- var dtos = await processMapPlanRepository.GetCurrent(request, token);
- return dtos;
- }
+ protected ProcessMapPlanExportService(IChangeLogRepository processMapPlanRepository,
+ IWellService wellService)
+ {
+ this.processMapPlanRepository = processMapPlanRepository;
+ this.wellService = wellService;
+ }
+
+ protected override async Task> GetDtosAsync(WellRelatedExportRequest options, CancellationToken token)
+ {
+ var request = new ProcessMapPlanBaseRequestWithWell(options.IdWell);
+
+ var dtos = await processMapPlanRepository.GetCurrent(request, token);
+ return dtos;
+ }
}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs
index 12e9ac7c..c6b8495e 100644
--- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs
+++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanReamExportService.cs
@@ -1,31 +1,30 @@
-using System.Threading;
-using System.Threading.Tasks;
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Requests.ExportOptions;
using AsbCloudApp.Services;
-using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ExcelServices.Templates;
using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates;
+using System.Threading;
+using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export;
-public class ProcessMapPlanReamExportService : ProcessMapPlanExportService
+public class ProcessMapPlanReamExportService : ProcessMapPlanExportService
{
- protected override ITemplateParameters TemplateParameters => new ProcessMapPlanReamTemplate();
+ protected override ITemplateParameters TemplateParameters => new ProcessMapPlanReamTemplate();
- public ProcessMapPlanReamExportService(
- IChangeLogRepository processMapPlanRepository,
- IWellService wellService)
- : base(processMapPlanRepository, wellService)
- {
- }
-
- protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token)
- {
- var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token);
+ public ProcessMapPlanReamExportService(
+ IChangeLogRepository processMapPlanRepository,
+ IWellService wellService)
+ : base(processMapPlanRepository, wellService)
+ {
+ }
- return $"{caption}_РТК_План_проработка.xlsx";
- }
+ protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token)
+ {
+ var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token);
+
+ return $"{caption}_РТК_План_проработка.xlsx";
+ }
}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs
index c550ef2b..18345122 100644
--- a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs
+++ b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs
@@ -1,6 +1,7 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Data.ProcessMaps.Report;
+using AsbCloudApp.Data.WellOperation;
using AsbCloudApp.Exceptions;
using AsbCloudApp.Extensions;
using AsbCloudApp.Repositories;
@@ -13,21 +14,19 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using AsbCloudApp.Data.WellOperation;
-using AsbCloudDb.Model.ProcessMaps;
namespace AsbCloudInfrastructure.Services.ProcessMaps.Report;
public class ProcessMapReportDrillingService : IProcessMapReportDrillingService
{
private readonly IWellService wellService;
- private readonly IChangeLogRepository processMapPlanBaseRepository;
+ private readonly IChangeLogRepository processMapPlanBaseRepository;
private readonly IDataSaubStatRepository dataSaubStatRepository;
private readonly IWellOperationRepository wellOperationRepository;
private readonly IWellOperationCategoryRepository wellOperationCategoryRepository;
public ProcessMapReportDrillingService(IWellService wellService,
- IChangeLogRepository processMapPlanBaseRepository,
+ IChangeLogRepository processMapPlanBaseRepository,
IDataSaubStatRepository dataSaubStatRepository,
IWellOperationRepository wellOperationRepository,
IWellOperationCategoryRepository wellOperationCategoryRepository
@@ -86,10 +85,10 @@ public class ProcessMapReportDrillingService : IProcessMapReportDrillingService
var wellSectionTypes = wellOperationRepository.GetSectionTypes();
var result = CalcByIntervals(
- request,
- changeLogProcessMaps,
+ request,
+ changeLogProcessMaps,
dataSaubStats,
- orderedWellOperations,
+ orderedWellOperations,
wellOperationCategories,
wellSectionTypes);
@@ -116,17 +115,17 @@ public class ProcessMapReportDrillingService : IProcessMapReportDrillingService
int GetSection(DataSaubStatDto data)
{
- if(lastFoundIndex < orderedWellOperations.Length - 1)
+ if (lastFoundIndex < orderedWellOperations.Length - 1)
{
lastFoundIndex = Array.FindIndex(orderedWellOperations, lastFoundIndex, o => o.DateStart > data.DateStart) - 1;
lastFoundIndex = lastFoundIndex < 0 ? orderedWellOperations.Length - 1 : lastFoundIndex;
}
-
+
var operation = orderedWellOperations[lastFoundIndex];
return operation.IdWellSectionType;
- }
+ }
- ProcessMapPlanDrillingDto? GetProcessMapPlan(int idWellSectionType, DataSaubStatDto data)
+ ProcessMapPlanDrillingDto? GetProcessMapPlan(int idWellSectionType, DataSaubStatDto data)
=> changeLogProcessMaps
.Where(p => p.Item.IdWellSectionType == idWellSectionType)
.Where(p => p.Item.DepthStart <= data.DepthStart)
@@ -170,7 +169,7 @@ public class ProcessMapReportDrillingService : IProcessMapReportDrillingService
var elem = CalcStat(processMapPlan, span, wellOperationCategoryName, wellSectionType);
if (elem is not null)
- list.Add(elem);
+ list.Add(elem);
}
}
return list;
@@ -335,7 +334,7 @@ public class ProcessMapReportDrillingService : IProcessMapReportDrillingService
SetpointUsagePressure: sumDiffDepthByPressure * 100 / diffDepthTotal,
SetpointUsageAxialLoad: sumDiffDepthByAxialLoad * 100 / diffDepthTotal,
SetpointUsageRotorTorque: sumDiffDepthByRotorTorque * 100 / diffDepthTotal,
- SetpointUsageRopPlan: sumDiffDepthByRopPlan * 100/ diffDepthTotal,
+ SetpointUsageRopPlan: sumDiffDepthByRopPlan * 100 / diffDepthTotal,
DrilledTime: drilledTime
);
}
diff --git a/AsbCloudInfrastructure/Services/WellInfoService.cs b/AsbCloudInfrastructure/Services/WellInfoService.cs
index f1528df6..07bb6e39 100644
--- a/AsbCloudInfrastructure/Services/WellInfoService.cs
+++ b/AsbCloudInfrastructure/Services/WellInfoService.cs
@@ -7,7 +7,6 @@ using AsbCloudApp.IntegrationEvents.Interfaces;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
-using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Background;
using Mapster;
using Microsoft.Extensions.DependencyInjection;
@@ -33,7 +32,7 @@ public class WellInfoService
{
var wellService = services.GetRequiredService();
var operationsStatService = services.GetRequiredService();
- var processMapPlanWellDrillingRepository = services.GetRequiredService>();
+ var processMapPlanWellDrillingRepository = services.GetRequiredService>();
var subsystemService = services.GetRequiredService();
var telemetryDataSaubCache = services.GetRequiredService>();
var messageHub = services.GetRequiredService>();
@@ -98,14 +97,14 @@ public class WellInfoService
int? idSection = wellLastFactSection?.Id;
ProcessMapPlanDrillingDto? processMapPlanWellDrilling = null;
- if(idSection.HasValue && currentDepth.HasValue)
+ if (idSection.HasValue && currentDepth.HasValue)
{
processMapPlanWellDrilling = wellProcessMaps
.Where(p => p.IdWellSectionType == idSection)
.Where(p => p.DepthStart <= currentDepth.Value && p.DepthEnd >= currentDepth.Value)
.FirstOrDefault();
- }
- else if(currentDepth.HasValue)
+ }
+ else if (currentDepth.HasValue)
{
processMapPlanWellDrilling = wellProcessMaps.FirstOrDefault(p => p.DepthStart <= currentDepth.Value && p.DepthEnd >= currentDepth.Value);
}
diff --git a/AsbCloudInfrastructure/Startup.cs b/AsbCloudInfrastructure/Startup.cs
index 25f4ba61..ab555c1c 100644
--- a/AsbCloudInfrastructure/Startup.cs
+++ b/AsbCloudInfrastructure/Startup.cs
@@ -30,7 +30,7 @@ namespace AsbCloudInfrastructure
var backgroundWorker = provider.GetRequiredService();
backgroundWorker.Add(TimeSpan.FromDays(1));
- backgroundWorker.Add(TimeSpan.FromMinutes(0));
+ backgroundWorker.Add(TimeSpan.FromMinutes(30));
backgroundWorker.Add(TimeSpan.FromMinutes(0));
backgroundWorker.Add(TimeSpan.FromMinutes(0));
backgroundWorker.Add(TimeSpan.FromMinutes(0));
diff --git a/AsbCloudWebApi.Tests/Services/ProcessMaps/ProcessMapReportDataSaubStatServiceTest.cs b/AsbCloudWebApi.Tests/Services/ProcessMaps/ProcessMapReportDataSaubStatServiceTest.cs
index 8cbcdbf8..2e0f24c8 100644
--- a/AsbCloudWebApi.Tests/Services/ProcessMaps/ProcessMapReportDataSaubStatServiceTest.cs
+++ b/AsbCloudWebApi.Tests/Services/ProcessMaps/ProcessMapReportDataSaubStatServiceTest.cs
@@ -5,7 +5,6 @@ using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudDb.Model;
-using AsbCloudDb.Model.ProcessMaps;
using AsbCloudInfrastructure.Services.ProcessMaps.Report;
using NSubstitute;
using System;
@@ -24,8 +23,8 @@ public class ProcessMapReportDataSaubStatServiceTest
private IWellService wellService
= Substitute.For();
- private IChangeLogRepository processMapPlanBaseRepository
- = Substitute.For>();
+ private IChangeLogRepository processMapPlanBaseRepository
+ = Substitute.For>();
private IWellOperationRepository wellOperationRepository
= Substitute.For();
diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs
index 953c6c04..1362266d 100644
--- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs
+++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanBaseController.cs
@@ -9,10 +9,8 @@ using AsbCloudApp.Services;
using AsbCloudApp.Services.Export;
using AsbCloudApp.Services.Parsers;
using AsbCloudDb.Model.ProcessMapPlan;
-using DocumentFormat.OpenXml.Drawing;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.HttpResults;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
@@ -34,13 +32,13 @@ public abstract class ProcessMapPlanBaseController : ControllerBa
where TEntity : ProcessMapPlanBase
where TDto : ProcessMapPlanBaseDto
{
- private readonly IChangeLogRepository repository;
+ private readonly IChangeLogRepository repository;
private readonly IWellService wellService;
private readonly IParserService parserService;
private readonly ITelemetryService telemetryService;
private readonly IExportService processMapPlanExportService;
- protected ProcessMapPlanBaseController(IChangeLogRepository repository,
+ protected ProcessMapPlanBaseController(IChangeLogRepository repository,
IWellService wellService,
IParserService parserService,
IExportService processMapPlanExportService,
diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillingController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillingController.cs
index 14a5d782..60d68436 100644
--- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillingController.cs
+++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillingController.cs
@@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
///
public class ProcessMapPlanDrillingController : ProcessMapPlanBaseController
{
- public ProcessMapPlanDrillingController(IChangeLogRepository repository,
+ public ProcessMapPlanDrillingController(IChangeLogRepository repository,
IWellService wellService,
ProcessMapPlanDrillingParser parserService,
ITelemetryService telemetryService,
diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamController.cs
index 349cf42d..2e9aeedf 100644
--- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamController.cs
+++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamController.cs
@@ -13,7 +13,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps;
///
public class ProcessMapPlanReamController : ProcessMapPlanBaseController
{
- public ProcessMapPlanReamController(IChangeLogRepository repository,
+ public ProcessMapPlanReamController(IChangeLogRepository repository,
IWellService wellService,
ProcessMapPlanReamParser parserService,
ITelemetryService telemetryService,
diff --git a/AsbCloudWebApi/Controllers/WellCompositeController.cs b/AsbCloudWebApi/Controllers/WellCompositeController.cs
index d4a74ebf..903966dd 100644
--- a/AsbCloudWebApi/Controllers/WellCompositeController.cs
+++ b/AsbCloudWebApi/Controllers/WellCompositeController.cs
@@ -79,7 +79,7 @@ namespace AsbCloudWebApi.Controllers
if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
return Forbid();
- var result = wellCompositeRepository.GetCompositeProcessMap(idWell, token);
+ var result = await wellCompositeRepository.GetCompositeProcessMap(idWell, token).ConfigureAwait(false);
return Ok(result);
}