From ab278f6a2fa983828755dee3d5ad703bbc4ecfdb Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Fri, 12 Aug 2022 12:36:11 +0500 Subject: [PATCH] nit remove unused methods --- AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs | 2 +- AsbCloudApp/Services/IUserRoleService.cs | 9 -------- AsbCloudApp/Services/IUserService.cs | 18 --------------- AsbCloudApp/Services/IWellService.cs | 3 +-- .../Services/UserRoleService.cs | 10 --------- .../Services/UserService.cs | 22 ------------------- 6 files changed, 2 insertions(+), 62 deletions(-) diff --git a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs index 5b741abc..a925b27f 100644 --- a/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs +++ b/AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs @@ -15,7 +15,7 @@ namespace AsbCloudApp.Data.SAUB /// /// метка времени данных (legacy) /// - public DateTime Date // TODO: remove this legacy after all panels updated + public DateTime Date // TODO: remove this legacy after all panels updated (> 3.2.0407) { get { return DateTime; } set { DateTime = value; } diff --git a/AsbCloudApp/Services/IUserRoleService.cs b/AsbCloudApp/Services/IUserRoleService.cs index 8235bbe6..b9341c9d 100644 --- a/AsbCloudApp/Services/IUserRoleService.cs +++ b/AsbCloudApp/Services/IUserRoleService.cs @@ -10,15 +10,6 @@ namespace AsbCloudApp.Services /// public interface IUserRoleService : ICrudService { - // todo: скорее всего не используется - /// - /// - /// - /// - /// - /// - Task GetByNameAsync(string name, CancellationToken token = default); - // todo: переименовать /// /// получить dto по названиям diff --git a/AsbCloudApp/Services/IUserService.cs b/AsbCloudApp/Services/IUserService.cs index 8c5b8bb1..34f12212 100644 --- a/AsbCloudApp/Services/IUserService.cs +++ b/AsbCloudApp/Services/IUserService.cs @@ -28,24 +28,6 @@ namespace AsbCloudApp.Services /// IEnumerable GetRolesByIdUser(int idUser, int nestedLevel = 0); - // TODO: скорее всего не используется - /// - /// - /// - /// - /// - /// - bool HasAnyRoleOf(int idUser, IEnumerable roleNames); - - // TODO: скорее всего не используется - /// - /// - /// - /// - /// - /// - bool HasAnyRoleOf(int idUser, IEnumerable roleIds); - /// /// определяет есть ли у пользователя указанное разрешение /// diff --git a/AsbCloudApp/Services/IWellService.cs b/AsbCloudApp/Services/IWellService.cs index 5ec2b1ea..b8f9531c 100644 --- a/AsbCloudApp/Services/IWellService.cs +++ b/AsbCloudApp/Services/IWellService.cs @@ -49,9 +49,8 @@ namespace AsbCloudApp.Services /// Task GetWellCaptionByIdAsync(int idWell, CancellationToken token); - //TODO: remove that /// - /// + /// список компаний участвующих в скважине /// /// /// diff --git a/AsbCloudInfrastructure/Services/UserRoleService.cs b/AsbCloudInfrastructure/Services/UserRoleService.cs index e92e693d..37f05d8c 100644 --- a/AsbCloudInfrastructure/Services/UserRoleService.cs +++ b/AsbCloudInfrastructure/Services/UserRoleService.cs @@ -75,16 +75,6 @@ namespace AsbCloudInfrastructure.Services return dto; } - public async Task GetByNameAsync(string name, CancellationToken token = default) - { - var entity = await cacheUserRoles.FirstOrDefaultAsync(r => r.Caption == name, token) - .ConfigureAwait(false); - if (entity is null) - return null; - var dto = Convert(entity); - return dto; - } - public async Task> GetByNamesAsync(IEnumerable names, CancellationToken token = default) { if (names?.Any() != true) diff --git a/AsbCloudInfrastructure/Services/UserService.cs b/AsbCloudInfrastructure/Services/UserService.cs index 8cfdf26c..c282204e 100644 --- a/AsbCloudInfrastructure/Services/UserService.cs +++ b/AsbCloudInfrastructure/Services/UserService.cs @@ -167,28 +167,6 @@ namespace AsbCloudInfrastructure.Services }), token).ConfigureAwait(false); } - public bool HasAnyRoleOf(int idUser, IEnumerable roleNames) - { - if (!roleNames.Any()) - return true; - var userRoleNames = GetRolesNamesByIdUser(idUser); - foreach (var roleName in userRoleNames) - if (roleNames.Contains(roleName)) - return true; - return false; - } - - public bool HasAnyRoleOf(int idUser, IEnumerable roleIds) - { - if (!roleIds.Any()) - return true; - var userRoles = GetRolesByIdUser(idUser); - foreach (var role in userRoles) - if (roleIds.Contains(role.Id)) - return true; - return false; - } - public bool HasPermission(int idUser, string permissionName) { if (idUser == 1)