diff --git a/AsbCloudDb/Migrations/20230626064513_Add_Permissions_RelationContactWell.cs b/AsbCloudDb/Migrations/20230626064513_Add_Permissions_RelationContactWell.cs deleted file mode 100644 index cc17353e..00000000 --- a/AsbCloudDb/Migrations/20230626064513_Add_Permissions_RelationContactWell.cs +++ /dev/null @@ -1,53 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace AsbCloudDb.Migrations -{ - public partial class Add_Permissions_RelationContactWell : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.InsertData( - table: "t_permission", - columns: new[] { "id", "description", "name" }, - values: new object[,] - { - { 519, "Разрешение просматривать список контактов", "RelationContactWell.get" }, - { 520, "Разрешение редактировать список контактов", "RelationContactWell.edit" } - }); - - migrationBuilder.InsertData( - table: "t_relation_user_role_permission", - columns: new[] { "id_permission", "id_user_role" }, - values: new object[,] - { - { 519, 1 }, - { 520, 1 } - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DeleteData( - table: "t_relation_user_role_permission", - keyColumns: new[] { "id_permission", "id_user_role" }, - keyValues: new object[] { 519, 1 }); - - migrationBuilder.DeleteData( - table: "t_relation_user_role_permission", - keyColumns: new[] { "id_permission", "id_user_role" }, - keyValues: new object[] { 520, 1 }); - - migrationBuilder.DeleteData( - table: "t_permission", - keyColumn: "id", - keyValue: 519); - - migrationBuilder.DeleteData( - table: "t_permission", - keyColumn: "id", - keyValue: 520); - } - } -} diff --git a/AsbCloudDb/Migrations/20230626064513_Add_Permissions_RelationContactWell.Designer.cs b/AsbCloudDb/Migrations/20230628043716_Add_Permissions_WellContact.Designer.cs similarity index 99% rename from AsbCloudDb/Migrations/20230626064513_Add_Permissions_RelationContactWell.Designer.cs rename to AsbCloudDb/Migrations/20230628043716_Add_Permissions_WellContact.Designer.cs index 276a7b61..fea9ad7b 100644 --- a/AsbCloudDb/Migrations/20230626064513_Add_Permissions_RelationContactWell.Designer.cs +++ b/AsbCloudDb/Migrations/20230628043716_Add_Permissions_WellContact.Designer.cs @@ -13,8 +13,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace AsbCloudDb.Migrations { [DbContext(typeof(AsbCloudDbContext))] - [Migration("20230626064513_Add_Permissions_RelationContactWell")] - partial class Add_Permissions_RelationContactWell + [Migration("20230628043716_Add_Permissions_WellContact")] + partial class Add_Permissions_WellContact { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -2009,13 +2009,13 @@ namespace AsbCloudDb.Migrations { Id = 519, Description = "Разрешение просматривать список контактов", - Name = "RelationContactWell.get" + Name = "WellContact.get" }, new { Id = 520, Description = "Разрешение редактировать список контактов", - Name = "RelationContactWell.edit" + Name = "WellContact.edit" }); }); diff --git a/AsbCloudDb/Migrations/20230628043716_Add_Permissions_WellContact.cs b/AsbCloudDb/Migrations/20230628043716_Add_Permissions_WellContact.cs new file mode 100644 index 00000000..8680084d --- /dev/null +++ b/AsbCloudDb/Migrations/20230628043716_Add_Permissions_WellContact.cs @@ -0,0 +1,34 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace AsbCloudDb.Migrations +{ + public partial class Add_Permissions_WellContact : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.InsertData( + table: "t_permission", + columns: new[] { "id", "description", "name" }, + values: new object[,] + { + { 519, "Разрешение просматривать список контактов", "WellContact.get" }, + { 520, "Разрешение редактировать список контактов", "WellContact.edit" } + }); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DeleteData( + table: "t_permission", + keyColumn: "id", + keyValue: 519); + + migrationBuilder.DeleteData( + table: "t_permission", + keyColumn: "id", + keyValue: 520); + } + } +} diff --git a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs index cbdcf59d..9c6d6bb9 100644 --- a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs +++ b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs @@ -2007,13 +2007,13 @@ namespace AsbCloudDb.Migrations { Id = 519, Description = "Разрешение просматривать список контактов", - Name = "RelationContactWell.get" + Name = "WellContact.get" }, new { Id = 520, Description = "Разрешение редактировать список контактов", - Name = "RelationContactWell.edit" + Name = "WellContact.edit" }); }); diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs b/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs index 0e1ac898..1879732c 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs @@ -150,8 +150,8 @@ new (){ Id = 517, Name="FaqStatistics.edit", Description="Разрешение редактировать вопрос"}, new (){ Id = 518, Name="FaqStatistics.delete", Description="Разрешение удалять вопрос"}, - new (){ Id = 519, Name="RelationContactWell.get", Description="Разрешение просматривать список контактов"}, - new (){ Id = 520, Name="RelationContactWell.edit", Description="Разрешение редактировать список контактов"}, + new (){ Id = 519, Name="WellContact.get", Description="Разрешение просматривать список контактов"}, + new (){ Id = 520, Name="WellContact.edit", Description="Разрешение редактировать список контактов"}, }; } } diff --git a/AsbCloudWebApi/Controllers/WellContactController.cs b/AsbCloudWebApi/Controllers/WellContactController.cs index 91e711ff..c988dc11 100644 --- a/AsbCloudWebApi/Controllers/WellContactController.cs +++ b/AsbCloudWebApi/Controllers/WellContactController.cs @@ -1,5 +1,4 @@ using AsbCloudApp.Data; -using AsbCloudApp.Data.User; using AsbCloudApp.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc;