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

IsCompanyOwnsWell rename to IsCompanyInvolvedInWell

Browse Source
This commit is contained in:
Фролов 2021-07-29 12:39:22 +05:00
parent 59a86e4c4b
commit 77f1f54c30
11 changed files with 90 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
AsbCloudApp/Data/WellSectionDto.cs
View File

@ -2,20 +2,80 @@
{ {
public class WellSectionDto public class WellSectionDto
{ {
public int Id { get; set; }
/// <summary>
/// Конструкция секции
/// </summary>
public string SectionType { get; set; } public string SectionType { get; set; }
/// <summary>
/// Глубина план, м
/// </summary>
public double WellDepthPlan { get; set; } public double WellDepthPlan { get; set; }
/// <summary>
/// Глубина факт, м
/// </summary>
public double WellDepthFact { get; set; } public double WellDepthFact { get; set; }
/// <summary>
/// Период план, д
/// </summary>
public double BuildDaysPlan { get; set; } public double BuildDaysPlan { get; set; }
/// <summary>
/// Период факт, д
/// </summary>
public double BuildDaysFact { get; set; } public double BuildDaysFact { get; set; }
/// <summary>
/// Механическая скорость проходки план, м/час
/// </summary>
public double RateOfPenetrationPlan { get; set; } public double RateOfPenetrationPlan { get; set; }
/// <summary>
/// Механическая скорость проходки факт, м/час
/// </summary>
public double RateOfPenetrationFact { get; set; } public double RateOfPenetrationFact { get; set; }
/// <summary>
/// Рейсовая скорость план, м/час
/// </summary>
public double RouteSpeedPlan { get; set; } public double RouteSpeedPlan { get; set; }
/// <summary>
/// Рейсовая скорость план, м/час
/// </summary>
public double RouteSpeedFact { get; set; } public double RouteSpeedFact { get; set; }
/// <summary>
/// Скорость подъема КНБК план
/// </summary>
public double BhaUpSpeedPlan { get; set; } public double BhaUpSpeedPlan { get; set; }
/// <summary>
/// Скорость подъема КНБК факт
/// </summary>
public double BhaUpSpeedFact { get; set; } public double BhaUpSpeedFact { get; set; }
/// <summary>
/// Скорость спуска КНБК план
/// </summary>
public double BhaDownSpeedPlan { get; set; } public double BhaDownSpeedPlan { get; set; }
/// <summary>
/// Скорость спуска КНБК факт
/// </summary>
public double BhaDownSpeedFact { get; set; } public double BhaDownSpeedFact { get; set; }
/// <summary>
/// Скорость спуска обсадной колонны план
/// </summary>
public double CasingDownSpeedPlan { get; set; } public double CasingDownSpeedPlan { get; set; }
/// <summary>
/// Скорость спуска обсадной колонны факт
/// </summary>
public double CasingDownSpeedFact { get; set; } public double CasingDownSpeedFact { get; set; }
} }
} }

2
AsbCloudApp/Services/IWellService.cs
View File

@ -7,7 +7,7 @@ namespace AsbCloudApp.Services
{ {
IEnumerable<WellDto> GetWellsByCompany(int idCompany); IEnumerable<WellDto> GetWellsByCompany(int idCompany);
IEnumerable<WellDto> GetTransmittingWells(int idCompany); IEnumerable<WellDto> GetTransmittingWells(int idCompany);
bool IsCompanyOwnsWell(int idCompany, int idWell); bool IsCompanyInvolvedInWell(int idCompany, int idWell);
IEnumerable<WellSectionDto> GetSections(int idWell); IEnumerable<WellSectionDto> GetSections(int idWell);
IEnumerable<WellOperationDto> GetOperations(int idWell); IEnumerable<WellOperationDto> GetOperations(int idWell);
} }

20
AsbCloudDb/Model/WellSection.cs
View File

