holger/UserService
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

try another way to implement the data stucture

Browse Source
This commit is contained in:
Holger Börchers
2020-09-30 22:05:18 +02:00
parent 410062daae
commit 1b387adae1
19 changed files with 234 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
UserService.DatabaseLayer/Repositories/BaseRepository.cs Normal file
View File

@ -0,0 +1,13 @@
using LinqToDB.Data;
using UserService.DatabaseLayer.DataModels;
namespace UserService.DatabaseLayer.Repositories
{
public abstract class BaseRepository
{
protected BaseRepository()
{
DataConnection.DefaultSettings = new UserDbSettings();
}
}
}

7
UserService.DatabaseLayer/Repositories/IRepository.cs
View File

@ -4,14 +4,15 @@ using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using DataModels;
using UserService.DatabaseLayer.DataModels;
using UserService.Infrastructure.DataModels;
namespace UserService.DatabaseLayer.Repositories
{
public interface IRepository<T> where T : class
{
Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default);
Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default);
Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<NodeModel, bool>>? predicate = null, CancellationToken token = default);
Task<T?> GetAsync(Expression<Func<NodeModel, bool>> predicate, CancellationToken token = default);
Task AddAsync(T entity, CancellationToken token = default);
Task<bool> UpdateAsync(T entity, CancellationToken token = default);
Task DeleteAsync(T entity, CancellationToken token = default);

18
UserService.DatabaseLayer/Repositories/OrganizationUnitsRepository.cs
View File

