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

Complete UserRoleService crud and unit test.

Browse Source
This commit is contained in:
Фролов 2022-01-13 15:51:06 +05:00
parent 38243082cd
commit c2c82c2cda
3 changed files with 137 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
AsbCloudInfrastructure/Services/UserRoleService.cs
View File

@ -15,14 +15,16 @@ namespace AsbCloudInfrastructure.Services
public class UserRoleService : IUserRoleService public class UserRoleService : IUserRoleService
{ {
private readonly CacheTable<UserRole> cacheUserRoles; private readonly CacheTable<UserRole> cacheUserRoles;
private readonly CacheTable<RelationUserRolePermission> cacheUserRolePermissions; private readonly CacheTable<RelationUserRolePermission> cacheRelationUserRolePermissions;
private readonly CacheTable<RelationUserRoleUserRole> cacheRelationUserRoleUserRole;
public ISet<string> Includes { get; } = new SortedSet<string>(); public ISet<string> Includes { get; } = new SortedSet<string>();
public UserRoleService(IAsbCloudDbContext context, CacheDb cacheDb) public UserRoleService(IAsbCloudDbContext context, CacheDb cacheDb)
{ {
cacheUserRoles = cacheDb.GetCachedTable<UserRole>((AsbCloudDbContext)context, nameof(UserRole.RelationUserRolePermissions), nameof(UserRole.RelationUserRoleUserRoles)); cacheUserRoles = cacheDb.GetCachedTable<UserRole>((AsbCloudDbContext)context, nameof(UserRole.RelationUserRolePermissions), nameof(UserRole.RelationUserRoleUserRoles));
cacheUserRolePermissions = cacheDb.GetCachedTable<RelationUserRolePermission>((AsbCloudDbContext)context, nameof(RelationUserRolePermission.Permission)); cacheRelationUserRolePermissions = cacheDb.GetCachedTable<RelationUserRolePermission>((AsbCloudDbContext)context, nameof(RelationUserRolePermission.Permission));
cacheRelationUserRoleUserRole = cacheDb.GetCachedTable<RelationUserRoleUserRole>((AsbCloudDbContext)context, nameof(RelationUserRoleUserRole.IncludeRole), nameof(RelationUserRoleUserRole.Role));
} }
public async Task<int> InsertAsync(UserRoleDto dto, CancellationToken token = default) public async Task<int> InsertAsync(UserRoleDto dto, CancellationToken token = default)
@ -32,6 +34,8 @@ namespace AsbCloudInfrastructure.Services
.ConfigureAwait(false); .ConfigureAwait(false);
dto.Id = updatedEntity.Id; dto.Id = updatedEntity.Id;
await UpdatePermissionsAsync(dto, token); await UpdatePermissionsAsync(dto, token);
await UpdateIncludedRolesAsync(dto, token);
await cacheUserRoles.RefreshAsync(true, token) await cacheUserRoles.RefreshAsync(true, token)
.ConfigureAwait(false); .ConfigureAwait(false);
return updatedEntity?.Id ?? 0; return updatedEntity?.Id ?? 0;
@ -100,6 +104,7 @@ namespace AsbCloudInfrastructure.Services
var entity = Convert(dto); var entity = Convert(dto);
await UpdatePermissionsAsync(dto, token); await UpdatePermissionsAsync(dto, token);
await UpdateIncludedRolesAsync(dto, token);
await cacheUserRoles.UpsertAsync(entity, token) await cacheUserRoles.UpsertAsync(entity, token)
.ConfigureAwait(false); .ConfigureAwait(false);
@ -129,26 +134,40 @@ namespace AsbCloudInfrastructure.Services
return roles; return roles;
} }
private async Task UpdatePermissionsAsync(UserRoleDto roleDto, CancellationToken token) private async Task UpdatePermissionsAsync(UserRoleDto dto, CancellationToken token)
{ {
if (roleDto?.Permissions is null) if (dto?.Permissions is null)
return; return;
await cacheUserRolePermissions.RemoveAsync(r => r.IdUserRole == roleDto.Id, token) await cacheRelationUserRolePermissions.RemoveAsync(r => r.IdUserRole == dto.Id, token)
.ConfigureAwait(false); .ConfigureAwait(false);
if (!roleDto.Permissions.Any()) if (dto.Permissions.Any())
return; {
var newRelationRoleToPermission = dto.Permissions.Select(p => new RelationUserRolePermission
var newRelationRoleToPermission = roleDto.Permissions.Select(p => new RelationUserRolePermission
{ {
IdPermission = p.Id, IdPermission = p.Id,
IdUserRole = roleDto.Id, IdUserRole = dto.Id,
}); });
await cacheUserRolePermissions.InsertAsync(newRelationRoleToPermission, token) await cacheRelationUserRolePermissions.InsertAsync(newRelationRoleToPermission, token)
.ConfigureAwait(false); .ConfigureAwait(false);
} }
}
private async Task UpdateIncludedRolesAsync(UserRoleDto dto, CancellationToken token)
{
if (dto?.Roles is null)
return ;
await cacheRelationUserRoleUserRole.RemoveAsync(rel => rel.Id == dto.Id, token);
if (dto.Roles.Any())
{
var newRelations = dto.Roles.Select(r => new RelationUserRoleUserRole { Id = dto.Id, IdInclude = r.Id });
await cacheRelationUserRoleUserRole.UpsertAsync(newRelations, token);
}
}
public Task<int> DeleteAsync(int id, CancellationToken token = default) public Task<int> DeleteAsync(int id, CancellationToken token = default)
=> cacheUserRoles.RemoveAsync(r => r.Id == id, token); => cacheUserRoles.RemoveAsync(r => r.Id == id, token);
@ -158,7 +177,7 @@ namespace AsbCloudInfrastructure.Services
public bool HasPermission(IEnumerable<int> rolesIds, string permissionName) public bool HasPermission(IEnumerable<int> rolesIds, string permissionName)
{ {
var permissionInfo = cacheUserRolePermissions var permissionInfo = cacheRelationUserRolePermissions
.FirstOrDefault(p => p.Permission?.Name.ToLower() == permissionName.ToLower()) .FirstOrDefault(p => p.Permission?.Name.ToLower() == permissionName.ToLower())
?.Permission; ?.Permission;
@ -201,10 +220,18 @@ namespace AsbCloudInfrastructure.Services
var dto = entity.Adapt<UserRoleDto>(); var dto = entity.Adapt<UserRoleDto>();
if(entity.RelationUserRolePermissions?.Any() == true) if(entity.RelationUserRolePermissions?.Any() == true)
{ {
dto.Permissions = cacheUserRolePermissions dto.Permissions = cacheRelationUserRolePermissions
.Where(r => entity.Id == r.IdUserRole) .Where(r => entity.Id == r.IdUserRole)
.Select(r => Convert(r.Permission)); .Select(r => Convert(r.Permission));
} }
if (entity.RelationUserRoleUserRoles?.Any() == true)
{
dto.Roles = entity.RelationUserRoleUserRoles.Select(rel => {
var includedRole = cacheUserRoles.First(r => r.Id == rel.IdInclude);
return Convert(includedRole);
}).ToList();
}
return dto; return dto;
} }

