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

#5998816 Permission, Controllers

Browse Source
This commit is contained in:
ai.astrakhantsev 2022-09-13 10:06:56 +05:00
parent 44be18f5ed
commit d42a5ee544
7 changed files with 6752 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6648
AsbCloudDb/Migrations/20220913044712_Update_t_permission_well_doument.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

71
AsbCloudDb/Migrations/20220913044712_Update_t_permission_well_doument.cs Normal file
View File

@ -0,0 +1,71 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
public partial class Update_t_permission_well_doument : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 503,
column: "name",
value: "WellFinalDocuments.delete");
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 504,
column: "name",
value: "WellFinalDocuments.edit");
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 505,
column: "name",
value: "WellFinalDocuments.get");
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 506,
column: "name",
value: "WellFinalDocuments.editPublisher");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 503,
column: "name",
value: "WellFinalDocument.delete");
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 504,
column: "name",
value: "WellFinalDocument.edit");
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 505,
column: "name",
value: "WellFinalDocument.get");
migrationBuilder.UpdateData(
table: "t_permission",
keyColumn: "id",
keyValue: 506,
column: "name",
value: "WellFinalDocument.editPublisher");
}
}
}

8
AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
View File

@ -1890,25 +1890,25 @@ namespace AsbCloudDb.Migrations
{ {
Id = 503, Id = 503,
Description = "Разрешение удалять Дело скважины", Description = "Разрешение удалять Дело скважины",
Name = "WellFinalDocument.delete" Name = "WellFinalDocuments.delete"
}, },
new new
{ {
Id = 504, Id = 504,
Description = "Разрешение редактировать Дело скважины", Description = "Разрешение редактировать Дело скважины",
Name = "WellFinalDocument.edit" Name = "WellFinalDocuments.edit"
}, },
new new
{ {
Id = 505, Id = 505,
Description = "Разрешение просматривать Дело скважины", Description = "Разрешение просматривать Дело скважины",
Name = "WellFinalDocument.get" Name = "WellFinalDocuments.get"
}, },
new new
{ {
Id = 506, Id = 506,
Description = "Разрешение редактировать ответственных за загрузку файла Дело скважины", Description = "Разрешение редактировать ответственных за загрузку файла Дело скважины",
Name = "WellFinalDocument.editPublisher" Name = "WellFinalDocuments.editPublisher"
}); });
}); });

8
AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs
View File

@ -126,10 +126,10 @@
new (){ Id = 500, Name="FileCategory.delete", Description="Разрешение удалять Категорий документов файлов"}, new (){ Id = 500, Name="FileCategory.delete", Description="Разрешение удалять Категорий документов файлов"},
new (){ Id = 501, Name="FileCategory.edit", Description="Разрешение редактировать Категорий документов файлов"}, new (){ Id = 501, Name="FileCategory.edit", Description="Разрешение редактировать Категорий документов файлов"},
new (){ Id = 502, Name="FileCategory.get", Description="Разрешение просматривать Категорий документов файлов"}, new (){ Id = 502, Name="FileCategory.get", Description="Разрешение просматривать Категорий документов файлов"},
new (){ Id = 503, Name="WellFinalDocument.delete", Description="Разрешение удалять Дело скважины"}, new (){ Id = 503, Name="WellFinalDocuments.delete", Description="Разрешение удалять Дело скважины"},
new (){ Id = 504, Name="WellFinalDocument.edit", Description="Разрешение редактировать Дело скважины"}, new (){ Id = 504, Name="WellFinalDocuments.edit", Description="Разрешение редактировать Дело скважины"},
new (){ Id = 505, Name="WellFinalDocument.get", Description="Разрешение просматривать Дело скважины"}, new (){ Id = 505, Name="WellFinalDocuments.get", Description="Разрешение просматривать Дело скважины"},
new (){ Id = 506, Name="WellFinalDocument.editPublisher", Description="Разрешение редактировать ответственных за загрузку файла Дело скважины"}, new (){ Id = 506, Name="WellFinalDocuments.editPublisher", Description="Разрешение редактировать ответственных за загрузку файла Дело скважины"},
}; };
} }
} }