@ -3,38 +3,34 @@ using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using DataModels;
using UserService.DatabaseLayer.DataModels;
using UserService.Infrastructure.DataModels;
namespace UserService.DatabaseLayer.Repositories
{
public class OrganizationUnitsRepository : IOrganizationUnitsRepository
{
/// <inheritdoc />
public async Task<IReadOnlyList<OrganizationUnit>> GetAllAsync(Expression<Func<OrganizationUnit, bool>>? predicate = null, CancellationToken token = default)
public Task<IReadOnlyList<OrganizationUnit>> GetAllAsync(Expression<Func<NodeModel, bool>>? predicate = null, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task<OrganizationUnit?> GetAsync(Expression<Func<OrganizationUnit, bool>> predicate, CancellationToken token = default)
public Task<OrganizationUnit?> GetAsync(Expression<Func<NodeModel, bool>> predicate, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task AddAsync(OrganizationUnit entity, CancellationToken token = default)
public Task AddAsync(OrganizationUnit entity, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task<bool> UpdateAsync(OrganizationUnit entity, CancellationToken token = default)
public Task<bool> UpdateAsync(OrganizationUnit entity, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task DeleteAsync(OrganizationUnit entity, CancellationToken token = default)
public Task DeleteAsync(OrganizationUnit entity, CancellationToken token = default)
{
throw new NotImplementedException();
}

29
UserService.DatabaseLayer/Repositories/SecurityGroupsRepository.cs
View File

@ -5,40 +5,39 @@ using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using DataModels;
using LinqToDB;
using UserService.DatabaseLayer.DataModels;
using UserService.Infrastructure.DataModels;
namespace UserService.DatabaseLayer.Repositories
{
public class SecurityGroupsRepository : ISecurityGroupsRepository
{
/// <inheritdoc />
public async Task<IReadOnlyList<SecurityGroup>> GetAllAsync(Expression<Func<SecurityGroup, bool>>? predicate = null, CancellationToken token = default)
public Task<IReadOnlyList<SecurityGroup>> GetAllAsync(Expression<Func<NodeModel, bool>>? predicate = null, CancellationToken token = default)
{
throw new NotImplementedException();
}
public Task<SecurityGroup?> GetAsync(Expression<Func<NodeModel, bool>> predicate, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task<SecurityGroup?> GetAsync(Expression<Func<SecurityGroup, bool>> predicate, CancellationToken token = default)
public Task AddAsync(SecurityGroup entity, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task AddAsync(SecurityGroup entity, CancellationToken token = default)
public Task<bool> UpdateAsync(SecurityGroup entity, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task<bool> UpdateAsync(SecurityGroup entity, CancellationToken token = default)
{
throw new NotImplementedException();
}
/// <inheritdoc />
public async Task DeleteAsync(SecurityGroup entity, CancellationToken token = default)
{
throw new NotImplementedException();
await using var db = new UserService2DB();
await db.NodeModels.DeleteAsync(x => x.Id == entity.Id, token).ConfigureAwait(false);
}
}
}

86
UserService.DatabaseLayer/Repositories/UsersRepository.cs
View File

@ -4,65 +4,99 @@ using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using DataModels;
using LinqToDB;
using LinqToDB.Data;
using UserService.DatabaseLayer.DataModels;
using UserService.Infrastructure.DataModels;
namespace UserService.DatabaseLayer.Repositories
{
public class UsersRepository : IUsersRepository
public class UsersRepository : BaseRepository, IUsersRepository
{
public UsersRepository()
{
DataConnection.DefaultSettings = new MySettings();
}
/// <inheritdoc />
public async Task<IReadOnlyList<User>> GetAllAsync(Expression<Func<User, bool>>? predicate = null,
public async Task<IReadOnlyList<User>> GetAllAsync(Expression<Func<NodeModel, bool>>? predicate = null,
CancellationToken token = default)
{
await using var db = new UserServiceDB();
return await db.Users.LoadWith(x=> x.Member).LoadWith(x=> x.Member.Node).WhereOrDefault(predicate).ToListAsync(token: token).ConfigureAwait(false);
await using var db = new UserService2DB();
var users = await db.NodeModels
.LoadWith(x=> x.Parent)
.Where(x => x.Discriminator == nameof(User))
.WhereOrDefault(predicate)
.Select(x => new User
{
Id = x.Id,
CommonName = x.CommonName,
Description = x.Description,
FirstName = x.FirstName,
LastName = x.LastName,
IsActive = x.IsActive,
EMail = x.EMail,
ParentId = x.ParentId,
})
.ToListAsync(token).ConfigureAwait(false);
return users;
}
/// <inheritdoc />
public async Task<User?> GetAsync(Expression<Func<User, bool>> predicate, CancellationToken token = default)
public async Task<User?> GetAsync(Expression<Func<NodeModel, bool>> predicate, CancellationToken token = default)
{
await using var db = new UserServiceDB();
var result = await db.Users.FirstOrDefaultAsync(predicate, token: token).ConfigureAwait(false);
await using var db = new UserService2DB();
var result = await db.NodeModels
.Where(predicate)
.Select(x => new User
{
Id = x.Id,
CommonName = x.CommonName,
Description = x.Description,
FirstName = x.FirstName,
LastName = x.LastName,
IsActive = x.IsActive,
EMail = x.EMail
}).FirstOrDefaultAsync(token).ConfigureAwait(false);
return result;
}
/// <inheritdoc />
public async Task AddAsync(User entity, CancellationToken token = default)
{
await using var db = new UserServiceDB();
var nodeId =
await db.Nodes.InsertWithInt32IdentityAsync(() => new Node {CommonName = "holger"}, token: token);
await db.Members.InsertAsync(() => new Member {Id = nodeId}, token: token);
await using var db = new UserService2DB();
await db.Users.InsertAsync(() => new User
await db.NodeModels.InsertAsync(() => new NodeModel
{
Id = nodeId,
CommonName = entity.CommonName,
FirstName = entity.FirstName,
LastName = entity.LastName,
IsActive = entity.IsActive
}, token: token).ConfigureAwait(false);
Description = entity.Description,
EMail = entity.EMail,
IsActive = entity.IsActive,
Discriminator = nameof(User),
}, token).ConfigureAwait(false);
}
/// <inheritdoc />
public async Task<bool> UpdateAsync(User entity, CancellationToken token = default)
{
throw new NotImplementedException();
await using var db = new UserService2DB();
var changedRows = await db.NodeModels.UpdateAsync(x => new NodeModel
{
Id = entity.Id,
CommonName = entity.CommonName,
FirstName = entity.FirstName,
LastName = entity.LastName,
Description = entity.Description,
EMail = entity.EMail,
IsActive = entity.IsActive,
Discriminator = nameof(User),
}, token).ConfigureAwait(false);
return changedRows > 0;
}
/// <inheritdoc />
public async Task DeleteAsync(User entity, CancellationToken token = default)
{
await using var db = new UserServiceDB();
await db.Users.DeleteAsync(x => x.Id == entity.Id, token: token);
await using var db = new UserService2DB();
await db.NodeModels.DeleteAsync(x => x.Id == entity.Id, token).ConfigureAwait(false);
}
}
}