4
AsbCloudWebApi.Tests/AsbCloudWebApi.Tests.csproj
View File

@ -14,10 +14,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

95
AsbCloudWebApi.Tests/ServicesTests/UserRoleServiceTest.cs
View File

@ -1,8 +1,12 @@
using AsbCloudDb.Model; using AsbCloudApp.Data;
using AsbCloudDb.Model;
using AsbCloudInfrastructure.Services; using AsbCloudInfrastructure.Services;
using AsbCloudInfrastructure.Services.Cache; using AsbCloudInfrastructure.Services.Cache;
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Xunit; using Xunit;
namespace AsbCloudWebApi.Tests.ServicesTests namespace AsbCloudWebApi.Tests.ServicesTests
@ -90,5 +94,94 @@ namespace AsbCloudWebApi.Tests.ServicesTests
var result = service.HasPermission(new int[] { 1_000_003 }, "permission 2"); var result = service.HasPermission(new int[] { 1_000_003 }, "permission 2");
Assert.False(result); Assert.False(result);
} }
[Fact]
public async Task InsertAsync_returns_id()
{
var service = new UserRoleService(context, cacheDb);
var newRole = new UserRoleDto
{
Caption = "new role",
IdType = 0,
};
var id = await service.InsertAsync(newRole, CancellationToken.None );
Assert.NotEqual(0, id);
}
[Fact]
public async Task InsertAsync_updates_relation_to_permission()
{
var service = new UserRoleService(context, cacheDb);
var newRole = new UserRoleDto
{
Caption = "new role",
IdType = 0,
Permissions = new[] { new PermissionDto{ Id = 2_000_001 } },
};
var id = await service.InsertAsync(newRole, CancellationToken.None);
var entity = await service.GetAsync(id);
Assert.Equal(newRole.Permissions.Count(), entity.Permissions.Count());
}
[Fact]
public async Task InsertAsync_updates_relation_to_role()
{
var service = new UserRoleService(context, cacheDb);
var newRole = new UserRoleDto
{
Caption = "new role",
IdType = 0,
Roles = new [] { new UserRoleDto { Id = 1_000_001 } }
};
var id = await service.InsertAsync(newRole, CancellationToken.None);
var entity = await service.GetAsync(id);
Assert.Equal(newRole.Roles.Count, entity.Roles.Count);
}
[Fact]
public async Task UpdateAsync_returns_id()
{
var service = new UserRoleService(context, cacheDb);
const int updateId = 1_000_002;
var modRole = new UserRoleDto
{
Id = updateId,
Caption = "role 2 level 1"
};
var id = await service.UpdateAsync(1_000_002, modRole, CancellationToken.None);
Assert.Equal(updateId, id);
}
[Fact]
public async Task UpdateAsync_updates_relation_to_permission()
{
var service = new UserRoleService(context, cacheDb);
const int updateId = 1_000_002;
var modRole = new UserRoleDto
{
Id = updateId,
Caption = "role 2 level 1",
Permissions = new[] { new PermissionDto { Id = 2_000_001 } },
};
var id = await service.UpdateAsync(1_000_002, modRole, CancellationToken.None);
var entity = await service.GetAsync(id);
Assert.Equal(modRole.Permissions.Count(), entity.Permissions.Count());
}
[Fact]
public async Task UpdateAsync_updates_relation_to_role()
{
var service = new UserRoleService(context, cacheDb);
const int updateId = 1_000_002;
var modRole = new UserRoleDto
{
Id = updateId,
Caption = "role 2 level 1",
Roles = new[] { new UserRoleDto { Id = 1_000_001 } }
};
var id = await service.UpdateAsync(1_000_002, modRole, CancellationToken.None);
var entity = await service.GetAsync(id);
Assert.Equal(modRole.Roles.Count(), entity.Roles.Count());
}
} }
} }