2
AsbCloudWebApi.Tests/ServicesTests/FileCategoryServiceTest.cs
View File

@ -29,7 +29,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
[Fact] [Fact]
public async Task GetWellCategoryAsync_return_cnt_file_category() public async Task GetWellCategoryAsync_return_cnt_file_category()
{ {
var cnt = (await service.GetWellCategoryAsync(CancellationToken.None)).Count(); var cnt = (await service.GetWellCategoryAsync(0, CancellationToken.None)).Count();
Assert.NotEqual(0, cnt); Assert.NotEqual(0, cnt);
} }
} }

6
AsbCloudWebApi/Controllers/FileCategoryController.cs
View File

@ -11,7 +11,7 @@ namespace AsbCloudWebApi.Controllers
/// <summary> /// <summary>
/// Категорий документов файлов /// Категорий документов файлов
/// </summary> /// </summary>
[Route("api/fileCategory")] [Route("api/[Controller]")]
[ApiController] [ApiController]
[Authorize] [Authorize]
public class FileCategoryController : CrudController<FileCategoryDto, ICrudService<FileCategoryDto>> public class FileCategoryController : CrudController<FileCategoryDto, ICrudService<FileCategoryDto>>
@ -28,8 +28,8 @@ namespace AsbCloudWebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("/getWellFileCategory")] [Route("/api/fileCategories")]
//[Permission] [Permission]
public async Task<IActionResult> GetWellFileCategory(CancellationToken token = default) public async Task<IActionResult> GetWellFileCategory(CancellationToken token = default)
{ {
var data = await fileCategoryService.GetWellCategoryAsync(token); var data = await fileCategoryService.GetWellCategoryAsync(token);

24
AsbCloudWebApi/Controllers/WellFinalDocumentsController.cs
View File

@ -21,10 +21,15 @@ namespace AsbCloudWebApi.Controllers
{ {
private readonly IWellFinalDocumentsService wellFinalDocumentsService; private readonly IWellFinalDocumentsService wellFinalDocumentsService;
private readonly IWellService wellService; private readonly IWellService wellService;
public WellFinalDocumentsController(IWellFinalDocumentsService wellFinalDocumentsService, IWellService wellService) private readonly IFileCategoryService fileCategoryService;
public WellFinalDocumentsController(
IWellFinalDocumentsService wellFinalDocumentsService,
IWellService wellService,
IFileCategoryService fileCategoryService)
{ {
this.wellFinalDocumentsService = wellFinalDocumentsService; this.wellFinalDocumentsService = wellFinalDocumentsService;
this.wellService = wellService; this.wellService = wellService;
this.fileCategoryService = fileCategoryService;
} }
/// <summary> /// <summary>
@ -54,7 +59,7 @@ namespace AsbCloudWebApi.Controllers
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Permission] [Permission]
[Route("publishers")] [Route("availableUsers")]
[ProducesResponseType(typeof(IEnumerable<UserDto>), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(IEnumerable<UserDto>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetAvailableUsersAsync(int idWell, CancellationToken token = default) public async Task<IActionResult> GetAvailableUsersAsync(int idWell, CancellationToken token = default)
{ {
@ -73,7 +78,7 @@ namespace AsbCloudWebApi.Controllers
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut] [HttpPut]
[Permission("WellFinalDocument.editPublisher")] [Permission("WellFinalDocuments.editPublisher")]
[ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token = default) public async Task<IActionResult> UpdateRangeAsync(int idWell, IEnumerable<WellFinalDocumentInputDto> dtos, CancellationToken token = default)
{ {
@ -128,6 +133,19 @@ namespace AsbCloudWebApi.Controllers
return Ok(data); return Ok(data);
} }
/// <summary>
/// Получение справочника категорий файлов
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("/api/wellFileCategories")]
[Permission]
public async Task<IActionResult> GetWellFileCategory(CancellationToken token = default)
{
var data = await fileCategoryService.GetWellCategoryAsync(token);
return Ok(data);
}
private async Task<bool> CanUserAccessToWellAsync(int idWell, CancellationToken token = default) private async Task<bool> CanUserAccessToWellAsync(int idWell, CancellationToken token = default)
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();