@ -20,28 +20,28 @@ namespace AsbCloudDb.Model
[Column("id_well")] [Column("id_well")]
public int IdWell { get; set; } public int IdWell { get; set; }
[Column("well_depth_plan"), Comment("глубина план")] [Column("well_depth_plan"), Comment("глубина план, м")]
public double WellDepthPlan { get; set; } public double WellDepthPlan { get; set; }
[Column("well_depth_fact"), Comment("глубина факт")] [Column("well_depth_fact"), Comment("глубина факт, м")]
public double WellDepthFact { get; set; } public double WellDepthFact { get; set; }
[Column("build_days_plan"), Comment("период план")] [Column("build_days_plan"), Comment("период план, д")]
public double BuildDaysPlan { get; set; } public double BuildDaysPlan { get; set; }
[Column("build_days_fact"), Comment("период факт")] [Column("build_days_fact"), Comment("период факт, д")]
public double BuildDaysFact { get; set; } public double BuildDaysFact { get; set; }
[Column("rate_of_penetration_plan"), Comment("Механическая скорость проходки план")] [Column("rate_of_penetration_plan"), Comment("Механическая скорость проходки план, м/час")]
public double RateOfPenetrationPlan { get; set; } public double RateOfPenetrationPlan { get; set; }
[Column("rate_of_penetration_fact"), Comment("Механическая скорость проходки факт")] [Column("rate_of_penetration_fact"), Comment("Механическая скорость проходки факт, м/час")]
public double RateOfPenetrationFact { get; set; } public double RateOfPenetrationFact { get; set; }
[Column("route_speed_plan"), Comment("Рейсовая скорость план")] [Column("route_speed_plan"), Comment("Рейсовая скорость план, м/час")]
public double RouteSpeedPlan { get; set; } public double RouteSpeedPlan { get; set; }
[Column("route_speed_fact"), Comment("Рейсовая скорость факт")] [Column("route_speed_fact"), Comment("Рейсовая скорость факт, м/час")]
public double RouteSpeedFact { get; set; } public double RouteSpeedFact { get; set; }
[Column("bha_down_speed_plan"), Comment("Скорость спуска КНБК план")] [Column("bha_down_speed_plan"), Comment("Скорость спуска КНБК план")]
@ -56,10 +56,10 @@ namespace AsbCloudDb.Model
[Column("bha_up_speed_fact"), Comment("Скорость подъема КНБК факт")] [Column("bha_up_speed_fact"), Comment("Скорость подъема КНБК факт")]
public double BhaUpSpeedFact { get; set; } public double BhaUpSpeedFact { get; set; }
[Column("casing_down_speed_plan"), Comment("Скорость спуска ОК план")] [Column("casing_down_speed_plan"), Comment("Скорость спуска обсадной колонны план")]
public double CasingDownSpeedPlan { get; set; } public double CasingDownSpeedPlan { get; set; }
[Column("casing_down_speed_fact"), Comment("Скорость спуска ОК факт")] [Column("casing_down_speed_fact"), Comment("Скорость спуска обсадной колонны факт")]
public double CasingDownSpeedFact { get; set; } public double CasingDownSpeedFact { get; set; }
[JsonIgnore] [JsonIgnore]

3
AsbCloudInfrastructure/Services/WellService.cs
View File

