This commit is contained in:
2020-09-27 22:16:57 +02:00
parent 1811ea5a1a
commit 5c86727baa
9 changed files with 55 additions and 11 deletions

View File

@ -37,13 +37,20 @@ namespace UserService.DatabaseLayer.Repositories
public virtual async Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default)
{
await using var db = new UserServiceDbContext();
return await Context(db).Include(x => x.Parent).WhereOrDefault(predicate).ToListAsync(token).ConfigureAwait(false);
return await Context(db)
.Include(x => x.Parent)
.WhereOrDefault(predicate)
.ToListAsync(token)
.ConfigureAwait(false);
}
public virtual async Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default)
{
await using var db = new UserServiceDbContext();
return await Context(db).Include(x => x.Parent).FirstOrDefaultAsync(predicate, token).ConfigureAwait(false);
return await Context(db)
.Include(x => x.Parent)
.FirstOrDefaultAsync(predicate, token)
.ConfigureAwait(false);
}
public virtual async Task<bool> UpdateAsync(T entity, CancellationToken token = default)
{

View File

@ -32,8 +32,10 @@ namespace UserService.DatabaseLayer.Repositories
}
public interface IMembersRepository : IRepository<Member>
public interface IMembersRepository
{
}
}

View File

@ -24,7 +24,7 @@ namespace UserService.DatabaseLayer.Repositories
var rootOus = await Context(db)
.Include(x => x.Parent)
.WhereOrDefault(predicate)
.ToListAsync(cancellationToken: token).ConfigureAwait(false);
.ToListAsync(token).ConfigureAwait(false);
IEnumerable<OrganizationUnit> Rec(Node node)
{

View File

@ -1,4 +1,6 @@
using Microsoft.EntityFrameworkCore;
#nullable enable
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
@ -39,8 +41,11 @@ namespace UserService.DatabaseLayer.Repositories
public override async Task<bool> UpdateAsync(SecurityGroup entity, CancellationToken token = default)
{
if (entity == null) throw new ArgumentNullException(nameof(entity));
await using var db = new UserServiceDbContext();
Context(db).Update(entity);
db.UserMembers.UpdateRange(entity.Members);
var items = await db.SaveChangesAsync(token).ConfigureAwait(false);
return items > 0;
}