diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 12805e60..a43f55c1 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -1,6 +1,5 @@ using AsbCloudDb.Model.Subsystems; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.ChangeTracking; using System.Threading; using System.Threading.Tasks; @@ -362,8 +361,6 @@ namespace AsbCloudDb.Model { var sql = $"REFRESH MATERIALIZED VIEW {materializedViewName};"; return Database.ExecuteSqlRawAsync(sql, token); - } - - public ChangeTracker GetChangeTracker() => ChangeTracker; + } } } diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index c2080c72..8e117f71 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -73,7 +73,5 @@ namespace AsbCloudDb.Model DbSet Set(string name) where TEntity : class; DbSet Set() where TEntity : class; EntityEntry Entry([NotNull] TEntity entity) where TEntity : class; - ChangeTracker GetChangeTracker(); - } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Repository/UserRepository.cs b/AsbCloudInfrastructure/Repository/UserRepository.cs index 1668fc6a..fe8979b7 100644 --- a/AsbCloudInfrastructure/Repository/UserRepository.cs +++ b/AsbCloudInfrastructure/Repository/UserRepository.cs @@ -194,14 +194,6 @@ namespace AsbCloudInfrastructure.Repository { memoryCache.Remove(userCacheTag); } - - private async Task> GetCacheRelationUserUserRoleAsync(CancellationToken token) - { - var query = dbContext.RelationUserUserRoles - .Include(r => r.UserRole) - .Include(r => r.User); - return await FromCacheAsync(query, relationUserUserRoleCacheTag, cacheObsolence, token); - } private IEnumerable GetCachRelationUserUserRoleCacheTag() { var query = dbContext.RelationUserUserRoles @@ -216,7 +208,7 @@ namespace AsbCloudInfrastructure.Repository private async Task UpdateRolesCacheForUserAsync(int idUser, IEnumerable newRoles, CancellationToken token) { - var relations = (await GetCacheRelationUserUserRoleAsync(token)).Where(r => r.IdUser == idUser); + var relations = dbContext.RelationUserUserRoles.Where(r => r.IdUser == idUser); dbContext.RelationUserUserRoles.RemoveRange(relations); if (newRoles?.Any() is true) @@ -235,7 +227,6 @@ namespace AsbCloudInfrastructure.Repository { async Task factory(CancellationToken token) => await query.ToArrayAsync(token); - dbContext.GetChangeTracker().Clear(); var cache = await GetOrAddCacheAsync(tag, factory, obsolescence, token); return cache.Select(convert); } @@ -244,7 +235,6 @@ namespace AsbCloudInfrastructure.Repository { async Task factory(CancellationToken token) => await query.ToArrayAsync(token); - dbContext.GetChangeTracker().Clear(); var cache = await GetOrAddCacheAsync(tag, factory, obsolescence, token); return cache; } @@ -253,7 +243,6 @@ namespace AsbCloudInfrastructure.Repository { TEntity[] factory() => query.ToArray(); - dbContext.GetChangeTracker().Clear(); var cache = GetOrAddCache(tag, factory, obsolescence); return cache.Select(convert); } @@ -262,7 +251,6 @@ namespace AsbCloudInfrastructure.Repository { TEntity[] factory() => query.ToArray(); - dbContext.GetChangeTracker().Clear(); var cache = GetOrAddCache(tag, factory, obsolescence); return cache; }