@ -41,10 +41,9 @@ namespace AsbCloudInfrastructure.Services
return wells.Select(w => From(w)); return wells.Select(w => From(w));
} }
public bool IsCompanyOwnsWell(int idCompany, int idWell) public bool IsCompanyInvolvedInWell(int idCompany, int idWell)
=> cacheRelationCompaniesWells.Contains(r => r.IdWell == idWell && r.IdCompany == idCompany); => cacheRelationCompaniesWells.Contains(r => r.IdWell == idWell && r.IdCompany == idCompany);
public IEnumerable<WellSectionDto> GetSections(int idWell) public IEnumerable<WellSectionDto> GetSections(int idWell)
{ {
var entities = db var entities = db

4
AsbCloudWebApi.Tests/ControllersTests/AnalyticsControllerTests.cs
View File

@ -34,7 +34,7 @@ namespace AsbCloudWebApi.Tests.ControllersTests
analyticsService.Setup(s => s.GetWellDepthToDay(It.IsAny<int>())) analyticsService.Setup(s => s.GetWellDepthToDay(It.IsAny<int>()))
.Returns(depthToDayDtos); .Returns(depthToDayDtos);
wellService.Setup(s => s.IsCompanyOwnsWell(It.IsAny<int>(), It.IsAny<int>())) wellService.Setup(s => s.IsCompanyInvolvedInWell(It.IsAny<int>(), It.IsAny<int>()))
.Returns(true); .Returns(true);
controller = new AnalyticsController(analyticsService.Object, controller = new AnalyticsController(analyticsService.Object,
@ -94,7 +94,7 @@ namespace AsbCloudWebApi.Tests.ControllersTests
{ {
var wellServiceReturnsFalse = new Mock<IWellService>(); var wellServiceReturnsFalse = new Mock<IWellService>();
wellServiceReturnsFalse.Setup(s => s.IsCompanyOwnsWell(It.IsAny<int>(), It.IsAny<int>())) wellServiceReturnsFalse.Setup(s => s.IsCompanyInvolvedInWell(It.IsAny<int>(), It.IsAny<int>()))
.Returns(false); .Returns(false);
var newControllerInstance = new AnalyticsController(analyticsService.Object, var newControllerInstance = new AnalyticsController(analyticsService.Object,

10
AsbCloudWebApi/Controllers/AnalyticsController.cs
View File

@ -40,7 +40,7 @@ namespace AsbCloudWebApi.Controllers
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
if (idCompany is null || !wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (idCompany is null || !wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var analytics = analyticsService.GetOperationsByWell(idWell, categoryIds, begin, end, skip, take); var analytics = analyticsService.GetOperationsByWell(idWell, categoryIds, begin, end, skip, take);
@ -63,7 +63,7 @@ namespace AsbCloudWebApi.Controllers
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
if (idCompany is null || !wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (idCompany is null || !wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var wellDepthToDayData = analyticsService.GetWellDepthToDay(idWell); var wellDepthToDayData = analyticsService.GetWellDepthToDay(idWell);
@ -89,7 +89,7 @@ namespace AsbCloudWebApi.Controllers
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
if (idCompany is null || !wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (idCompany is null || !wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var wellDepthToIntervalData = analyticsService.GetWellDepthToInterval(idWell, var wellDepthToIntervalData = analyticsService.GetWellDepthToInterval(idWell,
@ -115,7 +115,7 @@ namespace AsbCloudWebApi.Controllers
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
if (idCompany is null || !wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (idCompany is null || !wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var analytics = analyticsService.GetOperationsSummary(idWell, begin, end); var analytics = analyticsService.GetOperationsSummary(idWell, begin, end);
@ -141,7 +141,7 @@ namespace AsbCloudWebApi.Controllers
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
if (idCompany is null || !wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (idCompany is null || !wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var analytics = analyticsService.GetOperationsToInterval(idWell, intervalSeconds, workBeginSeconds); var analytics = analyticsService.GetOperationsToInterval(idWell, intervalSeconds, workBeginSeconds);

2
AsbCloudWebApi/Controllers/DataController.cs
View File

@ -59,7 +59,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
bool isCompanyOwnsWell = wellService.IsCompanyOwnsWell((int)idCompany, idWell); bool isCompanyOwnsWell = wellService.IsCompanyInvolvedInWell((int)idCompany, idWell);
if (!isCompanyOwnsWell) if (!isCompanyOwnsWell)
return Forbid(); return Forbid();

6
AsbCloudWebApi/Controllers/FileController.cs
View File

@ -42,7 +42,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
if (!wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var fileInfoCollection = files.Select(f => var fileInfoCollection = files.Select(f =>
@ -87,7 +87,7 @@ namespace AsbCloudWebApi.Controllers
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
if (idCompany is null || !wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (idCompany is null || !wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var filesInfo = fileService.GetFilesInfo(idWell, idCategory, var filesInfo = fileService.GetFilesInfo(idWell, idCategory,
@ -117,7 +117,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
if (!wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var fileInfo = fileService.GetFileInfo(fileId); var fileInfo = fileService.GetFileInfo(fileId);

2
AsbCloudWebApi/Controllers/MessageController.cs
View File

@ -58,7 +58,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
bool isCompanyOwnsWell = wellService.IsCompanyOwnsWell((int)idCompany, idWell); bool isCompanyOwnsWell = wellService.IsCompanyInvolvedInWell((int)idCompany, idWell);
if (!isCompanyOwnsWell) if (!isCompanyOwnsWell)
return Forbid(); return Forbid();

8
AsbCloudWebApi/Controllers/ReportController.cs
View File

@ -72,7 +72,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
if (!wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var id = reportService.CreateReport(idWell, idUser, var id = reportService.CreateReport(idWell, idUser,
@ -99,7 +99,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
if (!wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
// TODO: словарь content typoв // TODO: словарь content typoв
var relativePath = Path.Combine(fileService.RootPath, $"{idWell}", var relativePath = Path.Combine(fileService.RootPath, $"{idWell}",
@ -155,7 +155,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
if (!wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
int reportSize = reportService.GetReportPagesCount(idWell, begin, end, stepSeconds, format); int reportSize = reportService.GetReportPagesCount(idWell, begin, end, stepSeconds, format);
@ -178,7 +178,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return Forbid(); return Forbid();
if (!wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
DatesRangeDto wellReportsDatesRange = reportService.GetReportsDatesRange(idWell); DatesRangeDto wellReportsDatesRange = reportService.GetReportsDatesRange(idWell);

4
AsbCloudWebApi/Controllers/WellController.cs
View File

@ -47,7 +47,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return NoContent(); return NoContent();
if (wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var dto = wellService.GetSections(idWell); var dto = wellService.GetSections(idWell);
@ -64,7 +64,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null) if (idCompany is null)
return NoContent(); return NoContent();
if (wellService.IsCompanyOwnsWell((int)idCompany, idWell)) if (!wellService.IsCompanyInvolvedInWell((int)idCompany, idWell))
return Forbid(); return Forbid();
var dto = wellService.GetOperations(idWell); var dto = wellService.GetOperations(idWell);